Changeset 1603 for trunk


Ignore:
Timestamp:
Sep 13, 2010 3:39:27 AM (10 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
trunk/Clp
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/Makefile.in

    r1582 r1603  
    133133CDEFS = @CDEFS@
    134134CFLAGS = @CFLAGS@
     135CLPLIB_LIBS = @CLPLIB_LIBS@
     136CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
     137CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
    135138CLP_SVN_REV = @CLP_SVN_REV@
    136139COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    … …  
    199202OPT_CFLAGS = @OPT_CFLAGS@
    200203OPT_CXXFLAGS = @OPT_CXXFLAGS@
     204OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     205OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
     206OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    201207OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    202208OSITESTS_DATA = @OSITESTS_DATA@
    … …  
    215221PKG_CONFIG = @PKG_CONFIG@
    216222RANLIB = @RANLIB@
    217 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    218223RPATH_FLAGS = @RPATH_FLAGS@
    219224SAMPLE_CFLAGS = @SAMPLE_CFLAGS@

  • trunk/Clp/clp-uninstalled.pc.in

    r1573 r1603  
    55Description: COIN-OR Linear Programming Solver
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lClp @PCADDLIBS@
     7Libs: -L${libdir} -lClp @CLPLIB_PCLIBS@
    88Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
    9 Requires: @REQUIREDPACKAGES@
     9Requires: @CLPLIB_PCREQUIRES@

  • trunk/Clp/clp.pc.in

    r1573 r1603  
    77Description: COIN-OR Linear Programming Solver
    88Version: @PACKAGE_VERSION@
    9 Libs: -L${libdir} -lClp @PCADDLIBS@
     9Libs: -L${libdir} -lClp @CLPLIB_PCLIBS@
    1010Cflags: -I${includedir}
    11 Requires: @REQUIREDPACKAGES@
     11Requires: @CLPLIB_PCREQUIRES@

  • trunk/Clp/configure

    r1601 r1603  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    11121112  --with-coin-instdir     prefix of installation directory for precompiled
    11131113                          COIN packages
    1114   --with-coinutils-lib linker flags for using module CoinUtils
    1115   --with-coinutils-incdir directory with header files for using module
     1114  --with-coinutils-lib linker flags for using package CoinUtils
     1115  --with-coinutils-incdir directory with header files for using package
    11161116                          CoinUtils
    11171117  --with-coinutils-datadir
    1118                           directory with data files for using module CoinUtils
    1119   --with-osi-lib linker flags for using module Osi
    1120   --with-osi-incdir directory with header files for using module Osi
    1121   --with-osi-datadir directory with data files for using module Osi
    1122   --with-ositests-lib linker flags for using module OsiTests
    1123   --with-ositests-incdir directory with header files for using module OsiTests
    1124   --with-ositests-datadir directory with data files for using module OsiTests
    1125   --with-sample-lib linker flags for using module Sample
    1126   --with-sample-incdir directory with header files for using module Sample
    1127   --with-sample-datadir directory with data files for using module Sample
    1128   --with-netlib-lib linker flags for using module Netlib
    1129   --with-netlib-incdir directory with header files for using module Netlib
    1130   --with-netlib-datadir directory with data files for using module Netlib
     1118                          directory with data files for using package
     1119                          CoinUtils
     1120  --with-osi-lib linker flags for using package Osi
     1121  --with-osi-incdir directory with header files for using package Osi
     1122  --with-osi-datadir directory with data files for using package Osi
     1123  --with-ositests-lib linker flags for using package OsiTests
     1124  --with-ositests-incdir directory with header files for using package
     1125                          OsiTests
     1126  --with-ositests-datadir directory with data files for using package OsiTests
     1127  --with-sample-lib linker flags for using package Sample
     1128  --with-sample-incdir directory with header files for using package Sample
     1129  --with-sample-datadir directory with data files for using package Sample
     1130  --with-netlib-lib linker flags for using package Netlib
     1131  --with-netlib-incdir directory with header files for using package Netlib
     1132  --with-netlib-datadir directory with data files for using package Netlib
    11311133  --with-wsmp             specify WSMP library
    11321134  --with-dot              use dot (from graphviz) when creating documentation
    … …  
    58805882*-*-irix6*)
    58815883  # Find out which ABI we are using.
    5882   echo '#line 5882 "configure"' > conftest.$ac_ext
     5884  echo '#line 5884 "configure"' > conftest.$ac_ext
    58835885  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58845886  (eval $ac_compile) 2>&5
    … …  
    70147016
    70157017# Provide some information about the compiler.
    7016 echo "$as_me:7016:" \
     7018echo "$as_me:7018:" \
    70177019     "checking for Fortran 77 compiler version" >&5
    70187020ac_compiler=`set X $ac_compile; echo $2`
    … …  
    80818083   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80828084   -e 's:$: $lt_compiler_flag:'`
    8083    (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
     8085   (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
    80848086   (eval "$lt_compile" 2>conftest.err)
    80858087   ac_status=$?
    80868088   cat conftest.err >&5
    8087    echo "$as_me:8087: \$? = $ac_status" >&5
     8089   echo "$as_me:8089: \$? = $ac_status" >&5
    80888090   if (exit $ac_status) && test -s "$ac_outfile"; then
    80898091     # The compiler can only warn and ignore the option if not recognized
    … …  
    83498351   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83508352   -e 's:$: $lt_compiler_flag:'`
    8351    (eval echo "\"\$as_me:8351: $lt_compile\"" >&5)
     8353   (eval echo "\"\$as_me:8353: $lt_compile\"" >&5)
    83528354   (eval "$lt_compile" 2>conftest.err)
    83538355   ac_status=$?
    83548356   cat conftest.err >&5
    8355    echo "$as_me:8355: \$? = $ac_status" >&5
     8357   echo "$as_me:8357: \$? = $ac_status" >&5
    83568358   if (exit $ac_status) && test -s "$ac_outfile"; then
    83578359     # The compiler can only warn and ignore the option if not recognized
    … …  
    84538455   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84548456   -e 's:$: $lt_compiler_flag:'`
    8455    (eval echo "\"\$as_me:8455: $lt_compile\"" >&5)
     8457   (eval echo "\"\$as_me:8457: $lt_compile\"" >&5)
    84568458   (eval "$lt_compile" 2>out/conftest.err)
    84578459   ac_status=$?
    84588460   cat out/conftest.err >&5
    8459    echo "$as_me:8459: \$? = $ac_status" >&5
     8461   echo "$as_me:8461: \$? = $ac_status" >&5
    84608462   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84618463   then
    … …  
    1079810800  lt_status=$lt_dlunknown
    1079910801  cat > conftest.$ac_ext <<EOF
    10800 #line 10800 "configure"
     10802#line 10802 "configure"
    1080110803#include "confdefs.h"
    1080210804
    … …  
    1089810900  lt_status=$lt_dlunknown
    1089910901  cat > conftest.$ac_ext <<EOF
    10900 #line 10900 "configure"
     10902#line 10902 "configure"
    1090110903#include "confdefs.h"
    1090210904
    … …  
    1324213244   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1324313245   -e 's:$: $lt_compiler_flag:'`
    13244    (eval echo "\"\$as_me:13244: $lt_compile\"" >&5)
     13246   (eval echo "\"\$as_me:13246: $lt_compile\"" >&5)
    1324513247   (eval "$lt_compile" 2>conftest.err)
    1324613248   ac_status=$?
    1324713249   cat conftest.err >&5
    13248    echo "$as_me:13248: \$? = $ac_status" >&5
     13250   echo "$as_me:13250: \$? = $ac_status" >&5
    1324913251   if (exit $ac_status) && test -s "$ac_outfile"; then
    1325013252     # The compiler can only warn and ignore the option if not recognized
    … …  
    1334613348   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1334713349   -e 's:$: $lt_compiler_flag:'`
    13348    (eval echo "\"\$as_me:13348: $lt_compile\"" >&5)
     13350   (eval echo "\"\$as_me:13350: $lt_compile\"" >&5)
    1334913351   (eval "$lt_compile" 2>out/conftest.err)
    1335013352   ac_status=$?
    1335113353   cat out/conftest.err >&5
    13352    echo "$as_me:13352: \$? = $ac_status" >&5
     13354   echo "$as_me:13354: \$? = $ac_status" >&5
    1335313355   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1335413356   then
    … …  
    1491614918   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1491714919   -e 's:$: $lt_compiler_flag:'`
    14918    (eval echo "\"\$as_me:14918: $lt_compile\"" >&5)
     14920   (eval echo "\"\$as_me:14920: $lt_compile\"" >&5)
    1491914921   (eval "$lt_compile" 2>conftest.err)
    1492014922   ac_status=$?
    1492114923   cat conftest.err >&5
    14922    echo "$as_me:14922: \$? = $ac_status" >&5
     14924   echo "$as_me:14924: \$? = $ac_status" >&5
    1492314925   if (exit $ac_status) && test -s "$ac_outfile"; then
    1492414926     # The compiler can only warn and ignore the option if not recognized
    … …  
    1502015022   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1502115023   -e 's:$: $lt_compiler_flag:'`
    15022    (eval echo "\"\$as_me:15022: $lt_compile\"" >&5)
     15024   (eval echo "\"\$as_me:15024: $lt_compile\"" >&5)
    1502315025   (eval "$lt_compile" 2>out/conftest.err)
    1502415026   ac_status=$?
    1502515027   cat out/conftest.err >&5
    15026    echo "$as_me:15026: \$? = $ac_status" >&5
     15028   echo "$as_me:15028: \$? = $ac_status" >&5
    1502715029   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1502815030   then
    … …  
    1722717229   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1722817230   -e 's:$: $lt_compiler_flag:'`
    17229    (eval echo "\"\$as_me:17229: $lt_compile\"" >&5)
     17231   (eval echo "\"\$as_me:17231: $lt_compile\"" >&5)
    1723017232   (eval "$lt_compile" 2>conftest.err)
    1723117233   ac_status=$?
    1723217234   cat conftest.err >&5
    17233    echo "$as_me:17233: \$? = $ac_status" >&5
     17235   echo "$as_me:17235: \$? = $ac_status" >&5
    1723417236   if (exit $ac_status) && test -s "$ac_outfile"; then
    1723517237     # The compiler can only warn and ignore the option if not recognized
    … …  
    1749517497   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1749617498   -e 's:$: $lt_compiler_flag:'`
    17497    (eval echo "\"\$as_me:17497: $lt_compile\"" >&5)
     17499   (eval echo "\"\$as_me:17499: $lt_compile\"" >&5)
    1749817500   (eval "$lt_compile" 2>conftest.err)
    1749917501   ac_status=$?
    1750017502   cat conftest.err >&5
    17501    echo "$as_me:17501: \$? = $ac_status" >&5
     17503   echo "$as_me:17503: \$? = $ac_status" >&5
    1750217504   if (exit $ac_status) && test -s "$ac_outfile"; then
    1750317505     # The compiler can only warn and ignore the option if not recognized
    … …  
    1759917601   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1760017602   -e 's:$: $lt_compiler_flag:'`
    17601    (eval echo "\"\$as_me:17601: $lt_compile\"" >&5)
     17603   (eval echo "\"\$as_me:17603: $lt_compile\"" >&5)
    1760217604   (eval "$lt_compile" 2>out/conftest.err)
    1760317605   ac_status=$?
    1760417606   cat out/conftest.err >&5
    17605    echo "$as_me:17605: \$? = $ac_status" >&5
     17607   echo "$as_me:17607: \$? = $ac_status" >&5
    1760617608   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1760717609   then
    … …  
    2069120693
    2069220694
    20693 echo "$as_me:$LINENO: checking for COIN-OR module CoinUtils" >&5
    20694 echo $ECHO_N "checking for COIN-OR module CoinUtils... $ECHO_C" >&6
     20695echo "$as_me:$LINENO: checking for COIN-OR package CoinUtils" >&5
     20696echo $ECHO_N "checking for COIN-OR package CoinUtils... $ECHO_C" >&6
    2069520697
    2069620698coin_has_coinutils=notGiven
    2069720699
    20698 # check if user wants to skip module in any case
     20700# check if user wants to skip package in any case
    2069920701if test x"$COIN_SKIP_PROJECTS" != x; then
    2070020702  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2071320715
    2071420716
     20717
     20718
     20719
     20720
    2071520721#check if user provided LIBS, CFLAGS, or DATA for module
    2071620722if test $coin_has_coinutils != skipping; then
    … …  
    2072220728  coin_has_coinutils=yes
    2072320729       COINUTILS_LIBS="$withval"
    20724        PCADDLIBS="$withval $PCADDLIBS"
     20730
     20731         CLPLIB_PCLIBS="$withval $CLPLIB_PCLIBS"
     20732         CLPLIB_LIBS="$withval $CLPLIB_LIBS"
     20733
    2072520734
    2072620735fi;
    … …  
    2073220741  coin_has_coinutils=yes
    2073320742     COINUTILS_CFLAGS="-I`${CYGPATH_W} $withval`"
     20743     CLPLIB_CFLAGS="$withval $CLPLIB_CFLAGS"
     20744
     20745
    2073420746fi;
    2073520747
    … …  
    2077220784        echo "$as_me:$LINENO: result: yes: $COINUTILS_VERSIONS" >&5
    2077320785echo "${ECHO_T}yes: $COINUTILS_VERSIONS" >&6
    20774         REQUIREDPACKAGES="coinutils = trunk $REQUIREDPACKAGES"
     20786        CLPLIB_PCREQUIRES="coinutils = trunk $CLPLIB_PCREQUIRES"
     20787
    2077520788
    2077620789
    … …  
    2079420807    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2079520808    export PKG_CONFIG_PATH
     20809
     20810    # augment X_CFLAGS and X_LIBS for each build target X in ClpLib
     20811
     20812      CLPLIB_CFLAGS="$COINUTILS_CFLAGS $CLPLIB_CFLAGS"
     20813      CLPLIB_LIBS="$COINUTILS_LIBS $CLPLIB_LIBS"
     20814
    2079620815  else
    2079720816    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2079820817echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2079920818
    20800 echo "$as_me:$LINENO: checking for COIN-OR module CoinUtils (fallback)" >&5
    20801 echo $ECHO_N "checking for COIN-OR module CoinUtils (fallback)... $ECHO_C" >&6
     20819echo "$as_me:$LINENO: checking for COIN-OR package CoinUtils (fallback)" >&5
     20820echo $ECHO_N "checking for COIN-OR package CoinUtils (fallback)... $ECHO_C" >&6
    2080220821
    2080320822coin_has_coinutils=notGiven
    … …  
    2080520824COINUTILS_CFLAGS=
    2080620825COINUTILS_DATA=
    20807 
    2080820826
    2080920827# initial list of dependencies is "coinutils = trunk", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2088120899  projtoprocess="$nextprojtoprocess"
    2088220900
     20901  # if there are no more projects to search for, finish up
    2088320902  if test "x$projtoprocess" = x ; then
    2088420903    coin_has_coinutils=yes
    … …  
    2088620905echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2088720906
    20888     REQUIREDPACKAGES="coinutils = trunk $REQUIREDPACKAGES"
    20889 
    2089020907cat >>confdefs.h <<\_ACEOF
    2089120908#define COIN_HAS_COINUTILS 1
    … …  
    2089320910
    2089420911
     20912
     20913      CLPLIB_PCREQUIRES="coinutils = trunk $CLPLIB_PCREQUIRES"
     20914      CLPLIB_CFLAGS="$COINUTILS_CFLAGS $CLPLIB_CFLAGS"
     20915      CLPLIB_LIBS="$COINUTILS_LIBS $CLPLIB_LIBS"
     20916
     20917
    2089520918    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     20919      if test -n "$COINUTILS_CFLAGS" ; then
     20920        { echo "$as_me:$LINENO: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&5
     20921echo "$as_me: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&6;}
     20922      fi
     20923      if test -n "$COINUTILS_LIBS" ; then
     20924        { echo "$as_me:$LINENO: CoinUtils LIBS   are $COINUTILS_LIBS" >&5
     20925echo "$as_me: CoinUtils LIBS   are $COINUTILS_LIBS" >&6;}
     20926      fi
     20927      if test -n "$COINUTILS_DATA" ; then
     20928        { echo "$as_me:$LINENO: CoinUtils DATA   is  $COINUTILS_DATA" >&5
     20929echo "$as_me: CoinUtils DATA   is  $COINUTILS_DATA" >&6;}
     20930      fi
     20931
     20932        { echo "$as_me:$LINENO: ClpLib CFLAGS are $CLPLIB_CFLAGS" >&5
     20933echo "$as_me: ClpLib CFLAGS are $CLPLIB_CFLAGS" >&6;}
     20934        { echo "$as_me:$LINENO: ClpLib LIBS   are $CLPLIB_LIBS" >&5
     20935echo "$as_me: ClpLib LIBS   are $CLPLIB_LIBS" >&6;}
     20936
     20937    fi
     20938  fi
     20939done
     20940
     20941
     20942
     20943if test $coin_has_coinutils != notGiven &&
     20944                test $coin_has_coinutils != skipping; then
     20945  COIN_HAS_COINUTILS_TRUE=
     20946  COIN_HAS_COINUTILS_FALSE='#'
     20947else
     20948  COIN_HAS_COINUTILS_TRUE='#'
     20949  COIN_HAS_COINUTILS_FALSE=
     20950fi
     20951
     20952
     20953
     20954  fi
     20955
     20956else
     20957  echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
     20958echo "${ECHO_T}$coin_has_coinutils" >&6
     20959fi
     20960
     20961if test $coin_has_coinutils != skipping &&
     20962   test $coin_has_coinutils != notGiven ; then
     20963
     20964cat >>confdefs.h <<\_ACEOF
     20965#define COIN_HAS_COINUTILS 1
     20966_ACEOF
     20967
     20968
     20969  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2089620970    if test -n "$COINUTILS_CFLAGS" ; then
    2089720971      { echo "$as_me:$LINENO: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&5
    … …  
    2090620980echo "$as_me: CoinUtils DATA   is  $COINUTILS_DATA" >&6;}
    2090720981    fi
     20982    if test -n "$COINUTILS_CFLAGS" ; then
     20983      { echo "$as_me:$LINENO: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&5
     20984echo "$as_me: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&6;}
    2090820985    fi
     20986
     20987      { echo "$as_me:$LINENO: ClpLib CFLAGS are $CLPLIB_CFLAGS" >&5
     20988echo "$as_me: ClpLib CFLAGS are $CLPLIB_CFLAGS" >&6;}
     20989      { echo "$as_me:$LINENO: ClpLib LIBS   are $CLPLIB_LIBS" >&5
     20990echo "$as_me: ClpLib LIBS   are $CLPLIB_LIBS" >&6;}
     20991
    2090920992  fi
    20910 done
    20911 
     20993fi
     20994
     20995# Define the Makefile conditional
    2091220996
    2091320997
    … …  
    2092321007
    2092421008
    20925   fi
    20926 
    20927 else
    20928   echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
    20929 echo "${ECHO_T}$coin_has_coinutils" >&6
    20930 fi
    20931 
    20932 if test $coin_has_coinutils != skipping &&
    20933    test $coin_has_coinutils != notGiven ; then
    20934   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    20935   if test -n "$COINUTILS_CFLAGS" ; then
    20936     { echo "$as_me:$LINENO: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&5
    20937 echo "$as_me: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&6;}
    20938   fi
    20939   if test -n "$COINUTILS_LIBS" ; then
    20940     { echo "$as_me:$LINENO: CoinUtils LIBS   are $COINUTILS_LIBS" >&5
    20941 echo "$as_me: CoinUtils LIBS   are $COINUTILS_LIBS" >&6;}
    20942   fi
    20943   if test -n "$COINUTILS_DATA" ; then
    20944     { echo "$as_me:$LINENO: CoinUtils DATA   is  $COINUTILS_DATA" >&5
    20945 echo "$as_me: CoinUtils DATA   is  $COINUTILS_DATA" >&6;}
    20946   fi
    20947   fi
    20948 
    20949 cat >>confdefs.h <<\_ACEOF
    20950 #define COIN_HAS_COINUTILS 1
    20951 _ACEOF
    20952 
    20953 fi
    20954 
    20955 # Define the Makefile conditional
    20956 
    20957 
    20958 if test $coin_has_coinutils != notGiven &&
    20959                 test $coin_has_coinutils != skipping; then
    20960   COIN_HAS_COINUTILS_TRUE=
    20961   COIN_HAS_COINUTILS_FALSE='#'
    20962 else
    20963   COIN_HAS_COINUTILS_TRUE='#'
    20964   COIN_HAS_COINUTILS_FALSE=
    20965 fi
    20966 
    20967 
    20968 
    20969 
    20970 echo "$as_me:$LINENO: checking for COIN-OR module Osi" >&5
    20971 echo $ECHO_N "checking for COIN-OR module Osi... $ECHO_C" >&6
     21009
     21010echo "$as_me:$LINENO: checking for COIN-OR package Osi" >&5
     21011echo $ECHO_N "checking for COIN-OR package Osi... $ECHO_C" >&6
    2097221012
    2097321013coin_has_osi=notGiven
    2097421014
    20975 # check if user wants to skip module in any case
     21015# check if user wants to skip package in any case
    2097621016if test x"$COIN_SKIP_PROJECTS" != x; then
    2097721017  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2099021030
    2099121031
     21032
     21033
     21034
     21035
    2099221036#check if user provided LIBS, CFLAGS, or DATA for module
    2099321037if test $coin_has_osi != skipping; then
    … …  
    2100021044       OSI_LIBS="$withval"
    2100121045
     21046         OSICLPLIB_PCLIBS="$withval $OSICLPLIB_PCLIBS"
     21047         OSICLPLIB_LIBS="$withval $OSICLPLIB_LIBS"
     21048
    2100221049
    2100321050fi;
    … …  
    2100921056  coin_has_osi=yes
    2101021057     OSI_CFLAGS="-I`${CYGPATH_W} $withval`"
     21058     OSICLPLIB_CFLAGS="$withval $OSICLPLIB_CFLAGS"
     21059
     21060
    2101121061fi;
    2101221062
    … …  
    2104921099        echo "$as_me:$LINENO: result: yes: $OSI_VERSIONS" >&5
    2105021100echo "${ECHO_T}yes: $OSI_VERSIONS" >&6
     21101        OSICLPLIB_PCREQUIRES="osi $OSICLPLIB_PCREQUIRES"
    2105121102
    2105221103
    … …  
    2107121122    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2107221123    export PKG_CONFIG_PATH
     21124
     21125    # augment X_CFLAGS and X_LIBS for each build target X in OsiClpLib
     21126
     21127      OSICLPLIB_CFLAGS="$OSI_CFLAGS $OSICLPLIB_CFLAGS"
     21128      OSICLPLIB_LIBS="$OSI_LIBS $OSICLPLIB_LIBS"
     21129
    2107321130  else
    2107421131    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2107521132echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2107621133
    21077 echo "$as_me:$LINENO: checking for COIN-OR module Osi (fallback)" >&5
    21078 echo $ECHO_N "checking for COIN-OR module Osi (fallback)... $ECHO_C" >&6
     21134echo "$as_me:$LINENO: checking for COIN-OR package Osi (fallback)" >&5
     21135echo $ECHO_N "checking for COIN-OR package Osi (fallback)... $ECHO_C" >&6
    2107921136
    2108021137coin_has_osi=notGiven
    … …  
    2108221139OSI_CFLAGS=
    2108321140OSI_DATA=
    21084 
    2108521141
    2108621142# initial list of dependencies is "osi", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2115821214  projtoprocess="$nextprojtoprocess"
    2115921215
     21216  # if there are no more projects to search for, finish up
    2116021217  if test "x$projtoprocess" = x ; then
    2116121218    coin_has_osi=yes
    … …  
    2116321220echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2116421221
    21165 
    21166 
    2116721222cat >>confdefs.h <<\_ACEOF
    2116821223#define COIN_HAS_OSI 1
    … …  
    2117021225
    2117121226
     21227
     21228      OSICLPLIB_PCREQUIRES="osi $OSICLPLIB_PCREQUIRES"
     21229      OSICLPLIB_CFLAGS="$OSI_CFLAGS $OSICLPLIB_CFLAGS"
     21230      OSICLPLIB_LIBS="$OSI_LIBS $OSICLPLIB_LIBS"
     21231
     21232
    2117221233    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     21234      if test -n "$OSI_CFLAGS" ; then
     21235        { echo "$as_me:$LINENO: Osi CFLAGS are $OSI_CFLAGS" >&5
     21236echo "$as_me: Osi CFLAGS are $OSI_CFLAGS" >&6;}
     21237      fi
     21238      if test -n "$OSI_LIBS" ; then
     21239        { echo "$as_me:$LINENO: Osi LIBS   are $OSI_LIBS" >&5
     21240echo "$as_me: Osi LIBS   are $OSI_LIBS" >&6;}
     21241      fi
     21242      if test -n "$OSI_DATA" ; then
     21243        { echo "$as_me:$LINENO: Osi DATA   is  $OSI_DATA" >&5
     21244echo "$as_me: Osi DATA   is  $OSI_DATA" >&6;}
     21245      fi
     21246
     21247        { echo "$as_me:$LINENO: OsiClpLib CFLAGS are $OSICLPLIB_CFLAGS" >&5
     21248echo "$as_me: OsiClpLib CFLAGS are $OSICLPLIB_CFLAGS" >&6;}
     21249        { echo "$as_me:$LINENO: OsiClpLib LIBS   are $OSICLPLIB_LIBS" >&5
     21250echo "$as_me: OsiClpLib LIBS   are $OSICLPLIB_LIBS" >&6;}
     21251
     21252    fi
     21253  fi
     21254done
     21255
     21256
     21257
     21258if test $coin_has_osi != notGiven &&
     21259                test $coin_has_osi != skipping; then
     21260  COIN_HAS_OSI_TRUE=
     21261  COIN_HAS_OSI_FALSE='#'
     21262else
     21263  COIN_HAS_OSI_TRUE='#'
     21264  COIN_HAS_OSI_FALSE=
     21265fi
     21266
     21267
     21268
     21269  fi
     21270
     21271else
     21272  echo "$as_me:$LINENO: result: $coin_has_osi" >&5
     21273echo "${ECHO_T}$coin_has_osi" >&6
     21274fi
     21275
     21276if test $coin_has_osi != skipping &&
     21277   test $coin_has_osi != notGiven ; then
     21278
     21279cat >>confdefs.h <<\_ACEOF
     21280#define COIN_HAS_OSI 1
     21281_ACEOF
     21282
     21283
     21284  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2117321285    if test -n "$OSI_CFLAGS" ; then
    2117421286      { echo "$as_me:$LINENO: Osi CFLAGS are $OSI_CFLAGS" >&5
    … …  
    2118321295echo "$as_me: Osi DATA   is  $OSI_DATA" >&6;}
    2118421296    fi
     21297    if test -n "$OSI_CFLAGS" ; then
     21298      { echo "$as_me:$LINENO: Osi CFLAGS are $OSI_CFLAGS" >&5
     21299echo "$as_me: Osi CFLAGS are $OSI_CFLAGS" >&6;}
    2118521300    fi
     21301
     21302      { echo "$as_me:$LINENO: OsiClpLib CFLAGS are $OSICLPLIB_CFLAGS" >&5
     21303echo "$as_me: OsiClpLib CFLAGS are $OSICLPLIB_CFLAGS" >&6;}
     21304      { echo "$as_me:$LINENO: OsiClpLib LIBS   are $OSICLPLIB_LIBS" >&5
     21305echo "$as_me: OsiClpLib LIBS   are $OSICLPLIB_LIBS" >&6;}
     21306
    2118621307  fi
    21187 done
    21188 
     21308fi
     21309
     21310# Define the Makefile conditional
    2118921311
    2119021312
    … …  
    2120021322
    2120121323
    21202   fi
    21203 
    21204 else
    21205   echo "$as_me:$LINENO: result: $coin_has_osi" >&5
    21206 echo "${ECHO_T}$coin_has_osi" >&6
    21207 fi
    21208 
    21209 if test $coin_has_osi != skipping &&
    21210    test $coin_has_osi != notGiven ; then
    21211   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    21212   if test -n "$OSI_CFLAGS" ; then
    21213     { echo "$as_me:$LINENO: Osi CFLAGS are $OSI_CFLAGS" >&5
    21214 echo "$as_me: Osi CFLAGS are $OSI_CFLAGS" >&6;}
    21215   fi
    21216   if test -n "$OSI_LIBS" ; then
    21217     { echo "$as_me:$LINENO: Osi LIBS   are $OSI_LIBS" >&5
    21218 echo "$as_me: Osi LIBS   are $OSI_LIBS" >&6;}
    21219   fi
    21220   if test -n "$OSI_DATA" ; then
    21221     { echo "$as_me:$LINENO: Osi DATA   is  $OSI_DATA" >&5
    21222 echo "$as_me: Osi DATA   is  $OSI_DATA" >&6;}
    21223   fi
    21224   fi
    21225 
    21226 cat >>confdefs.h <<\_ACEOF
    21227 #define COIN_HAS_OSI 1
    21228 _ACEOF
    21229 
    21230 fi
    21231 
    21232 # Define the Makefile conditional
    21233 
    21234 
    21235 if test $coin_has_osi != notGiven &&
    21236                 test $coin_has_osi != skipping; then
    21237   COIN_HAS_OSI_TRUE=
    21238   COIN_HAS_OSI_FALSE='#'
    21239 else
    21240   COIN_HAS_OSI_TRUE='#'
    21241   COIN_HAS_OSI_FALSE=
    21242 fi
    21243 
    21244 
    21245 
    21246 
    21247 echo "$as_me:$LINENO: checking for COIN-OR module OsiTests" >&5
    21248 echo $ECHO_N "checking for COIN-OR module OsiTests... $ECHO_C" >&6
     21324
     21325echo "$as_me:$LINENO: checking for COIN-OR package OsiTests" >&5
     21326echo $ECHO_N "checking for COIN-OR package OsiTests... $ECHO_C" >&6
    2124921327
    2125021328coin_has_ositests=notGiven
    2125121329
    21252 # check if user wants to skip module in any case
     21330# check if user wants to skip package in any case
    2125321331if test x"$COIN_SKIP_PROJECTS" != x; then
    2125421332  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2128621364  coin_has_ositests=yes
    2128721365     OSITESTS_CFLAGS="-I`${CYGPATH_W} $withval`"
     21366
     21367
    2128821368fi;
    2128921369
    … …  
    2134821428    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2134921429    export PKG_CONFIG_PATH
     21430
     21431    # augment X_CFLAGS and X_LIBS for each build target X in
     21432
    2135021433  else
    2135121434    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2135221435echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2135321436
    21354 echo "$as_me:$LINENO: checking for COIN-OR module OsiTests (fallback)" >&5
    21355 echo $ECHO_N "checking for COIN-OR module OsiTests (fallback)... $ECHO_C" >&6
     21437echo "$as_me:$LINENO: checking for COIN-OR package OsiTests (fallback)" >&5
     21438echo $ECHO_N "checking for COIN-OR package OsiTests (fallback)... $ECHO_C" >&6
    2135621439
    2135721440coin_has_ositests=notGiven
    … …  
    2135921442OSITESTS_CFLAGS=
    2136021443OSITESTS_DATA=
    21361 
    2136221444
    2136321445# initial list of dependencies is "osi-unittests", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2143521517  projtoprocess="$nextprojtoprocess"
    2143621518
     21519  # if there are no more projects to search for, finish up
    2143721520  if test "x$projtoprocess" = x ; then
    2143821521    coin_has_ositests=yes
    … …  
    2144021523echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2144121524
    21442 
    21443 
    2144421525cat >>confdefs.h <<\_ACEOF
    2144521526#define COIN_HAS_OSITESTS 1
    … …  
    2144721528
    2144821529
     21530
     21531
    2144921532    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     21533      if test -n "$OSITESTS_CFLAGS" ; then
     21534        { echo "$as_me:$LINENO: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&5
     21535echo "$as_me: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&6;}
     21536      fi
     21537      if test -n "$OSITESTS_LIBS" ; then
     21538        { echo "$as_me:$LINENO: OsiTests LIBS   are $OSITESTS_LIBS" >&5
     21539echo "$as_me: OsiTests LIBS   are $OSITESTS_LIBS" >&6;}
     21540      fi
     21541      if test -n "$OSITESTS_DATA" ; then
     21542        { echo "$as_me:$LINENO: OsiTests DATA   is  $OSITESTS_DATA" >&5
     21543echo "$as_me: OsiTests DATA   is  $OSITESTS_DATA" >&6;}
     21544      fi
     21545
     21546    fi
     21547  fi
     21548done
     21549
     21550
     21551
     21552if test $coin_has_ositests != notGiven &&
     21553                test $coin_has_ositests != skipping; then
     21554  COIN_HAS_OSITESTS_TRUE=
     21555  COIN_HAS_OSITESTS_FALSE='#'
     21556else
     21557  COIN_HAS_OSITESTS_TRUE='#'
     21558  COIN_HAS_OSITESTS_FALSE=
     21559fi
     21560
     21561
     21562
     21563  fi
     21564
     21565else
     21566  echo "$as_me:$LINENO: result: $coin_has_ositests" >&5
     21567echo "${ECHO_T}$coin_has_ositests" >&6
     21568fi
     21569
     21570if test $coin_has_ositests != skipping &&
     21571   test $coin_has_ositests != notGiven ; then
     21572
     21573cat >>confdefs.h <<\_ACEOF
     21574#define COIN_HAS_OSITESTS 1
     21575_ACEOF
     21576
     21577
     21578  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2145021579    if test -n "$OSITESTS_CFLAGS" ; then
    2145121580      { echo "$as_me:$LINENO: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&5
    … …  
    2146021589echo "$as_me: OsiTests DATA   is  $OSITESTS_DATA" >&6;}
    2146121590    fi
     21591    if test -n "$OSITESTS_CFLAGS" ; then
     21592      { echo "$as_me:$LINENO: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&5
     21593echo "$as_me: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&6;}
    2146221594    fi
     21595
    2146321596  fi
    21464 done
    21465 
     21597fi
     21598
     21599# Define the Makefile conditional
    2146621600
    2146721601
    … …  
    2147721611
    2147821612
    21479   fi
    21480 
    21481 else
    21482   echo "$as_me:$LINENO: result: $coin_has_ositests" >&5
    21483 echo "${ECHO_T}$coin_has_ositests" >&6
    21484 fi
    21485 
    21486 if test $coin_has_ositests != skipping &&
    21487    test $coin_has_ositests != notGiven ; then
    21488   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    21489   if test -n "$OSITESTS_CFLAGS" ; then
    21490     { echo "$as_me:$LINENO: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&5
    21491 echo "$as_me: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&6;}
    21492   fi
    21493   if test -n "$OSITESTS_LIBS" ; then
    21494     { echo "$as_me:$LINENO: OsiTests LIBS   are $OSITESTS_LIBS" >&5
    21495 echo "$as_me: OsiTests LIBS   are $OSITESTS_LIBS" >&6;}
    21496   fi
    21497   if test -n "$OSITESTS_DATA" ; then
    21498     { echo "$as_me:$LINENO: OsiTests DATA   is  $OSITESTS_DATA" >&5
    21499 echo "$as_me: OsiTests DATA   is  $OSITESTS_DATA" >&6;}
    21500   fi
    21501   fi
    21502 
    21503 cat >>confdefs.h <<\_ACEOF
    21504 #define COIN_HAS_OSITESTS 1
    21505 _ACEOF
    21506 
    21507 fi
    21508 
    21509 # Define the Makefile conditional
    21510 
    21511 
    21512 if test $coin_has_ositests != notGiven &&
    21513                 test $coin_has_ositests != skipping; then
    21514   COIN_HAS_OSITESTS_TRUE=
    21515   COIN_HAS_OSITESTS_FALSE='#'
    21516 else
    21517   COIN_HAS_OSITESTS_TRUE='#'
    21518   COIN_HAS_OSITESTS_FALSE=
    21519 fi
    21520 
    21521 
    21522 
    21523 
    21524 echo "$as_me:$LINENO: checking for COIN-OR module Sample" >&5
    21525 echo $ECHO_N "checking for COIN-OR module Sample... $ECHO_C" >&6
     21613
     21614echo "$as_me:$LINENO: checking for COIN-OR package Sample" >&5
     21615echo $ECHO_N "checking for COIN-OR package Sample... $ECHO_C" >&6
    2152621616
    2152721617coin_has_sample=notGiven
    2152821618
    21529 # check if user wants to skip module in any case
     21619# check if user wants to skip package in any case
    2153021620if test x"$COIN_SKIP_PROJECTS" != x; then
    2153121621  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2156321653  coin_has_sample=yes
    2156421654     SAMPLE_CFLAGS="-I`${CYGPATH_W} $withval`"
     21655
     21656
    2156521657fi;
    2156621658
    … …  
    2162521717    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2162621718    export PKG_CONFIG_PATH
     21719
     21720    # augment X_CFLAGS and X_LIBS for each build target X in
     21721
    2162721722  else
    2162821723    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2162921724echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2163021725
    21631 echo "$as_me:$LINENO: checking for COIN-OR module Sample (fallback)" >&5
    21632 echo $ECHO_N "checking for COIN-OR module Sample (fallback)... $ECHO_C" >&6
     21726echo "$as_me:$LINENO: checking for COIN-OR package Sample (fallback)" >&5
     21727echo $ECHO_N "checking for COIN-OR package Sample (fallback)... $ECHO_C" >&6
    2163321728
    2163421729coin_has_sample=notGiven
    … …  
    2163621731SAMPLE_CFLAGS=
    2163721732SAMPLE_DATA=
    21638 
    2163921733
    2164021734# initial list of dependencies is "coindatasample", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2171221806  projtoprocess="$nextprojtoprocess"
    2171321807
     21808  # if there are no more projects to search for, finish up
    2171421809  if test "x$projtoprocess" = x ; then
    2171521810    coin_has_sample=yes
    … …  
    2171721812echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2171821813
    21719 
    21720 
    2172121814cat >>confdefs.h <<\_ACEOF
    2172221815#define COIN_HAS_SAMPLE 1
    … …  
    2172421817
    2172521818
     21819
     21820
    2172621821    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     21822      if test -n "$SAMPLE_CFLAGS" ; then
     21823        { echo "$as_me:$LINENO: Sample CFLAGS are $SAMPLE_CFLAGS" >&5
     21824echo "$as_me: Sample CFLAGS are $SAMPLE_CFLAGS" >&6;}
     21825      fi
     21826      if test -n "$SAMPLE_LIBS" ; then
     21827        { echo "$as_me:$LINENO: Sample LIBS   are $SAMPLE_LIBS" >&5
     21828echo "$as_me: Sample LIBS   are $SAMPLE_LIBS" >&6;}
     21829      fi
     21830      if test -n "$SAMPLE_DATA" ; then
     21831        { echo "$as_me:$LINENO: Sample DATA   is  $SAMPLE_DATA" >&5
     21832echo "$as_me: Sample DATA   is  $SAMPLE_DATA" >&6;}
     21833      fi
     21834
     21835    fi
     21836  fi
     21837done
     21838
     21839
     21840
     21841if test $coin_has_sample != notGiven &&
     21842                test $coin_has_sample != skipping; then
     21843  COIN_HAS_SAMPLE_TRUE=
     21844  COIN_HAS_SAMPLE_FALSE='#'
     21845else
     21846  COIN_HAS_SAMPLE_TRUE='#'
     21847  COIN_HAS_SAMPLE_FALSE=
     21848fi
     21849
     21850
     21851
     21852  fi
     21853
     21854else
     21855  echo "$as_me:$LINENO: result: $coin_has_sample" >&5
     21856echo "${ECHO_T}$coin_has_sample" >&6
     21857fi
     21858
     21859if test $coin_has_sample != skipping &&
     21860   test $coin_has_sample != notGiven ; then
     21861
     21862cat >>confdefs.h <<\_ACEOF
     21863#define COIN_HAS_SAMPLE 1
     21864_ACEOF
     21865
     21866
     21867  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2172721868    if test -n "$SAMPLE_CFLAGS" ; then
    2172821869      { echo "$as_me:$LINENO: Sample CFLAGS are $SAMPLE_CFLAGS" >&5
    … …  
    2173721878echo "$as_me: Sample DATA   is  $SAMPLE_DATA" >&6;}
    2173821879    fi
     21880    if test -n "$SAMPLE_CFLAGS" ; then
     21881      { echo "$as_me:$LINENO: Sample CFLAGS are $SAMPLE_CFLAGS" >&5
     21882echo "$as_me: Sample CFLAGS are $SAMPLE_CFLAGS" >&6;}
    2173921883    fi
     21884
    2174021885  fi
    21741 done
    21742 
     21886fi
     21887
     21888# Define the Makefile conditional
    2174321889
    2174421890
    … …  
    2175421900
    2175521901
    21756   fi
    21757 
    21758 else
    21759   echo "$as_me:$LINENO: result: $coin_has_sample" >&5
    21760 echo "${ECHO_T}$coin_has_sample" >&6
    21761 fi
    21762 
    21763 if test $coin_has_sample != skipping &&
    21764    test $coin_has_sample != notGiven ; then
    21765   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    21766   if test -n "$SAMPLE_CFLAGS" ; then
    21767     { echo "$as_me:$LINENO: Sample CFLAGS are $SAMPLE_CFLAGS" >&5
    21768 echo "$as_me: Sample CFLAGS are $SAMPLE_CFLAGS" >&6;}
    21769   fi
    21770   if test -n "$SAMPLE_LIBS" ; then
    21771     { echo "$as_me:$LINENO: Sample LIBS   are $SAMPLE_LIBS" >&5
    21772 echo "$as_me: Sample LIBS   are $SAMPLE_LIBS" >&6;}
    21773   fi
    21774   if test -n "$SAMPLE_DATA" ; then
    21775     { echo "$as_me:$LINENO: Sample DATA   is  $SAMPLE_DATA" >&5
    21776 echo "$as_me: Sample DATA   is  $SAMPLE_DATA" >&6;}
    21777   fi
    21778   fi
    21779 
    21780 cat >>confdefs.h <<\_ACEOF
    21781 #define COIN_HAS_SAMPLE 1
    21782 _ACEOF
    21783 
    21784 fi
    21785 
    21786 # Define the Makefile conditional
    21787 
    21788 
    21789 if test $coin_has_sample != notGiven &&
    21790                 test $coin_has_sample != skipping; then
    21791   COIN_HAS_SAMPLE_TRUE=
    21792   COIN_HAS_SAMPLE_FALSE='#'
    21793 else
    21794   COIN_HAS_SAMPLE_TRUE='#'
    21795   COIN_HAS_SAMPLE_FALSE=
    21796 fi
    21797 
    21798 
    21799 
    21800 
    21801 echo "$as_me:$LINENO: checking for COIN-OR module Netlib" >&5
    21802 echo $ECHO_N "checking for COIN-OR module Netlib... $ECHO_C" >&6
     21902
     21903echo "$as_me:$LINENO: checking for COIN-OR package Netlib" >&5
     21904echo $ECHO_N "checking for COIN-OR package Netlib... $ECHO_C" >&6
    2180321905
    2180421906coin_has_netlib=notGiven
    2180521907
    21806 # check if user wants to skip module in any case
     21908# check if user wants to skip package in any case
    2180721909if test x"$COIN_SKIP_PROJECTS" != x; then
    2180821910  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2184021942  coin_has_netlib=yes
    2184121943     NETLIB_CFLAGS="-I`${CYGPATH_W} $withval`"
     21944
     21945
    2184221946fi;
    2184321947
    … …  
    2190222006    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2190322007    export PKG_CONFIG_PATH
     22008
     22009    # augment X_CFLAGS and X_LIBS for each build target X in
     22010
    2190422011  else
    2190522012    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2190622013echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2190722014
    21908 echo "$as_me:$LINENO: checking for COIN-OR module Netlib (fallback)" >&5
    21909 echo $ECHO_N "checking for COIN-OR module Netlib (fallback)... $ECHO_C" >&6
     22015echo "$as_me:$LINENO: checking for COIN-OR package Netlib (fallback)" >&5
     22016echo $ECHO_N "checking for COIN-OR package Netlib (fallback)... $ECHO_C" >&6
    2191022017
    2191122018coin_has_netlib=notGiven
    … …  
    2191322020NETLIB_CFLAGS=
    2191422021NETLIB_DATA=
    21915 
    2191622022
    2191722023# initial list of dependencies is "coindatanetlib", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2198922095  projtoprocess="$nextprojtoprocess"
    2199022096
     22097  # if there are no more projects to search for, finish up
    2199122098  if test "x$projtoprocess" = x ; then
    2199222099    coin_has_netlib=yes
    … …  
    2199422101echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2199522102
    21996 
    21997 
    2199822103cat >>confdefs.h <<\_ACEOF
    2199922104#define COIN_HAS_NETLIB 1
    … …  
    2200122106
    2200222107
     22108
     22109
    2200322110    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     22111      if test -n "$NETLIB_CFLAGS" ; then
     22112        { echo "$as_me:$LINENO: Netlib CFLAGS are $NETLIB_CFLAGS" >&5
     22113echo "$as_me: Netlib CFLAGS are $NETLIB_CFLAGS" >&6;}
     22114      fi
     22115      if test -n "$NETLIB_LIBS" ; then
     22116        { echo "$as_me:$LINENO: Netlib LIBS   are $NETLIB_LIBS" >&5
     22117echo "$as_me: Netlib LIBS   are $NETLIB_LIBS" >&6;}
     22118      fi
     22119      if test -n "$NETLIB_DATA" ; then
     22120        { echo "$as_me:$LINENO: Netlib DATA   is  $NETLIB_DATA" >&5
     22121echo "$as_me: Netlib DATA   is  $NETLIB_DATA" >&6;}
     22122      fi
     22123
     22124    fi
     22125  fi
     22126done
     22127
     22128
     22129
     22130if test $coin_has_netlib != notGiven &&
     22131                test $coin_has_netlib != skipping; then
     22132  COIN_HAS_NETLIB_TRUE=
     22133  COIN_HAS_NETLIB_FALSE='#'
     22134else
     22135  COIN_HAS_NETLIB_TRUE='#'
     22136  COIN_HAS_NETLIB_FALSE=
     22137fi
     22138
     22139
     22140
     22141  fi
     22142
     22143else
     22144  echo "$as_me:$LINENO: result: $coin_has_netlib" >&5
     22145echo "${ECHO_T}$coin_has_netlib" >&6
     22146fi
     22147
     22148if test $coin_has_netlib != skipping &&
     22149   test $coin_has_netlib != notGiven ; then
     22150
     22151cat >>confdefs.h <<\_ACEOF
     22152#define COIN_HAS_NETLIB 1
     22153_ACEOF
     22154
     22155
     22156  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2200422157    if test -n "$NETLIB_CFLAGS" ; then
    2200522158      { echo "$as_me:$LINENO: Netlib CFLAGS are $NETLIB_CFLAGS" >&5
    … …  
    2201422167echo "$as_me: Netlib DATA   is  $NETLIB_DATA" >&6;}
    2201522168    fi
     22169    if test -n "$NETLIB_CFLAGS" ; then
     22170      { echo "$as_me:$LINENO: Netlib CFLAGS are $NETLIB_CFLAGS" >&5
     22171echo "$as_me: Netlib CFLAGS are $NETLIB_CFLAGS" >&6;}
    2201622172    fi
     22173
    2201722174  fi
    22018 done
    22019 
     22175fi
     22176
     22177# Define the Makefile conditional
    2202022178
    2202122179
    … …  
    2203122189
    2203222190
    22033   fi
    22034 
    22035 else
    22036   echo "$as_me:$LINENO: result: $coin_has_netlib" >&5
    22037 echo "${ECHO_T}$coin_has_netlib" >&6
    22038 fi
    22039 
    22040 if test $coin_has_netlib != skipping &&
    22041    test $coin_has_netlib != notGiven ; then
    22042   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    22043   if test -n "$NETLIB_CFLAGS" ; then
    22044     { echo "$as_me:$LINENO: Netlib CFLAGS are $NETLIB_CFLAGS" >&5
    22045 echo "$as_me: Netlib CFLAGS are $NETLIB_CFLAGS" >&6;}
    22046   fi
    22047   if test -n "$NETLIB_LIBS" ; then
    22048     { echo "$as_me:$LINENO: Netlib LIBS   are $NETLIB_LIBS" >&5
    22049 echo "$as_me: Netlib LIBS   are $NETLIB_LIBS" >&6;}
    22050   fi
    22051   if test -n "$NETLIB_DATA" ; then
    22052     { echo "$as_me:$LINENO: Netlib DATA   is  $NETLIB_DATA" >&5
    22053 echo "$as_me: Netlib DATA   is  $NETLIB_DATA" >&6;}
    22054   fi
    22055   fi
    22056 
    22057 cat >>confdefs.h <<\_ACEOF
    22058 #define COIN_HAS_NETLIB 1
    22059 _ACEOF
    22060 
    22061 fi
    22062 
    22063 # Define the Makefile conditional
    22064 
    22065 
    22066 if test $coin_has_netlib != notGiven &&
    22067                 test $coin_has_netlib != skipping; then
    22068   COIN_HAS_NETLIB_TRUE=
    22069   COIN_HAS_NETLIB_FALSE='#'
    22070 else
    22071   COIN_HAS_NETLIB_TRUE='#'
    22072   COIN_HAS_NETLIB_FALSE=
    22073 fi
    22074 
    22075 
    22076 
    2207722191
    2207822192#############################################################################
    … …  
    2209122205
    2209222206if test "$use_wsmp" != "no"; then
    22093   LIBS="$use_wsmp $LIBS"
    22094   ADDLIBS="$use_wsmp $ADDLIBS"
     22207  CLPLIB_LIBS="$use_wsmp $CLPLIB_LIBS"
     22208  CLPLIB_PCLIBS="$use_wsmp $CLPLIB_PCLIBS"
    2209522209
    2209622210  defval=
    … …  
    2219922313      conftest$ac_exeext conftest.$ac_ext
    2220022314  fi
    22201   if test "$defval" = ""; then
     22315  if test "x$defval" = "x"; then
    2220222316    { { echo "$as_me:$LINENO: error: WSMP library $use_wsmp does not seem to work" >&5
    2220322317echo "$as_me: error: WSMP library $use_wsmp does not seem to work" >&2;}
    … …  
    2250322617if test $ac_cv_lib_readline_readline = yes; then
    2250422618  ADDLIBS="-lreadline $LIBS $ADDLIBS"
     22619
     22620                    CLPLIB_LIBS="-lreadline $LIBS $CLPLIB_LIBS"
     22621                    CLPLIB_PCLIBS="-lreadline $LIBS $CLPLIB_PCLIBS"
     22622
     22623
    2250522624else
    2250622625  coin_has_readline=no
    … …  
    2368323802s,@COINUTILS_CFLAGS@,$COINUTILS_CFLAGS,;t t
    2368423803s,@COINUTILS_DATA@,$COINUTILS_DATA,;t t
    23685 s,@REQUIREDPACKAGES@,$REQUIREDPACKAGES,;t t
     23804s,@CLPLIB_LIBS@,$CLPLIB_LIBS,;t t
     23805s,@CLPLIB_PCLIBS@,$CLPLIB_PCLIBS,;t t
     23806s,@CLPLIB_PCREQUIRES@,$CLPLIB_PCREQUIRES,;t t
    2368623807s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
    2368723808s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    … …  
    2368923810s,@OSI_CFLAGS@,$OSI_CFLAGS,;t t
    2369023811s,@OSI_DATA@,$OSI_DATA,;t t
     23812s,@OSICLPLIB_LIBS@,$OSICLPLIB_LIBS,;t t
     23813s,@OSICLPLIB_PCLIBS@,$OSICLPLIB_PCLIBS,;t t
     23814s,@OSICLPLIB_PCREQUIRES@,$OSICLPLIB_PCREQUIRES,;t t
    2369123815s,@COIN_HAS_OSI_TRUE@,$COIN_HAS_OSI_TRUE,;t t
    2369223816s,@COIN_HAS_OSI_FALSE@,$COIN_HAS_OSI_FALSE,;t t

  • trunk/Clp/configure.ac

    r1581 r1603  
    5757#############################################################################
    5858
    59 AC_COIN_HAS_MODULE(CoinUtils, [coinutils = trunk])
    60 AC_COIN_HAS_MODULE(Osi,       [osi],            [required=0], [../Osi])
    61 AC_COIN_HAS_MODULE(OsiTests,  [osi-unittests],  [required=0], [../Osi])
    62 AC_COIN_HAS_MODULE(Sample,    [coindatasample], [required=0], [../Data/Sample])
    63 AC_COIN_HAS_MODULE(Netlib,    [coindatanetlib], [required=0], [../Data/Netlib])
     59AC_COIN_HAS_PACKAGE(CoinUtils, [coinutils = trunk], [ClpLib])
     60AC_COIN_HAS_PACKAGE(Osi,       [osi],               [OsiClpLib])
     61AC_COIN_HAS_PACKAGE(OsiTests,  [osi-unittests])
     62AC_COIN_HAS_PACKAGE(Sample,    [coindatasample])
     63AC_COIN_HAS_PACKAGE(Netlib,    [coindatanetlib])
    6464
    6565#############################################################################
    … …  
    7474
    7575if test "$use_wsmp" != "no"; then
    76   LIBS="$use_wsmp $LIBS"
    77   ADDLIBS="$use_wsmp $ADDLIBS"
     76  CLPLIB_LIBS="$use_wsmp $CLPLIB_LIBS"
     77  CLPLIB_PCLIBS="$use_wsmp $CLPLIB_PCLIBS"
    7878
    7979  defval=
    … …  
    9090                [AC_MSG_RESULT(no)])
    9191  fi
    92   if test "$defval" = ""; then
     92  if test "x$defval" = "x"; then
    9393    AC_MSG_ERROR([WSMP library $use_wsmp does not seem to work])
    9494  fi
    … …  
    102102#############################################################################
    103103
    104 AC_COIN_CHECK_GNU_READLINE
     104AC_COIN_CHECK_GNU_READLINE(ClpLib)
    105105
    106106##############################################################################

  • trunk/Clp/examples/Makefile.in

    r1583 r1603  
    6464
    6565# Libraries necessary to link with Clp
    66 LIBS = -L`$(CYGPATH_W) $(COINLIBDIR)` -lClp @COINUTILS_LIBS@ @ADDLIBS@
     66LIBS = -L`$(CYGPATH_W) $(COINLIBDIR)` -L`$(CYGPATH_W) $(COINLIBDIR)/ThirdParty` -lClp @CLPLIB_LIBS@
    6767
    6868# Necessary Include dirs (we use the CYGPATH_W variables to allow

  • trunk/Clp/inc/config_clp.h.in

    r1566 r1603  
    1313#undef COIN_CLP_VERBOSITY
    1414
    15 /* Define to 1 if the CoinUtils module is available */
     15/* Define to 1 if the CoinUtils package is available */
    1616#undef COIN_HAS_COINUTILS
    1717
    18 /* Define to 1 if the Netlib module is available */
     18/* Define to 1 if the Netlib package is available */
    1919#undef COIN_HAS_NETLIB
    2020
    21 /* Define to 1 if the Osi module is available */
     21/* Define to 1 if the Osi package is available */
    2222#undef COIN_HAS_OSI
    2323
    24 /* Define to 1 if the OsiTests module is available */
     24/* Define to 1 if the OsiTests package is available */
    2525#undef COIN_HAS_OSITESTS
    2626
    … …  
    2828#undef COIN_HAS_READLINE
    2929
    30 /* Define to 1 if the Sample module is available */
     30/* Define to 1 if the Sample package is available */
    3131#undef COIN_HAS_SAMPLE
    3232

  • trunk/Clp/src/Makefile.am

    r1574 r1603  
    9797
    9898# List all additionally required COIN libraries
    99 clp_LDADD = libClp.la $(COINUTILS_LIBS) $(ADDLIBS)
     99clp_LDADD = libClp.la $(CLPLIB_LIBS)
    100100
    101101# Finally, the -rpath flag is used by libtool to make sure that the shared

  • trunk/Clp/src/Makefile.in

    r1581 r1603  
    9494clp_OBJECTS = $(am_clp_OBJECTS)
    9595am__DEPENDENCIES_1 =
    96 clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1) \
    97         $(am__DEPENDENCIES_1)
     96clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1)
    9897depcomp = $(SHELL) $(top_srcdir)/depcomp
    9998am__depfiles_maybe = depfiles
    … …  
    149148CDEFS = @CDEFS@
    150149CFLAGS = @CFLAGS@
     150CLPLIB_LIBS = @CLPLIB_LIBS@
     151CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
     152CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
    151153CLP_SVN_REV = @CLP_SVN_REV@
    152154COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    … …  
    215217OPT_CFLAGS = @OPT_CFLAGS@
    216218OPT_CXXFLAGS = @OPT_CXXFLAGS@
     219OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     220OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
     221OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    217222OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    218223OSITESTS_DATA = @OSITESTS_DATA@
    … …  
    231236PKG_CONFIG = @PKG_CONFIG@
    232237RANLIB = @RANLIB@
    233 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    234238RPATH_FLAGS = @RPATH_FLAGS@
    235239SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
    … …  
    383387
    384388# List all additionally required COIN libraries
    385 clp_LDADD = libClp.la $(COINUTILS_LIBS) $(ADDLIBS)
     389clp_LDADD = libClp.la $(CLPLIB_LIBS)
    386390
    387391# Finally, the -rpath flag is used by libtool to make sure that the shared

  • trunk/Clp/src/OsiClp/Makefile.in

    r1581 r1603  
    117117CDEFS = @CDEFS@
    118118CFLAGS = @CFLAGS@
     119CLPLIB_LIBS = @CLPLIB_LIBS@
     120CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
     121CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
    119122CLP_SVN_REV = @CLP_SVN_REV@
    120123COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    … …  
    183186OPT_CFLAGS = @OPT_CFLAGS@
    184187OPT_CXXFLAGS = @OPT_CXXFLAGS@
     188OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     189OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
     190OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    185191OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    186192OSITESTS_DATA = @OSITESTS_DATA@
    … …  
    199205PKG_CONFIG = @PKG_CONFIG@
    200206RANLIB = @RANLIB@
    201 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    202207RPATH_FLAGS = @RPATH_FLAGS@
    203208SAMPLE_CFLAGS = @SAMPLE_CFLAGS@

  • trunk/Clp/src/OsiClp/osi-clp-uninstalled.pc.in

    r1559 r1603  
    44Description: COIN-OR Open Solver Interface for CLP
    55Version: @PACKAGE_VERSION@
    6 Libs: -L@ABSBUILDDIR@/src/OsiClp -lOsiClp
     6Libs: -L@ABSBUILDDIR@/src/OsiClp -lOsiClp @OSICLPLIB_PCLIBS@
    77Cflags: -I@abs_source_dir@/src/OsiClp
    8 Requires: osi clp
     8Requires: clp @OSICLPLIB_PCREQUIRES@

  • trunk/Clp/src/OsiClp/osi-clp.pc.in

    r1559 r1603  
    77Description: COIN-OR Open Solver Interface for CLP
    88Version: @PACKAGE_VERSION@
    9 Libs: -L${libdir} -lOsiClp
     9Libs: -L${libdir} -lOsiClp @OSICLPLIB_PCLIBS@
    1010Cflags: -I${includedir}
    11 Requires: osi clp
     11Requires: clp @OSICLPLIB_PCREQUIRES@

  • trunk/Clp/test/Makefile.am

    r1575 r1603  
    2121osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
    2222
    23 LIBS += $(COINUTILS_LIBS) $(OSI_LIBS) $(OSITESTS_LIBS)
     23LIBS += $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
    2424
    2525AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \

  • trunk/Clp/test/Makefile.in

    r1581 r1603  
    4444host_triplet = @host@
    4545@COIN_HAS_OSITESTS_TRUE@noinst_PROGRAMS = osiUnitTest$(EXEEXT)
    46 @COIN_HAS_OSITESTS_TRUE@am__append_1 = $(COINUTILS_LIBS) $(OSI_LIBS) $(OSITESTS_LIBS)
     46@COIN_HAS_OSITESTS_TRUE@am__append_1 = $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
    4747@COIN_HAS_SAMPLE_TRUE@am__append_2 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
    4848@COIN_HAS_SAMPLE_TRUE@am__append_3 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
    … …  
    105105CDEFS = @CDEFS@
    106106CFLAGS = @CFLAGS@
     107CLPLIB_LIBS = @CLPLIB_LIBS@
     108CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
     109CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
    107110CLP_SVN_REV = @CLP_SVN_REV@
    108111COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    … …  
    171174OPT_CFLAGS = @OPT_CFLAGS@
    172175OPT_CXXFLAGS = @OPT_CXXFLAGS@
     176OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     177OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
     178OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    173179OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    174180OSITESTS_DATA = @OSITESTS_DATA@
    … …  
    187193PKG_CONFIG = @PKG_CONFIG@
    188194RANLIB = @RANLIB@
    189 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    190195RPATH_FLAGS = @RPATH_FLAGS@
    191196SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
Note: See TracChangeset for help on using the changeset viewer.