[openrtm-commit:01215] r2410 - branches/RELENG_1_1/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-02-06 12:13:50 +0900 (Thu, 06 Feb 2014)
New Revision: 2410

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/configure.ac
Log:
[merge] r2409 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409

Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac	2014-02-06 03:12:00 UTC (rev 2409)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac	2014-02-06 03:13:50 UTC (rev 2410)
@@ -178,7 +178,7 @@
 [Darwin*)]
 	AC_DEFINE([RTM_OS_DARWIN], [TRUE], [OS is Max OS X])
 	SHLIB_SUFFIX=".dylib"
-	LDFLAGS="--export-dynamic $LDFLAGS"
+	LDFLAGS="-export-dynamic $LDFLAGS"
 	os="darwin"
 	;;	
 [QNX*)]


Property changes on: branches/RELENG_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401
   + /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409