Changeset 2104 for stable

Timestamp:

Feb 19, 2011 9:33:40 AM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2103

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (8 diffs)
• compile_f2c (modified) (1 prop)
• share/config.site (modified) (2 diffs)

stable/0.7/coin.m4

@@ -2687 +2687 @@
 # is available.  If so, then the variable PKGCONFIG is set to its path.
 # If not, PKGCONFIG is set to "".  The minimal version number can be given
-# as first parameter, by default it is 0.9.0.  This macro is a modified
-# version of PKG_PROG_PKG_CONFIG in pkg.m4.  Further, the AM_CONDITIONAL
-# COIN_HAS_PKGCONFIG is set and PKGCONFIG is AC_SUBST'ed.  Finally, if this
-# setup belongs to a project directory, then the search path for .pc files
-# is assembled from the value of $PKG_CONFIG_PATH, the values of --prefix,
-# --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. For a path xxx given in the coin-subdirs.txt, also
-# the directory xxx/pkgconfig is added, if existing.
+# as first parameter, by default it is 0.16.0, since COIN-OR .pc files now
+# include an URL field, which breaks pkg-config version <= 0.15.
+# This macro is a modified version of PKG_PROG_PKG_CONFIG in pkg.m4.
+# Further, the AM_CONDITIONAL COIN_HAS_PKGCONFIG is set and PKGCONFIG is
+# AC_SUBST'ed.  Finally, if this setup belongs to a project directory, then
+# the search path for .pc files is assembled from the value of
+# $PKG_CONFIG_PATH, the values of --prefix, --coin-instdir, and the directories
+# named in a file ../coin_subdirs.txt or ../../coin_subdirs.txt in a variable
+# COIN_PKG_CONFIG_PATH, which is 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],
@@ -2710 +2711 @@
   fi
   if test -n "$PKG_CONFIG"; then
-    _pkg_min_version=m4_default([$1], [0.9.0])
+    _pkg_min_version=m4_default([$1], [0.16.0])
     AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
     if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -2787 +2788 @@
 fi
 
+if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
+  AC_MSG_WARN([Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config.])
+fi
+
 ])
 
@@ -2903 +2908 @@
 fi
 
-if test $m4_tolower(coin_has_$1) != skipping; then
+if test "$m4_tolower(coin_has_$1)" != skipping; then
   if test $PACKAGE_TARNAME = m4_tolower($1); then
     m4_tolower(coin_has_$1)=yes
@@ -2920 +2925 @@
 fi
 
-if test $m4_tolower(coin_has_$1) != skipping; then
+if test "$m4_tolower(coin_has_$1)" != skipping; then
   AC_ARG_WITH([m4_tolower($1)-incdir],
     AC_HELP_STRING([--with-m4_tolower($1)-incdir],
@@ -2932 +2937 @@
 fi
 
-if test $m4_tolower(coin_has_$1) != skipping; then
+if test "$m4_tolower(coin_has_$1)" != skipping; then
   AC_ARG_WITH([m4_tolower($1)-datadir],
     AC_HELP_STRING([--with-m4_tolower($1)-datadir],
@@ -3417 +3422 @@
     #   replace "Cflags:" by "echo projcflags="
     #   remove every line starting with <some word>:
-    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
+    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
 
     # set projcflags and projlibs variables by running $pcfilemod
@@ -3462 +3467 @@
     #   replace "Cflags:" by "echo projcflags="
     #   remove every line starting with <some word>:
-    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
+    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
 
     # set projcflags and projlibs variables by running $pcfilemod

stable/0.7/share/config.site

@@ -266 +266 @@
 # --with-LIB-incdir and --with-LIB-lib configure flags, where "LIB" is
 # replaced by the lower-case short-form of the library.  A possibly
-# incomplete list of choices for LIB in the current COIN projects is:
-# cplex, glpk, gmpl, fortmp, mosek, mpi, osl, soplex, xpress.
+# incomplete list of choices for LIB in the current COIN-OR projects is:
+# cplex, gurobi, mosek, soplex, xpress.
 # For Cplex, one might set the following:
 #with_cplex_incdir='/usr/ilog/cplex90/include/ilcplex'
@@ -307 +307 @@
 # Specify that Lapack should not be used
 #with_lapack=no
-
-### ASL
-# Flag indicating where to find the AMPL Solver Library.  If --with-asldir
-# is not used, the configure script will test for the source code for ASL
-# in ThirdParty/ASL.  If this is found there, the ASL will be automatically
-# compiled and used, otherwise, it is assumed that ASL is unavailable.
-# If the user already has a precompiled version of the ASL, (s)he can use
-# this flag to specify the directory will all headers and the library:
-#with_asldir=$HOME/ampl/solvers
-