Changeset 1675 for trunk


Ignore:
Timestamp:
Jan 8, 2011 1:06:21 PM (10 years ago)
Author:
stefan
Message:

fix addlibs file for cygwin/cl build; rerun autotools

Location:
trunk/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/Makefile.am

    r1655 r1675  
    123123        $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    124124else
     125if COIN_CXX_IS_CL
     126        echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
     127else
    125128        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
     129endif
    126130endif
    127131

  • trunk/Clp/Makefile.in

    r1657 r1675  
    879879@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    880880@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    881 @COIN_HAS_PKGCONFIG_FALSE@      echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
     881@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
     882@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
    882883
    883884uninstall-hook:

  • trunk/Clp/configure

    r1670 r1675  
    10981098  --disable-libtool-lock  avoid locking (might break parallel builds)
    10991099  --enable-pkg-config     use pkg-config if available (default is yes)
     1100  --enable-interpackage-dependencies
     1101                          whether to deduce Makefile dependencies from package
     1102                          linker flags (default: yes)
    11001103  --enable-gnu-packages   compile with GNU packages (disabled by default)
    11011104
    … …  
    59055908*-*-irix6*)
    59065909  # Find out which ABI we are using.
    5907   echo '#line 5907 "configure"' > conftest.$ac_ext
     5910  echo '#line 5910 "configure"' > conftest.$ac_ext
    59085911  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59095912  (eval $ac_compile) 2>&5
    … …  
    70397042
    70407043# Provide some information about the compiler.
    7041 echo "$as_me:7041:" \
     7044echo "$as_me:7044:" \
    70427045     "checking for Fortran 77 compiler version" >&5
    70437046ac_compiler=`set X $ac_compile; echo $2`
    … …  
    81068109   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81078110   -e 's:$: $lt_compiler_flag:'`
    8108    (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
     8111   (eval echo "\"\$as_me:8111: $lt_compile\"" >&5)
    81098112   (eval "$lt_compile" 2>conftest.err)
    81108113   ac_status=$?
    81118114   cat conftest.err >&5
    8112    echo "$as_me:8112: \$? = $ac_status" >&5
     8115   echo "$as_me:8115: \$? = $ac_status" >&5
    81138116   if (exit $ac_status) && test -s "$ac_outfile"; then
    81148117     # The compiler can only warn and ignore the option if not recognized
    … …  
    83748377   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83758378   -e 's:$: $lt_compiler_flag:'`
    8376    (eval echo "\"\$as_me:8376: $lt_compile\"" >&5)
     8379   (eval echo "\"\$as_me:8379: $lt_compile\"" >&5)
    83778380   (eval "$lt_compile" 2>conftest.err)
    83788381   ac_status=$?
    83798382   cat conftest.err >&5
    8380    echo "$as_me:8380: \$? = $ac_status" >&5
     8383   echo "$as_me:8383: \$? = $ac_status" >&5
    83818384   if (exit $ac_status) && test -s "$ac_outfile"; then
    83828385     # The compiler can only warn and ignore the option if not recognized
    … …  
    84788481   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84798482   -e 's:$: $lt_compiler_flag:'`
    8480    (eval echo "\"\$as_me:8480: $lt_compile\"" >&5)
     8483   (eval echo "\"\$as_me:8483: $lt_compile\"" >&5)
    84818484   (eval "$lt_compile" 2>out/conftest.err)
    84828485   ac_status=$?
    84838486   cat out/conftest.err >&5
    8484    echo "$as_me:8484: \$? = $ac_status" >&5
     8487   echo "$as_me:8487: \$? = $ac_status" >&5
    84858488   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84868489   then
    … …  
    1082310826  lt_status=$lt_dlunknown
    1082410827  cat > conftest.$ac_ext <<EOF
    10825 #line 10825 "configure"
     10828#line 10828 "configure"
    1082610829#include "confdefs.h"
    1082710830
    … …  
    1092310926  lt_status=$lt_dlunknown
    1092410927  cat > conftest.$ac_ext <<EOF
    10925 #line 10925 "configure"
     10928#line 10928 "configure"
    1092610929#include "confdefs.h"
    1092710930
    … …  
    1326713270   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1326813271   -e 's:$: $lt_compiler_flag:'`
    13269    (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
     13272   (eval echo "\"\$as_me:13272: $lt_compile\"" >&5)
    1327013273   (eval "$lt_compile" 2>conftest.err)
    1327113274   ac_status=$?
    1327213275   cat conftest.err >&5
    13273    echo "$as_me:13273: \$? = $ac_status" >&5
     13276   echo "$as_me:13276: \$? = $ac_status" >&5
    1327413277   if (exit $ac_status) && test -s "$ac_outfile"; then
    1327513278     # The compiler can only warn and ignore the option if not recognized
    … …  
    1337113374   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337213375   -e 's:$: $lt_compiler_flag:'`
    13373    (eval echo "\"\$as_me:13373: $lt_compile\"" >&5)
     13376   (eval echo "\"\$as_me:13376: $lt_compile\"" >&5)
    1337413377   (eval "$lt_compile" 2>out/conftest.err)
    1337513378   ac_status=$?
    1337613379   cat out/conftest.err >&5
    13377    echo "$as_me:13377: \$? = $ac_status" >&5
     13380   echo "$as_me:13380: \$? = $ac_status" >&5
    1337813381   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1337913382   then
    … …  
    1494114944   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494214945   -e 's:$: $lt_compiler_flag:'`
    14943    (eval echo "\"\$as_me:14943: $lt_compile\"" >&5)
     14946   (eval echo "\"\$as_me:14946: $lt_compile\"" >&5)
    1494414947   (eval "$lt_compile" 2>conftest.err)
    1494514948   ac_status=$?
    1494614949   cat conftest.err >&5
    14947    echo "$as_me:14947: \$? = $ac_status" >&5
     14950   echo "$as_me:14950: \$? = $ac_status" >&5
    1494814951   if (exit $ac_status) && test -s "$ac_outfile"; then
    1494914952     # The compiler can only warn and ignore the option if not recognized
    … …  
    1504515048   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1504615049   -e 's:$: $lt_compiler_flag:'`
    15047    (eval echo "\"\$as_me:15047: $lt_compile\"" >&5)
     15050   (eval echo "\"\$as_me:15050: $lt_compile\"" >&5)
    1504815051   (eval "$lt_compile" 2>out/conftest.err)
    1504915052   ac_status=$?
    1505015053   cat out/conftest.err >&5
    15051    echo "$as_me:15051: \$? = $ac_status" >&5
     15054   echo "$as_me:15054: \$? = $ac_status" >&5
    1505215055   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505315056   then
    … …  
    1725217255   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725317256   -e 's:$: $lt_compiler_flag:'`
    17254    (eval echo "\"\$as_me:17254: $lt_compile\"" >&5)
     17257   (eval echo "\"\$as_me:17257: $lt_compile\"" >&5)
    1725517258   (eval "$lt_compile" 2>conftest.err)
    1725617259   ac_status=$?
    1725717260   cat conftest.err >&5
    17258    echo "$as_me:17258: \$? = $ac_status" >&5
     17261   echo "$as_me:17261: \$? = $ac_status" >&5
    1725917262   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726017263     # The compiler can only warn and ignore the option if not recognized
    … …  
    1752017523   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752117524   -e 's:$: $lt_compiler_flag:'`
    17522    (eval echo "\"\$as_me:17522: $lt_compile\"" >&5)
     17525   (eval echo "\"\$as_me:17525: $lt_compile\"" >&5)
    1752317526   (eval "$lt_compile" 2>conftest.err)
    1752417527   ac_status=$?
    1752517528   cat conftest.err >&5
    17526    echo "$as_me:17526: \$? = $ac_status" >&5
     17529   echo "$as_me:17529: \$? = $ac_status" >&5
    1752717530   if (exit $ac_status) && test -s "$ac_outfile"; then
    1752817531     # The compiler can only warn and ignore the option if not recognized
    … …  
    1762417627   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1762517628   -e 's:$: $lt_compiler_flag:'`
    17626    (eval echo "\"\$as_me:17626: $lt_compile\"" >&5)
     17629   (eval echo "\"\$as_me:17629: $lt_compile\"" >&5)
    1762717630   (eval "$lt_compile" 2>out/conftest.err)
    1762817631   ac_status=$?
    1762917632   cat out/conftest.err >&5
    17630    echo "$as_me:17630: \$? = $ac_status" >&5
     17633   echo "$as_me:17633: \$? = $ac_status" >&5
    1763117634   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763217635   then
    … …  
    2076020763
    2076120764
    20762 #check if user provided LIBS, CFLAGS, or DATA for module
     20765#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2076320766if test $coin_has_coinutils != skipping; then
    20764 
    2076520767
    2076620768# Check whether --with-m4_tolower(CoinUtils)-lib or --without-m4_tolower(CoinUtils)-lib was given.
    2076720769if test "${with_coinutils_lib+set}" = set; then
    2076820770  withval="$with_coinutils_lib"
    20769   coin_has_coinutils=yes
     20771  if test "$withval" = no ; then
     20772       coin_has_coinutils=skipping
     20773     else
     20774       coin_has_coinutils=yes
    2077020775       COINUTILS_LIBS="$withval"
    2077120776
    … …  
    2077320778         CLPLIB_LIBS="$withval $CLPLIB_LIBS"
    2077420779
     20780     fi
    2077520781
    2077620782fi;
    20777 
     20783fi
     20784
     20785if test $coin_has_coinutils != skipping; then
    2077820786
    2077920787# Check whether --with-m4_tolower(CoinUtils)-incdir or --without-m4_tolower(CoinUtils)-incdir was given.
    2078020788if test "${with_coinutils_incdir+set}" = set; then
    2078120789  withval="$with_coinutils_incdir"
    20782   coin_has_coinutils=yes
    20783      COINUTILS_CFLAGS="-I`${CYGPATH_W} $withval`"
    20784      CLPLIB_CFLAGS="$withval $CLPLIB_CFLAGS"
    20785 
     20790  if test "$withval" = no ; then
     20791       coin_has_coinutils=skipping
     20792     else
     20793       coin_has_coinutils=yes
     20794       COINUTILS_CFLAGS="-I`${CYGPATH_W} $withval`"
     20795       CLPLIB_CFLAGS="$withval $CLPLIB_CFLAGS"
     20796     fi
    2078620797
    2078720798fi;
    20788 
     20799fi
     20800
     20801if test $coin_has_coinutils != skipping; then
    2078920802
    2079020803# Check whether --with-m4_tolower(CoinUtils)-datadir or --without-m4_tolower(CoinUtils)-datadir was given.
    2079120804if test "${with_coinutils_datadir+set}" = set; then
    2079220805  withval="$with_coinutils_datadir"
    20793   coin_has_coinutils=yes
    20794      COINUTILS_DATA="$withval"
     20806  if test "$withval" = no ; then
     20807       coin_has_coinutils=skipping
     20808     else
     20809       coin_has_coinutils=yes
     20810       COINUTILS_DATA="$withval"
     20811     fi
     20812
    2079520813fi;
    2079620814fi
    … …  
    2111021128
    2111121129
    21112   # construct dependencies variables from LIBS variables
    21113   # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21114   # before, substitute out everything of the form -framework xxx as used on Mac
    21115   # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21116   COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21117 
    21118     CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21119 
     21130  # Check whether --enable-interpackage-dependencies or --disable-interpackage-dependencies was given.
     21131if test "${enable_interpackage_dependencies+set}" = set; then
     21132  enableval="$enable_interpackage_dependencies"
     21133
     21134else
     21135  enable_interpackage_dependencies=yes
     21136fi;
     21137
     21138  if test $enable_interpackage_dependencies = yes ; then
     21139     # construct dependencies variables from LIBS variables
     21140     # we add an extra space in LIBS so we can substitute out everything starting with " -"
     21141     # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21142     # then remove everything of the form -xxx
     21143     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
     21144     COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21145
     21146       CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21147
     21148  fi
    2112021149
    2112121150  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    … …  
    2120521234
    2120621235
    21207 #check if user provided LIBS, CFLAGS, or DATA for module
     21236#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2120821237if test $coin_has_osi != skipping; then
    21209 
    2121021238
    2121121239# Check whether --with-m4_tolower(Osi)-lib or --without-m4_tolower(Osi)-lib was given.
    2121221240if test "${with_osi_lib+set}" = set; then
    2121321241  withval="$with_osi_lib"
    21214   coin_has_osi=yes
     21242  if test "$withval" = no ; then
     21243       coin_has_osi=skipping
     21244     else
     21245       coin_has_osi=yes
    2121521246       OSI_LIBS="$withval"
    2121621247
    … …  
    2121821249         OSICLPLIB_LIBS="$withval $OSICLPLIB_LIBS"
    2121921250
     21251     fi
    2122021252
    2122121253fi;
    21222 
     21254fi
     21255
     21256if test $coin_has_osi != skipping; then
    2122321257
    2122421258# Check whether --with-m4_tolower(Osi)-incdir or --without-m4_tolower(Osi)-incdir was given.
    2122521259if test "${with_osi_incdir+set}" = set; then
    2122621260  withval="$with_osi_incdir"
    21227   coin_has_osi=yes
    21228      OSI_CFLAGS="-I`${CYGPATH_W} $withval`"
    21229      OSICLPLIB_CFLAGS="$withval $OSICLPLIB_CFLAGS"
    21230 
     21261  if test "$withval" = no ; then
     21262       coin_has_osi=skipping
     21263     else
     21264       coin_has_osi=yes
     21265       OSI_CFLAGS="-I`${CYGPATH_W} $withval`"
     21266       OSICLPLIB_CFLAGS="$withval $OSICLPLIB_CFLAGS"
     21267     fi
    2123121268
    2123221269fi;
    21233 
     21270fi
     21271
     21272if test $coin_has_osi != skipping; then
    2123421273
    2123521274# Check whether --with-m4_tolower(Osi)-datadir or --without-m4_tolower(Osi)-datadir was given.
    2123621275if test "${with_osi_datadir+set}" = set; then
    2123721276  withval="$with_osi_datadir"
    21238   coin_has_osi=yes
    21239      OSI_DATA="$withval"
     21277  if test "$withval" = no ; then
     21278       coin_has_osi=skipping
     21279     else
     21280       coin_has_osi=yes
     21281       OSI_DATA="$withval"
     21282     fi
     21283
    2124021284fi;
    2124121285fi
    … …  
    2155521599
    2155621600
    21557   # construct dependencies variables from LIBS variables
    21558   # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21559   # before, substitute out everything of the form -framework xxx as used on Mac
    21560   # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21561   OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21562 
    21563     OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21564 
     21601  # Check whether --enable-interpackage-dependencies or --disable-interpackage-dependencies was given.
     21602if test "${enable_interpackage_dependencies+set}" = set; then
     21603  enableval="$enable_interpackage_dependencies"
     21604
     21605else
     21606  enable_interpackage_dependencies=yes
     21607fi;
     21608
     21609  if test $enable_interpackage_dependencies = yes ; then
     21610     # construct dependencies variables from LIBS variables
     21611     # we add an extra space in LIBS so we can substitute out everything starting with " -"
     21612     # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21613     # then remove everything of the form -xxx
     21614     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
     21615     OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21616
     21617       OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21618
     21619  fi
    2156521620
    2156621621  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    … …  
    2163721692
    2163821693
    21639 #check if user provided LIBS, CFLAGS, or DATA for module
     21694#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2164021695if test $coin_has_ositests != skipping; then
    21641 
    2164221696
    2164321697# Check whether --with-m4_tolower(OsiTests)-lib or --without-m4_tolower(OsiTests)-lib was given.
    2164421698if test "${with_ositests_lib+set}" = set; then
    2164521699  withval="$with_ositests_lib"
    21646   coin_has_ositests=yes
     21700  if test "$withval" = no ; then
     21701       coin_has_ositests=skipping
     21702     else
     21703       coin_has_ositests=yes
    2164721704       OSITESTS_LIBS="$withval"
    2164821705
     21706     fi
    2164921707
    2165021708fi;
    21651 
     21709fi
     21710
     21711if test $coin_has_ositests != skipping; then
    2165221712
    2165321713# Check whether --with-m4_tolower(OsiTests)-incdir or --without-m4_tolower(OsiTests)-incdir was given.
    2165421714if test "${with_ositests_incdir+set}" = set; then
    2165521715  withval="$with_ositests_incdir"
    21656   coin_has_ositests=yes
    21657      OSITESTS_CFLAGS="-I`${CYGPATH_W} $withval`"
    21658 
     21716  if test "$withval" = no ; then
     21717       coin_has_ositests=skipping
     21718     else
     21719       coin_has_ositests=yes
     21720       OSITESTS_CFLAGS="-I`${CYGPATH_W} $withval`"
     21721
     21722     fi
    2165921723
    2166021724fi;
    21661 
     21725fi
     21726
     21727if test $coin_has_ositests != skipping; then
    2166221728
    2166321729# Check whether --with-m4_tolower(OsiTests)-datadir or --without-m4_tolower(OsiTests)-datadir was given.
    2166421730if test "${with_ositests_datadir+set}" = set; then
    2166521731  withval="$with_ositests_datadir"
    21666   coin_has_ositests=yes
    21667      OSITESTS_DATA="$withval"
     21732  if test "$withval" = no ; then
     21733       coin_has_ositests=skipping
     21734     else
     21735       coin_has_ositests=yes
     21736       OSITESTS_DATA="$withval"
     21737     fi
     21738
    2166821739fi;
    2166921740fi
    … …  
    2197322044
    2197422045
    21975   # construct dependencies variables from LIBS variables
    21976   # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21977   # before, substitute out everything of the form -framework xxx as used on Mac
    21978   # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21979   OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21980 
     22046  # Check whether --enable-interpackage-dependencies or --disable-interpackage-dependencies was given.
     22047if test "${enable_interpackage_dependencies+set}" = set; then
     22048  enableval="$enable_interpackage_dependencies"
     22049
     22050else
     22051  enable_interpackage_dependencies=yes
     22052fi;
     22053
     22054  if test $enable_interpackage_dependencies = yes ; then
     22055     # construct dependencies variables from LIBS variables
     22056     # we add an extra space in LIBS so we can substitute out everything starting with " -"
     22057     # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22058     # then remove everything of the form -xxx
     22059     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
     22060     OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22061
     22062  fi
    2198122063
    2198222064  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    … …  
    2204622128
    2204722129
    22048 #check if user provided LIBS, CFLAGS, or DATA for module
     22130#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2204922131if test $coin_has_sample != skipping; then
    22050 
    2205122132
    2205222133# Check whether --with-m4_tolower(Sample)-lib or --without-m4_tolower(Sample)-lib was given.
    2205322134if test "${with_sample_lib+set}" = set; then
    2205422135  withval="$with_sample_lib"
    22055   coin_has_sample=yes
     22136  if test "$withval" = no ; then
     22137       coin_has_sample=skipping
     22138     else
     22139       coin_has_sample=yes
    2205622140       SAMPLE_LIBS="$withval"
    2205722141
     22142     fi
    2205822143
    2205922144fi;
    22060 
     22145fi
     22146
     22147if test $coin_has_sample != skipping; then
    2206122148
    2206222149# Check whether --with-m4_tolower(Sample)-incdir or --without-m4_tolower(Sample)-incdir was given.
    2206322150if test "${with_sample_incdir+set}" = set; then
    2206422151  withval="$with_sample_incdir"
    22065   coin_has_sample=yes
    22066      SAMPLE_CFLAGS="-I`${CYGPATH_W} $withval`"
    22067 
     22152  if test "$withval" = no ; then
     22153       coin_has_sample=skipping
     22154     else
     22155       coin_has_sample=yes
     22156       SAMPLE_CFLAGS="-I`${CYGPATH_W} $withval`"
     22157
     22158     fi
    2206822159
    2206922160fi;
    22070 
     22161fi
     22162
     22163if test $coin_has_sample != skipping; then
    2207122164
    2207222165# Check whether --with-m4_tolower(Sample)-datadir or --without-m4_tolower(Sample)-datadir was given.
    2207322166if test "${with_sample_datadir+set}" = set; then
    2207422167  withval="$with_sample_datadir"
    22075   coin_has_sample=yes
    22076      SAMPLE_DATA="$withval"
     22168  if test "$withval" = no ; then
     22169       coin_has_sample=skipping
     22170     else
     22171       coin_has_sample=yes
     22172       SAMPLE_DATA="$withval"
     22173     fi
     22174
    2207722175fi;
    2207822176fi
    … …  
    2238222480
    2238322481
    22384   # construct dependencies variables from LIBS variables
    22385   # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22386   # before, substitute out everything of the form -framework xxx as used on Mac
    22387   # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22388   SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    22389 
     22482  # Check whether --enable-interpackage-dependencies or --disable-interpackage-dependencies was given.
     22483if test "${enable_interpackage_dependencies+set}" = set; then
     22484  enableval="$enable_interpackage_dependencies"
     22485
     22486else
     22487  enable_interpackage_dependencies=yes
     22488fi;
     22489
     22490  if test $enable_interpackage_dependencies = yes ; then
     22491     # construct dependencies variables from LIBS variables
     22492     # we add an extra space in LIBS so we can substitute out everything starting with " -"
     22493     # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22494     # then remove everything of the form -xxx
     22495     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
     22496     SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22497
     22498  fi
    2239022499
    2239122500  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    … …  
    2245522564
    2245622565
    22457 #check if user provided LIBS, CFLAGS, or DATA for module
     22566#check if user provided LIBS, CFLAGS, or DATA for package or disables use of package
    2245822567if test $coin_has_netlib != skipping; then
    22459 
    2246022568
    2246122569# Check whether --with-m4_tolower(Netlib)-lib or --without-m4_tolower(Netlib)-lib was given.
    2246222570if test "${with_netlib_lib+set}" = set; then
    2246322571  withval="$with_netlib_lib"
    22464   coin_has_netlib=yes
     22572  if test "$withval" = no ; then
     22573       coin_has_netlib=skipping
     22574     else
     22575       coin_has_netlib=yes
    2246522576       NETLIB_LIBS="$withval"
    2246622577
     22578     fi
    2246722579
    2246822580fi;
    22469 
     22581fi
     22582
     22583if test $coin_has_netlib != skipping; then
    2247022584
    2247122585# Check whether --with-m4_tolower(Netlib)-incdir or --without-m4_tolower(Netlib)-incdir was given.
    2247222586if test "${with_netlib_incdir+set}" = set; then
    2247322587  withval="$with_netlib_incdir"
    22474   coin_has_netlib=yes
    22475      NETLIB_CFLAGS="-I`${CYGPATH_W} $withval`"
    22476 
     22588  if test "$withval" = no ; then
     22589       coin_has_netlib=skipping
     22590     else
     22591       coin_has_netlib=yes
     22592       NETLIB_CFLAGS="-I`${CYGPATH_W} $withval`"
     22593
     22594     fi
    2247722595
    2247822596fi;
    22479 
     22597fi
     22598
     22599if test $coin_has_netlib != skipping; then
    2248022600
    2248122601# Check whether --with-m4_tolower(Netlib)-datadir or --without-m4_tolower(Netlib)-datadir was given.
    2248222602if test "${with_netlib_datadir+set}" = set; then
    2248322603  withval="$with_netlib_datadir"
    22484   coin_has_netlib=yes
    22485      NETLIB_DATA="$withval"
     22604  if test "$withval" = no ; then
     22605       coin_has_netlib=skipping
     22606     else
     22607       coin_has_netlib=yes
     22608       NETLIB_DATA="$withval"
     22609     fi
     22610
    2248622611fi;
    2248722612fi
    … …  
    2279122916
    2279222917
    22793   # construct dependencies variables from LIBS variables
    22794   # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22795   # before, substitute out everything of the form -framework xxx as used on Mac
    22796   # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22797   NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    22798 
     22918  # Check whether --enable-interpackage-dependencies or --disable-interpackage-dependencies was given.
     22919if test "${enable_interpackage_dependencies+set}" = set; then
     22920  enableval="$enable_interpackage_dependencies"
     22921
     22922else
     22923  enable_interpackage_dependencies=yes
     22924fi;
     22925
     22926  if test $enable_interpackage_dependencies = yes ; then
     22927     # construct dependencies variables from LIBS variables
     22928     # we add an extra space in LIBS so we can substitute out everything starting with " -"
     22929     # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22930     # then remove everything of the form -xxx
     22931     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
     22932     NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22933
     22934  fi
    2279922935
    2280022936  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
Note: See TracChangeset for help on using the changeset viewer.