Changeset 1752 for stable/2.7/Cbc/configure

Timestamp:

Oct 31, 2011 7:34:55 PM (9 years ago)

Author:

tkr

Message:

Merging r1750 and r1751 from trunk

Location:

stable/2.7/Cbc

Files:

• . (modified) (1 prop)
• configure (modified) (7 diffs)

stable/2.7/Cbc/configure

@@ -29219 +29219 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
 if test $coin_has_asl != skipping; then
@@ -29232 +29248 @@
        ASL_PCLIBS="$withval"
 
+         CBCLIB_PCLIBS="$withval $CBCLIB_PCLIBS"
+         CBCLIB_LIBS="$withval $CBCLIB_LIBS"
+
+         CBCGENERIC_PCLIBS="$withval $CBCGENERIC_PCLIBS"
+         CBCGENERIC_LIBS="$withval $CBCGENERIC_LIBS"
+
        # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
        if test -z "$PKG_CONFIG" ; then
          ASL_LIBS_INSTALLED="$withval"
-
+         CBCLIB_LIBS_INSTALLED="$withval $CBCLIB_LIBS_INSTALLED"CBCGENERIC_LIBS_INSTALLED="$withval $CBCGENERIC_LIBS_INSTALLED"
        fi
      fi
@@ -29252 +29274 @@
        coin_has_asl=yes
        ASL_CFLAGS="-I`${CYGPATH_W} $withval`"
-
+       CBCLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CBCLIB_CFLAGS"CBCGENERIC_CFLAGS="-I`${CYGPATH_W} $withval` $CBCGENERIC_CFLAGS"
        # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
        if test -z "$PKG_CONFIG" ; then
          ASL_CFLAGS_INSTALLED="$ASL_CFLAGS"
-
+         CBCLIB_CFLAGS_INSTALLED="$ASL_CFLAGS $CBCLIB_CFLAGS_INSTALLED"CBCGENERIC_CFLAGS_INSTALLED="$ASL_CFLAGS $CBCGENERIC_CFLAGS_INSTALLED"
        fi
      fi
@@ -29320 +29342 @@
         ASL_PCREQUIRES="coinasl"
 
-        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
+        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in CbcLib CbcGeneric
+
+          CBCLIB_PCREQUIRES="coinasl $CBCLIB_PCREQUIRES"
+          CBCLIB_CFLAGS="$ASL_CFLAGS $CBCLIB_CFLAGS"
+          CBCLIB_LIBS="$ASL_LIBS $CBCLIB_LIBS"
+
+          CBCGENERIC_PCREQUIRES="coinasl $CBCGENERIC_PCREQUIRES"
+          CBCGENERIC_CFLAGS="$ASL_CFLAGS $CBCGENERIC_CFLAGS"
+          CBCGENERIC_LIBS="$ASL_LIBS $CBCGENERIC_LIBS"
 
 
@@ -29565 +29595 @@
   ASL_PCREQUIRES="coinasl"
 
+    CBCLIB_PCREQUIRES="coinasl $CBCLIB_PCREQUIRES"
+    CBCLIB_CFLAGS="$ASL_CFLAGS $CBCLIB_CFLAGS"
+    CBCLIB_LIBS="$ASL_LIBS $CBCLIB_LIBS"
+    CBCLIB_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $CBCLIB_CFLAGS_INSTALLED"
+    CBCLIB_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $CBCLIB_LIBS_INSTALLED"
+
+    CBCGENERIC_PCREQUIRES="coinasl $CBCGENERIC_PCREQUIRES"
+    CBCGENERIC_CFLAGS="$ASL_CFLAGS $CBCGENERIC_CFLAGS"
+    CBCGENERIC_LIBS="$ASL_LIBS $CBCGENERIC_LIBS"
+    CBCGENERIC_CFLAGS_INSTALLED="$ASL_CFLAGS_INSTALLED $CBCGENERIC_CFLAGS_INSTALLED"
+    CBCGENERIC_LIBS_INSTALLED="$ASL_LIBS_INSTALLED $CBCGENERIC_LIBS_INSTALLED"
+
 
 fi
@@ -29611 +29653 @@
      # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
      ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
+
+       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
+
+       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
 
   fi
@@ -29639 +29685 @@
 echo "$as_me: ASL PCREQUIRES are $ASL_PCREQUIRES" >&6;}
     fi
+
+      { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5
+echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;}
+      { echo "$as_me:$LINENO: CbcLib LIBS   are $CBCLIB_LIBS" >&5
+echo "$as_me: CbcLib LIBS   are $CBCLIB_LIBS" >&6;}
+      { echo "$as_me:$LINENO: CbcLib DEPENDENCIES are $CBCLIB_DEPENDENCIES" >&5
+echo "$as_me: CbcLib DEPENDENCIES are $CBCLIB_DEPENDENCIES" >&6;}
+
+      { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5
+echo "$as_me: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&6;}
+      { echo "$as_me:$LINENO: CbcGeneric LIBS   are $CBCGENERIC_LIBS" >&5
+echo "$as_me: CbcGeneric LIBS   are $CBCGENERIC_LIBS" >&6;}
+      { echo "$as_me:$LINENO: CbcGeneric DEPENDENCIES are $CBCGENERIC_DEPENDENCIES" >&5
+echo "$as_me: CbcGeneric DEPENDENCIES are $CBCGENERIC_DEPENDENCIES" >&6;}
 
   fi