Changeset 1541 for branches

Timestamp:

May 1, 2010 6:14:51 AM (12 years ago)

Author:

stefan

Message:

setup pkg-config search path in COIN_HAS_PKGCONFIG and AC_SUBST it

File:

• branches/split/coin.m4 (modified) (3 diffs)

branches/split/coin.m4

@@ -3406 +3406 @@
 AC_SUBST(PKG_CONFIG)
 
+# assemble search path for pkg-config, if we are in a project setup
+if test x$coin_projectdir = xyes ; then
+  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+
+  # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+  if test -d "${prefix}"; then
+    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+  fi
+
+  AC_ARG_WITH([coin-instdir],
+    AC_HELP_STRING([--with-coin-instdir],
+                   [prefix of installation directory for precompiled COIN packages]),
+    [if test -d "$withval"; then : ; else
+       AC_MSG_ERROR([argument for --with-coin-instdir not a directory])
+     fi
+     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+    ],[])
+
+  # in a classic setup, we want to find uninstalled projects
+  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
+  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
+  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
+  if test -e ../coin_subdirs.txt ; then
+    for i in `cat ../coin_subdirs.txt` ; do
+      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
+    done
+  fi
+    
+  if test -e ../../coin_subdirs.txt ; then
+    for i in `cat ../../coin_subdirs.txt` ; do
+      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
+    done
+  fi
+
+  AC_SUBST(COIN_PKG_CONFIG_PATH)
+fi
+
 ])
 
@@ -3687 +3726 @@
 if test $m4_tolower(coin_has_$1) = notGiven; then
   if test -n "$PKG_CONFIG" ; then
-    # assemble search path for pkg-config
+    # set search path for pkg-config
+    # need to export variable to be sure that the following pkg-config gets these values
     coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
-
-    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
-    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
-    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
-    if test -d "${prefix}"; then
-      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
-    fi
-
-    AC_ARG_WITH([coin-instdir],
-      AC_HELP_STRING([--with-coin-instdir],
-                     [prefix of installation directory for precompiled COIN packages]),
-      [if test -d "$withval"; then : ; else
-         AC_MSG_ERROR([argument for --with-coin-instdir not a directory])
-       fi
-       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
-      ],[])
-
-    # in a classic setup, we want to find uninstalled projects
-    # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
-    # unfortunately, if the user set prefix, then we do not know where the project base directory is located
-    # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
-    if test -e ../coin_subdirs.txt ; then
-      for i in `cat ../coin_subdirs.txt` ; do
-        PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
-      done
-    fi
-    
-    if test -e ../../coin_subdirs.txt ; then
-      for i in `cat ../../coin_subdirs.txt` ; do
-        PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
-      done
-    fi
+    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
+    export PKG_CONFIG_PATH
     
     # 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],[$2],
       [ m4_tolower(coin_has_$1)=yes
@@ -3734 +3742 @@
       ])
 
+    # reset PKG_CONFIG_PATH variable 
     PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
   else