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

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-11-13 16:21:52 +0900 (Thu, 13 Nov 2014)
New Revision: 2591

Modified:
   branches/RELENG_1_1/OpenRTM-aist/configure.ac
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
Log:
[compat, ->RELEASE_1_1_1] Installation of 64bit library has been changed.

Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac	2014-11-10 02:29:02 UTC (rev 2590)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac	2014-11-13 07:21:52 UTC (rev 2591)
@@ -23,6 +23,21 @@
 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-10 02:29:02 UTC (rev 2590)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac	2014-11-13 07:21:52 UTC (rev 2591)
@@ -24,6 +24,21 @@
 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 ------------------------------------------------------------