Changeset 1466 for stable

Timestamp:

Feb 6, 2010 2:33:55 PM (11 years ago)

Author:

stefan

Message:

make sure projects are only configured+build if not installed yet

File:

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

stable/BSPsplit/coin.m4

@@ -3493 +3493 @@
 
 m4_tolower(coin_has_$1)=notGiven
+coin_have_project_dir=no
 
 # check if user wants to skip project in any case
@@ -3510 +3511 @@
   if test $PACKAGE_TARNAME = m4_tolower($1); then
     m4_tolower(coin_has_$1)=.
+    coin_have_project_dir=yes
   fi
 
@@ -3539 +3541 @@
     # 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
     if test -d "$prefix"; then
-      PKG_CONFIG_PATH="$prefix/lib/$2/pkgconfig:$PKG_CONFIG_PATH"
+      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
     fi
     
@@ -3548 +3550 @@
          AC_MSG_ERROR([argument for --with-coin-instdir not a directory])
        fi
-       PKG_CONFIG_PATH="$withval/lib/$2/pkgconfig:$PKG_CONFIG_PATH"
+       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
       ],[])
 
@@ -3563 +3565 @@
 if test "$m4_tolower(coin_has_$1)" = notGiven; then
   if test -d $srcdir/$2/$1; then
-    coin_pkg_is_here=no
     m4_ifvaln([$3],
       [for i in $srcdir/$2/$1/$3; do
          if test -r $i; then
-           coin_pkg_is_here=yes
+           coin_have_project_dir=yes
          fi
        done],
-      [ coin_pkg_is_here=yes ])
-    if test $coin_pkg_is_here = yes; then
+      [ coin_have_project_dir=yes ])
+    if test $coin_have_project_dir = yes; then
       m4_tolower(coin_has_$1)=$2/$1
     fi
@@ -3580 +3581 @@
 
 AC_MSG_CHECKING(whether project $1 need to be configured)
-if test "$m4_tolower(coin_has_$1)" != skipping &&
-   test "$m4_tolower(coin_has_$1)" != notGiven &&
-   test "$m4_tolower(coin_has_$1)" != installed; then
+if test "$coin_have_project_dir" = yes ; then
 
   if test -r $srcdir/$2/$1/configure; then