Changeset 1440

Timestamp:

Nov 4, 2009 5:31:07 AM (11 years ago)

Author:

stefan

Message:

change COIN_HAS_MODULE again: require list of packages in only one string and pick up search path from project base directory (if existing)

File:

• stable/BSPsplit/coin.m4 (modified) (6 diffs)

stable/BSPsplit/coin.m4

@@ -3737 +3737 @@
 
 ###########################################################################
-#                            COIN_HAS_PROJECT2                            #
+#                            COIN_HAS_PROJECT2 (deprecated)               #
 ###########################################################################
 
@@ -3884 +3884 @@
 ]) # AC_COIN_HAS_PROJECT2
 
-AC_DEFUN([AC_COIN_HAS_MODULE_HELPER],
-[
-module_content="$module_content m4_tolower($1)"
-
-# extract the package name: get everything before first space
-pkgname=`echo "$1" | sed -e 's/ .*//g'`
-
-# check if directory $srcdir/../$1 exists and add ../$1 to the PKG_CONFIG_PATH
-# this is for the classic setup where an uninstalled project can be found in ../$1
-# we do the same for ThirdParty/$1 and Data/$1; it's not nice but the only way I see to easily get around these nonstandard locations
-if test -d $srcdir/../$pkgname; then
-  PKG_CONFIG_PATH="../$pkgname:$PKG_CONFIG_PATH"
-fi
-if test -d $srcdir/../ThirdParty/$pkgname; then
-  PKG_CONFIG_PATH="../ThirdParty/$pkgname$PKG_CONFIG_PATH"
-fi
-if test -d $srcdir/../Data/$pkgname; then
-  PKG_CONFIG_PATH="../Data/$pkgname:$PKG_CONFIG_PATH"
-fi
-
-]) # AC_COIN_HAS_MODULE_HELPER
-
 ###########################################################################
 #                            COIN_HAS_MODULE                              #
@@ -3917 +3895 @@
 # Further, tolower(coin_has_$1) is set to "yes" and the packages of the module are added to
 # the REQUIREDPACKAGES variable, which can be used to setup a .pc file.
-# The argument should be the name (MODULE) of the module (in correct lower
-# and upper case), and a list of projects that belong to this module.
+# The first argument should be the name (MODULE) of the module (in correct lower
+# and upper case).
+# The second argument should be a (space separated) list of projects which this
+# module consists of. Optionally, required version numbers could be added.
 #
 # It is also possible to specify a preinstalled version of this module
@@ -3974 +3954 @@
 
 if test $m4_tolower(coin_has_$1) = notGiven; then
-  #assemble search path for pkg-config
   if test -n "$PKG_CONFIG" ; then
+    # assemble search path for pkg-config
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
 
@@ -3987 +3967 @@
       ],[])
 
-    # go through $2 to ... and assemble PKG_CONFIG_PATH with ../$2 and module search string
-    module_content=""
-    m4_ifvaln([$2], AC_COIN_HAS_MODULE_HELPER([$2]))
-    m4_ifvaln([$3], AC_COIN_HAS_MODULE_HELPER([$3]))
-    m4_ifvaln([$4], AC_COIN_HAS_MODULE_HELPER([$4]))
-    m4_ifvaln([$5], AC_COIN_HAS_MODULE_HELPER([$5]))
-    m4_ifvaln([$6], AC_COIN_HAS_MODULE_HELPER([$6]))
-    m4_ifvaln([$7], AC_COIN_HAS_MODULE_HELPER([$7]))
-    m4_ifvaln([$8], AC_COIN_HAS_MODULE_HELPER([$8]))
-    m4_ifvaln([$9], AC_COIN_HAS_MODULE_HELPER([$9]))
+    if test -e ${prefix}/coin_subdirs.txt ; then
+      for i in `cat ${prefix}/coin_subdirs.txt` ; do
+        PKG_CONFIG_PATH="${prefix}/$i:$PKG_CONFIG_PATH"
+      done
+    fi
 
     # let pkg-config do it's magic
     # need to export variable to be sure that the following pkg-config gets these values
     export PKG_CONFIG_PATH
-    AC_COIN_PKG_HAS_MODULE([$1],[$module_content],
+    AC_COIN_PKG_HAS_MODULE([$1],[$2],
       [ m4_tolower(coin_has_$1)=yes
         AC_MSG_RESULT([yes: $m4_toupper($1)_VERSIONS])
-        REQUIREDPACKAGES="$REQUIREDPACKAGES $module_content"
+        REQUIREDPACKAGES="$REQUIREDPACKAGES $2"
       ],
       [ m4_tolower(coin_has_$1)=notGiven
@@ -4039 +4014 @@
 
 ]) # AC_COIN_HAS_MODULE
-