[openrtm-commit:01505] r2596 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/coil

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-11-25 14:45:32 +0900 (Tue, 25 Nov 2014)
New Revision: 2596

Modified:
   branches/RELENG_1_1/OpenRTM-aist/configure.ac
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
Log:
Change of r2591 has been reverted.

Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac	2014-11-13 08:48:07 UTC (rev 2595)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac	2014-11-25 05:45:32 UTC (rev 2596)
@@ -23,21 +23,6 @@
 AM_INIT_AUTOMAKE([dist-bzip2 tar-pax])
 AM_CONFIG_HEADER([src/lib/rtm/config_rtc.h])
 
-if test "${libdir}" = '${exec_prefix}/lib'; then
-  case `uname -m` in
-    x86_64|ppc64|powerpc64)
-      if test -f /etc/fedora-release ; then
-        libdir='${exec_prefix}/lib64'
-      else
-        libdir='${exec_prefix}/lib/x86_64-linux-gnu'
-      fi
-      ;;
-    *)
-      libdir='${exec_prefix}/lib'
-      ;;
-  esac
-fi
-
 dnl ------------------------------------------------------------
 dnl Config files created at configure
 dnl ------------------------------------------------------------

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac	2014-11-13 08:48:07 UTC (rev 2595)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac	2014-11-25 05:45:32 UTC (rev 2596)
@@ -24,21 +24,6 @@
 AM_CONFIG_HEADER([include/coil/config_coil.h])
 AC_CONFIG_FILES([utils/coil-config/libcoil.pc:utils/coil-config/libcoil.pc.in])
 
-if test "${libdir}" = '${exec_prefix}/lib'; then
-  case `uname -m` in
-    x86_64|ppc64|powerpc64)
-      if test -f /etc/fedora-release ; then
-        libdir='${exec_prefix}/lib64'
-      else
-        libdir='${exec_prefix}/lib/x86_64-linux-gnu'
-      fi
-      ;;
-    *)
-      libdir='${exec_prefix}/lib'
-      ;;
-  esac
-fi
-
 dnl ------------------------------------------------------------
 dnl rename config header's PACKAGE_* definition
 dnl ------------------------------------------------------------