[openrtm-commit:01952] r2732 - in tags/RELEASE_1_1_2/OpenRTM-aist: . packages/rpm win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-24 18:38:29 +0900 (Tue, 24 May 2016)
New Revision: 2732

Modified:
   tags/RELEASE_1_1_2/OpenRTM-aist/
   tags/RELEASE_1_1_2/OpenRTM-aist/configure.ac
   tags/RELEASE_1_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
   tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[merge] r2731 have been merged from branches/RELENG_1_1.


Property changes on: tags/RELEASE_1_1_2/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,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724
   + /branches/RELENG_1_1/OpenRTM-aist:2731
/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,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730

Modified: tags/RELEASE_1_1_2/OpenRTM-aist/configure.ac
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist/configure.ac	2016-05-24 09:33:49 UTC (rev 2731)
+++ tags/RELEASE_1_1_2/OpenRTM-aist/configure.ac	2016-05-24 09:38:29 UTC (rev 2732)
@@ -291,7 +291,7 @@
 	FP_FIND_FILE(doxygen,$base_bins $base_dirs,bin)
 	if test "x$doxygen" = "x" ; then
 		AC_MSG_RESULT(not found)
-		AC_MSG_ERROR(Please install doxygen or use --without-document option)
+		AC_MSG_ERROR(Please install doxygen or use --without-doxygen option)
 	else
 		AC_MSG_RESULT($doxygen)
 	fi


Property changes on: tags/RELEASE_1_1_2/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,2409,2548-2555,2605,2677-2678,2681,2711-2712,2715-2721
   + /branches/RELENG_1_1/OpenRTM-aist/configure.ac:2731
/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,2548-2555,2605,2677-2678,2681,2711-2712,2715-2721,2728-2730

Modified: tags/RELEASE_1_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in	2016-05-24 09:33:49 UTC (rev 2731)
+++ tags/RELEASE_1_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in	2016-05-24 09:38:29 UTC (rev 2732)
@@ -79,7 +79,7 @@
 #------------------------------------------------------------
 # build section
 %build
-%configure --prefix=/usr CFLAGS="-O2 -g" CXXFLAGS="-O2 -g"
+%configure
 %{__make}
 
 #------------------------------------------------------------
@@ -104,6 +104,7 @@
 %attr(755,root,root) %{_bindir}/rtm-config
 %{_libdir}/libRTC*
 %{_libdir}/libcoil*
+%{_libdir}/librtm*
 %{rtm_libdir}/ec/*
 %{rtm_libdir}/sdo/*
 

Modified: tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2016-05-24 09:33:49 UTC (rev 2731)
+++ tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2016-05-24 09:38:29 UTC (rev 2732)
@@ -69,7 +69,7 @@
 	<!-- OpenRTM-aist macros -->
 	<UserMacro
 		Name="rtm_includes"
-		Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
+		Value=""$(rtm_root)";"$(rtm_root)\rtm\idl";"$(rtm_root)\rtm\ext""
 	/>
 	<UserMacro
 		Name="rtm_libdir"