Changeset 1484 for trunk


Ignore:
Timestamp:
Jul 18, 2010 11:13:57 AM (9 years ago)
Author:
stefan
Message:

use PCADDLIBS instead of ADDLIBS to setup .pc file; rerun autotools

Location:
trunk/Cbc
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r1471 r1484  
    275275PACKAGE_VERSION = @PACKAGE_VERSION@
    276276PATH_SEPARATOR = @PATH_SEPARATOR@
     277PCADDLIBS = @PCADDLIBS@
    277278PKG_CONFIG = @PKG_CONFIG@
    278279RANLIB = @RANLIB@
  • trunk/Cbc/cbc-uninstalled.pc.in

    r1464 r1484  
    55Description: COIN-OR Branch and Cut
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lCbcSolver -lCbc @ADDLIBS@
     7Libs: -L${libdir} -lCbcSolver -lCbc @PCADDLIBS@
    88Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
    99Requires: @REQUIREDPACKAGES@
  • trunk/Cbc/cbc.pc.in

    r1464 r1484  
    77Description: COIN-OR Branch and Cut
    88Version: @PACKAGE_VERSION@
    9 Libs: -L${libdir} -lCbcSolver -lCbc @ADDLIBS@
     9Libs: -L${libdir} -lCbcSolver -lCbc @PCADDLIBS@
    1010Cflags: -I${includedir}
    1111Requires: @REQUIREDPACKAGES@
  • trunk/Cbc/configure

    r1483 r1484  
    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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_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 COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA REQUIREDPACKAGES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA COIN_HAS_VOL_TRUE COIN_HAS_VOL_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 MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE 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 CBC_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 COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA REQUIREDPACKAGES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA COIN_HAS_VOL_TRUE COIN_HAS_VOL_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 MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    17351735
    17361736
     1737# Initialize the PCADDLIBS variable.
     1738# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1739# In certain cases, it may contain more flags than the ADDLIBS variable.
     1740PCADDLIBS=""
     1741
     1742
    17371743# As backup, we make sure we don't loose an FLIBS if it has been set
    17381744# by the user
     
    59065912*-*-irix6*)
    59075913  # Find out which ABI we are using.
    5908   echo '#line 5908 "configure"' > conftest.$ac_ext
     5914  echo '#line 5914 "configure"' > conftest.$ac_ext
    59095915  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59105916  (eval $ac_compile) 2>&5
     
    70407046
    70417047# Provide some information about the compiler.
    7042 echo "$as_me:7042:" \
     7048echo "$as_me:7048:" \
    70437049     "checking for Fortran 77 compiler version" >&5
    70447050ac_compiler=`set X $ac_compile; echo $2`
     
    81078113   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81088114   -e 's:$: $lt_compiler_flag:'`
    8109    (eval echo "\"\$as_me:8109: $lt_compile\"" >&5)
     8115   (eval echo "\"\$as_me:8115: $lt_compile\"" >&5)
    81108116   (eval "$lt_compile" 2>conftest.err)
    81118117   ac_status=$?
    81128118   cat conftest.err >&5
    8113    echo "$as_me:8113: \$? = $ac_status" >&5
     8119   echo "$as_me:8119: \$? = $ac_status" >&5
    81148120   if (exit $ac_status) && test -s "$ac_outfile"; then
    81158121     # The compiler can only warn and ignore the option if not recognized
     
    83758381   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83768382   -e 's:$: $lt_compiler_flag:'`
    8377    (eval echo "\"\$as_me:8377: $lt_compile\"" >&5)
     8383   (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
    83788384   (eval "$lt_compile" 2>conftest.err)
    83798385   ac_status=$?
    83808386   cat conftest.err >&5
    8381    echo "$as_me:8381: \$? = $ac_status" >&5
     8387   echo "$as_me:8387: \$? = $ac_status" >&5
    83828388   if (exit $ac_status) && test -s "$ac_outfile"; then
    83838389     # The compiler can only warn and ignore the option if not recognized
     
    84798485   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84808486   -e 's:$: $lt_compiler_flag:'`
    8481    (eval echo "\"\$as_me:8481: $lt_compile\"" >&5)
     8487   (eval echo "\"\$as_me:8487: $lt_compile\"" >&5)
    84828488   (eval "$lt_compile" 2>out/conftest.err)
    84838489   ac_status=$?
    84848490   cat out/conftest.err >&5
    8485    echo "$as_me:8485: \$? = $ac_status" >&5
     8491   echo "$as_me:8491: \$? = $ac_status" >&5
    84868492   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84878493   then
     
    1082410830  lt_status=$lt_dlunknown
    1082510831  cat > conftest.$ac_ext <<EOF
    10826 #line 10826 "configure"
     10832#line 10832 "configure"
    1082710833#include "confdefs.h"
    1082810834
     
    1092410930  lt_status=$lt_dlunknown
    1092510931  cat > conftest.$ac_ext <<EOF
    10926 #line 10926 "configure"
     10932#line 10932 "configure"
    1092710933#include "confdefs.h"
    1092810934
     
    1326813274   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1326913275   -e 's:$: $lt_compiler_flag:'`
    13270    (eval echo "\"\$as_me:13270: $lt_compile\"" >&5)
     13276   (eval echo "\"\$as_me:13276: $lt_compile\"" >&5)
    1327113277   (eval "$lt_compile" 2>conftest.err)
    1327213278   ac_status=$?
    1327313279   cat conftest.err >&5
    13274    echo "$as_me:13274: \$? = $ac_status" >&5
     13280   echo "$as_me:13280: \$? = $ac_status" >&5
    1327513281   if (exit $ac_status) && test -s "$ac_outfile"; then
    1327613282     # The compiler can only warn and ignore the option if not recognized
     
    1337213378   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337313379   -e 's:$: $lt_compiler_flag:'`
    13374    (eval echo "\"\$as_me:13374: $lt_compile\"" >&5)
     13380   (eval echo "\"\$as_me:13380: $lt_compile\"" >&5)
    1337513381   (eval "$lt_compile" 2>out/conftest.err)
    1337613382   ac_status=$?
    1337713383   cat out/conftest.err >&5
    13378    echo "$as_me:13378: \$? = $ac_status" >&5
     13384   echo "$as_me:13384: \$? = $ac_status" >&5
    1337913385   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1338013386   then
     
    1494214948   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494314949   -e 's:$: $lt_compiler_flag:'`
    14944    (eval echo "\"\$as_me:14944: $lt_compile\"" >&5)
     14950   (eval echo "\"\$as_me:14950: $lt_compile\"" >&5)
    1494514951   (eval "$lt_compile" 2>conftest.err)
    1494614952   ac_status=$?
    1494714953   cat conftest.err >&5
    14948    echo "$as_me:14948: \$? = $ac_status" >&5
     14954   echo "$as_me:14954: \$? = $ac_status" >&5
    1494914955   if (exit $ac_status) && test -s "$ac_outfile"; then
    1495014956     # The compiler can only warn and ignore the option if not recognized
     
    1504615052   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1504715053   -e 's:$: $lt_compiler_flag:'`
    15048    (eval echo "\"\$as_me:15048: $lt_compile\"" >&5)
     15054   (eval echo "\"\$as_me:15054: $lt_compile\"" >&5)
    1504915055   (eval "$lt_compile" 2>out/conftest.err)
    1505015056   ac_status=$?
    1505115057   cat out/conftest.err >&5
    15052    echo "$as_me:15052: \$? = $ac_status" >&5
     15058   echo "$as_me:15058: \$? = $ac_status" >&5
    1505315059   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505415060   then
     
    1725317259   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725417260   -e 's:$: $lt_compiler_flag:'`
    17255    (eval echo "\"\$as_me:17255: $lt_compile\"" >&5)
     17261   (eval echo "\"\$as_me:17261: $lt_compile\"" >&5)
    1725617262   (eval "$lt_compile" 2>conftest.err)
    1725717263   ac_status=$?
    1725817264   cat conftest.err >&5
    17259    echo "$as_me:17259: \$? = $ac_status" >&5
     17265   echo "$as_me:17265: \$? = $ac_status" >&5
    1726017266   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726117267     # The compiler can only warn and ignore the option if not recognized
     
    1752117527   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752217528   -e 's:$: $lt_compiler_flag:'`
    17523    (eval echo "\"\$as_me:17523: $lt_compile\"" >&5)
     17529   (eval echo "\"\$as_me:17529: $lt_compile\"" >&5)
    1752417530   (eval "$lt_compile" 2>conftest.err)
    1752517531   ac_status=$?
    1752617532   cat conftest.err >&5
    17527    echo "$as_me:17527: \$? = $ac_status" >&5
     17533   echo "$as_me:17533: \$? = $ac_status" >&5
    1752817534   if (exit $ac_status) && test -s "$ac_outfile"; then
    1752917535     # The compiler can only warn and ignore the option if not recognized
     
    1762517631   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1762617632   -e 's:$: $lt_compiler_flag:'`
    17627    (eval echo "\"\$as_me:17627: $lt_compile\"" >&5)
     17633   (eval echo "\"\$as_me:17633: $lt_compile\"" >&5)
    1762817634   (eval "$lt_compile" 2>out/conftest.err)
    1762917635   ac_status=$?
    1763017636   cat out/conftest.err >&5
    17631    echo "$as_me:17631: \$? = $ac_status" >&5
     17637   echo "$as_me:17637: \$? = $ac_status" >&5
    1763217638   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763317639   then
     
    2073720743
    2073820744
    20739 #check if user provided LIBS, CFLAGS, and DATA for module
     20745#check if user provided LIBS, CFLAGS, or DATA for module
    2074020746if test $coin_has_coindepend != skipping; then
    2074120747
     
    2074620752  coin_has_coindepend=yes
    2074720753       COINDEPEND_LIBS="$withval"
    20748        ADDLIBS="$withval $ADDLIBS"
     20754       PCADDLIBS="$withval $PCADDLIBS"
    2074920755
    2075020756fi;
     
    2109821104    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
    2109921105
    21100     ADDLIBS="$COINUTILS_LIBS $ADDLIBS"
    21101        REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
     21106    REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
    2110221107
    2110321108
     
    2116221167    OSI_DATA=`sed -n -e 's/datadir=//gp' ../Osi/osi-uninstalled.pc`
    2116321168
    21164     ADDLIBS="$OSI_LIBS $ADDLIBS"
    21165        REQUIREDPACKAGES="osi $REQUIREDPACKAGES"
     21169    REQUIREDPACKAGES="osi $REQUIREDPACKAGES"
    2116621170
    2116721171
     
    2122621230    CGL_DATA=`sed -n -e 's/datadir=//gp' ../Cgl/cgl-uninstalled.pc`
    2122721231
    21228     ADDLIBS="$CGL_LIBS $ADDLIBS"
    21229        REQUIREDPACKAGES="cgl $REQUIREDPACKAGES"
     21232    REQUIREDPACKAGES="cgl $REQUIREDPACKAGES"
    2123021233
    2123121234
     
    2129821301
    2129921302
    21300 #check if user provided LIBS, CFLAGS, and DATA for module
     21303#check if user provided LIBS, CFLAGS, or DATA for module
    2130121304if test $coin_has_clp != skipping; then
    2130221305
     
    2130721310  coin_has_clp=yes
    2130821311       CLP_LIBS="$withval"
    21309        ADDLIBS="$withval $ADDLIBS"
     21312       PCADDLIBS="$withval $PCADDLIBS"
    2131021313
    2131121314fi;
     
    2147221475    CLP_DATA=`sed -n -e 's/datadir=//gp' ../Clp/clp-uninstalled.pc`
    2147321476
    21474     ADDLIBS="$CLP_LIBS $ADDLIBS"
    21475        REQUIREDPACKAGES="clp $REQUIREDPACKAGES"
     21477    REQUIREDPACKAGES="clp $REQUIREDPACKAGES"
    2147621478
    2147721479
     
    2155321555    OSICLP_DATA=`sed -n -e 's/datadir=//gp' ../Clp/osi-clp-uninstalled.pc`
    2155421556
    21555     ADDLIBS="$OSICLP_LIBS $ADDLIBS"
    21556        REQUIREDPACKAGES="osi-clp $REQUIREDPACKAGES"
     21557    REQUIREDPACKAGES="osi-clp $REQUIREDPACKAGES"
    2155721558
    2155821559
     
    2160921610
    2161021611
    21611 #check if user provided LIBS, CFLAGS, and DATA for module
     21612#check if user provided LIBS, CFLAGS, or DATA for module
    2161221613if test $coin_has_dylp != skipping; then
    2161321614
     
    2161821619  coin_has_dylp=yes
    2161921620       DYLP_LIBS="$withval"
    21620        ADDLIBS="$withval $ADDLIBS"
     21621       PCADDLIBS="$withval $PCADDLIBS"
    2162121622
    2162221623fi;
     
    2176121762
    2176221763
    21763 #check if user provided LIBS, CFLAGS, and DATA for module
     21764#check if user provided LIBS, CFLAGS, or DATA for module
    2176421765if test $coin_has_vol != skipping; then
    2176521766
     
    2177021771  coin_has_vol=yes
    2177121772       VOL_LIBS="$withval"
    21772        ADDLIBS="$withval $ADDLIBS"
     21773       PCADDLIBS="$withval $PCADDLIBS"
    2177321774
    2177421775fi;
     
    2191321914
    2191421915
    21915 #check if user provided LIBS, CFLAGS, and DATA for module
     21916#check if user provided LIBS, CFLAGS, or DATA for module
    2191621917if test $coin_has_ositests != skipping; then
    2191721918
     
    2214122142
    2214222143
    22143 #check if user provided LIBS, CFLAGS, and DATA for module
     22144#check if user provided LIBS, CFLAGS, or DATA for module
    2214422145if test $coin_has_sample != skipping; then
    2214522146
     
    2236822369
    2236922370
    22370 #check if user provided LIBS, CFLAGS, and DATA for module
     22371#check if user provided LIBS, CFLAGS, or DATA for module
    2237122372if test $coin_has_netlib != skipping; then
    2237222373
     
    2259522596
    2259622597
    22597 #check if user provided LIBS, CFLAGS, and DATA for module
     22598#check if user provided LIBS, CFLAGS, or DATA for module
    2259822599if test $coin_has_miplib3 != skipping; then
    2259922600
     
    2282822829
    2282922830
    22830 #check if user provided LIBS, CFLAGS, and DATA for module
     22831#check if user provided LIBS, CFLAGS, or DATA for module
    2283122832if test $coin_has_cpx != skipping; then
    2283222833
     
    2283722838  coin_has_cpx=yes
    2283822839       CPX_LIBS="$withval"
    22839        ADDLIBS="$withval $ADDLIBS"
     22840       PCADDLIBS="$withval $PCADDLIBS"
    2284022841
    2284122842fi;
     
    2298022981
    2298122982
    22982 #check if user provided LIBS, CFLAGS, and DATA for module
     22983#check if user provided LIBS, CFLAGS, or DATA for module
    2298322984if test $coin_has_glpk != skipping; then
    2298422985
     
    2298922990  coin_has_glpk=yes
    2299022991       GLPK_LIBS="$withval"
    22991        ADDLIBS="$withval $ADDLIBS"
     22992       PCADDLIBS="$withval $PCADDLIBS"
    2299222993
    2299322994fi;
     
    2313223133
    2313323134
    23134 #check if user provided LIBS, CFLAGS, and DATA for module
     23135#check if user provided LIBS, CFLAGS, or DATA for module
    2313523136if test $coin_has_grb != skipping; then
    2313623137
     
    2314123142  coin_has_grb=yes
    2314223143       GRB_LIBS="$withval"
    23143        ADDLIBS="$withval $ADDLIBS"
     23144       PCADDLIBS="$withval $PCADDLIBS"
    2314423145
    2314523146fi;
     
    2328423285
    2328523286
    23286 #check if user provided LIBS, CFLAGS, and DATA for module
     23287#check if user provided LIBS, CFLAGS, or DATA for module
    2328723288if test $coin_has_msk != skipping; then
    2328823289
     
    2329323294  coin_has_msk=yes
    2329423295       MSK_LIBS="$withval"
    23295        ADDLIBS="$withval $ADDLIBS"
     23296       PCADDLIBS="$withval $PCADDLIBS"
    2329623297
    2329723298fi;
     
    2343623437
    2343723438
    23438 #check if user provided LIBS, CFLAGS, and DATA for module
     23439#check if user provided LIBS, CFLAGS, or DATA for module
    2343923440if test $coin_has_spx != skipping; then
    2344023441
     
    2344523446  coin_has_spx=yes
    2344623447       SPX_LIBS="$withval"
    23447        ADDLIBS="$withval $ADDLIBS"
     23448       PCADDLIBS="$withval $PCADDLIBS"
    2344823449
    2344923450fi;
     
    2358823589
    2358923590
    23590 #check if user provided LIBS, CFLAGS, and DATA for module
     23591#check if user provided LIBS, CFLAGS, or DATA for module
    2359123592if test $coin_has_xpr != skipping; then
    2359223593
     
    2359723598  coin_has_xpr=yes
    2359823599       XPR_LIBS="$withval"
    23599        ADDLIBS="$withval $ADDLIBS"
     23600       PCADDLIBS="$withval $PCADDLIBS"
    2360023601
    2360123602fi;
     
    2374623747
    2374723748
    23748 #check if user provided LIBS, CFLAGS, and DATA for module
     23749#check if user provided LIBS, CFLAGS, or DATA for module
    2374923750if test $coin_has_asl != skipping; then
    2375023751
     
    2450124502    ADDLIBS="$ADDLIBS $FLIBS"
    2450224503  fi
     24504  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2450324505
    2450424506  # library extension
     
    2545925461s,@build_os@,$build_os,;t t
    2546025462s,@ADDLIBS@,$ADDLIBS,;t t
     25463s,@PCADDLIBS@,$PCADDLIBS,;t t
    2546125464s,@FADDLIBS@,$FADDLIBS,;t t
    2546225465s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
  • trunk/Cbc/src/Makefile.in

    r1471 r1484  
    397397PACKAGE_VERSION = @PACKAGE_VERSION@
    398398PATH_SEPARATOR = @PATH_SEPARATOR@
     399PCADDLIBS = @PCADDLIBS@
    399400PKG_CONFIG = @PKG_CONFIG@
    400401RANLIB = @RANLIB@
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1471 r1484  
    265265PACKAGE_VERSION = @PACKAGE_VERSION@
    266266PATH_SEPARATOR = @PATH_SEPARATOR@
     267PCADDLIBS = @PCADDLIBS@
    267268PKG_CONFIG = @PKG_CONFIG@
    268269RANLIB = @RANLIB@
  • trunk/Cbc/test/Makefile.in

    r1471 r1484  
    285285PACKAGE_VERSION = @PACKAGE_VERSION@
    286286PATH_SEPARATOR = @PATH_SEPARATOR@
     287PCADDLIBS = @PCADDLIBS@
    287288PKG_CONFIG = @PKG_CONFIG@
    288289RANLIB = @RANLIB@
Note: See TracChangeset for help on using the changeset viewer.