[openrtm-commit:01655] r2676 - in trunk/OpenRTM-aist: . src/lib/coil

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-11-19 11:49:41 +0900 (Thu, 19 Nov 2015)
New Revision: 2676

Modified:
   trunk/OpenRTM-aist/
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/src/lib/coil/configure.ac
Log:
[merge] r2596 merged from branch/RELENG_1_1. Processing related to r2609. r2591 is reverted.


Property changes on: trunk/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2126-2150,2371,2373,2377-2379,2388,2520,2541,2588,2590-2591,2597-2598,2601,2603
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
   + /branches/RELENG_1_1/OpenRTM-aist:2126-2150,2371,2373,2377-2379,2388,2520,2541,2588,2590-2591,2596-2598,2601,2603
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372

Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2015-10-27 07:30:41 UTC (rev 2675)
+++ trunk/OpenRTM-aist/configure.ac	2015-11-19 02:49:41 UTC (rev 2676)
@@ -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: trunk/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/configure.ac	2015-10-27 07:30:41 UTC (rev 2675)
+++ trunk/OpenRTM-aist/src/lib/coil/configure.ac	2015-11-19 02:49:41 UTC (rev 2676)
@@ -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 ------------------------------------------------------------