Changeset 2242

Timestamp:

Jun 9, 2011 1:29:43 PM (10 years ago)

Author:

stefan

Message:

set also PCLIBS/PCREQUIRES variables for first argument of COIN_CHECK_PACKAGE macros; they are not AC_SUBSTed

File:

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

trunk/coin.m4

@@ -3123 +3123 @@
 m4_toupper($1_CFLAGS)=
 m4_toupper($1_DATA)=
+m4_toupper($1_DEPENDENCIES)=
+m4_toupper($1_PCLIBS)=
+m4_toupper($1_PCREQUIRES)=
+m4_toupper($1_DATA)=
 AC_SUBST(m4_toupper($1_LIBS))
 AC_SUBST(m4_toupper($1_CFLAGS))
@@ -3150 +3154 @@
        m4_tolower(coin_has_$1)=yes
        m4_toupper($1_LIBS)="$withval"
+       m4_toupper($1_PCLIBS)="$withval"
        coin_foreach_w([myvar], [$3], [
          m4_toupper(myvar)_PCLIBS="$withval $m4_toupper(myvar)_PCLIBS"
@@ -3221 +3226 @@
           m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
         fi
+        m4_toupper($1_PCREQUIRES)="$2"
    
         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in $3
@@ -3279 +3285 @@
       AC_MSG_NOTICE([$1 DATA   is  $m4_toupper($1)_DATA])
     fi
-    if test -n "$m4_toupper($1)_CFLAGS" ; then
-      AC_MSG_NOTICE([$1 CFLAGS are $m4_toupper($1)_CFLAGS])
+    if test -n "$m4_toupper($1)_PCLIBS" ; then
+      AC_MSG_NOTICE([$1 PCLIBS are $m4_toupper($1)_PCLIBS])
+    fi
+    if test -n "$m4_toupper($1)_PCREQUIRES" ; then
+      AC_MSG_NOTICE([$1 PCREQUIRES are $m4_toupper($1)_PCREQUIRES])
     fi
     coin_foreach_w([myvar], [$3], [
@@ -3354 +3363 @@
 m4_toupper($1_DATA)=
 m4_toupper($1_DATA_INSTALLED)=
+m4_toupper($1_PCLIBS)=
+m4_toupper($1_PCREQUIRES)=
 
 # initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x)
@@ -3544 +3555 @@
   fi
 
+  m4_toupper($1_PCREQUIRES)="$2"
   coin_foreach_w([myvar], [$3], [
     m4_toupper(myvar)_PCREQUIRES="$2 $m4_toupper(myvar)_PCREQUIRES"