Changeset 2048

Timestamp:

Jan 1, 2011 9:33:35 AM (10 years ago)

Author:

stefan

Message:

search also in pkgconfig subdir of uninstalled projects for .pc files, if existing; will be needed to find cppad

File:

• trunk/coin.m4 (modified) (3 diffs)

trunk/coin.m4

@@ -2718 +2718 @@
 # --coin-instdir, and the directory named in a file ../coin_subdirs.txt
 # or ../../coin_subdirs.txt in a variable COIN_PKG_CONFIG_PATH, which is
-# also AC_SUBST'ed.
+# also AC_SUBST'ed. For a path xxx given in the coin-subdirs.txt, also
+# the directory xxx/pkgconfig is added, if existing.
 
 AC_DEFUN([AC_COIN_HAS_PKGCONFIG],
@@ -2790 +2791 @@
         COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
       fi
+      if test -d ../$i/pkgconfig ; then
+        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
+      fi
     done
   fi
@@ -2797 +2801 @@
       if test -d ../../$i ; then
         COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
+      fi
+      if test -d ../../$i/pkgconfig ; then
+        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
       fi
     done