[openrtm-commit:00897] r358 - trunk/rtmtools

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-10-10 16:36:21 +0900 (Wed, 10 Oct 2012)
New Revision: 358

Modified:
   trunk/rtmtools/openrtp
Log:
rtm-config that has no --rtm-idldir option is now supported.

Modified: trunk/rtmtools/openrtp
===================================================================
--- trunk/rtmtools/openrtp	2012-10-08 14:11:31 UTC (rev 357)
+++ trunk/rtmtools/openrtp	2012-10-10 07:36:21 UTC (rev 358)
@@ -81,8 +81,21 @@
     debug_echo "TRACE: find_RTM_ROOT"
     # find RTM_ROOT by rtm-config
     rtm_config=`which rtm-config`
+    if test "x$rtm_config" = "x" ; then
+        # rtm-config not found
+        return 1
+    fi
     debug_echo "rtm_config: " $rtm_config
-    if test ! "x$rtm_config" = "x" ; then
+
+    # check rtm-config version
+    ver=`grep rtm-idldir $rtm_config`
+    if test "x$var" = "x" ; then
+        # old version: no --rtm-idldir option
+        RTM_ROOT=`rtm-config --cflags | sed -e 's/.*\-I\(\/.*\)\/rtm\/idl/\1/'`
+        debug_echo "RTM_ROOT: " $RTM_ROOT
+        return 0
+    else
+        # new version: --rtm-idldir available
         RTM_ROOT=`rtm-config --rtm-idldir | sed -e 's/\/rtm\/idl$//'`
         debug_echo "RTM_ROOT: " $RTM_ROOT
         return 0