Changeset 1538


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

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

Location:
trunk/Osi
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/Osi/Makefile.in

    r1527 r1538  
    239239PACKAGE_VERSION = @PACKAGE_VERSION@
    240240PATH_SEPARATOR = @PATH_SEPARATOR@
     241PCADDLIBS = @PCADDLIBS@
    241242PKG_CONFIG = @PKG_CONFIG@
    242243RANLIB = @RANLIB@
  • trunk/Osi/configure

    r1537 r1538  
    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 OSI_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 COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_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 GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GRBINCDIR GRBLIB COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE OSI_EXAMPLES_SOLVER_NAME OSI_EXAMPLES_SOLVER_CFLAGS OSI_EXAMPLES_SOLVER_LIBS OSIGLPKPC_LIBS OSIGLPKPC_CFLAGS OSIGLPKPC_REQUIRES MSKCXXFLAGS 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 OSI_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 COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_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 GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GRBINCDIR GRBLIB COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE OSI_EXAMPLES_SOLVER_NAME OSI_EXAMPLES_SOLVER_CFLAGS OSI_EXAMPLES_SOLVER_LIBS OSIGLPKPC_LIBS OSIGLPKPC_CFLAGS OSIGLPKPC_REQUIRES MSKCXXFLAGS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    17141714
    17151715
     1716# Initialize the PCADDLIBS variable.
     1717# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1718# In certain cases, it may contain more flags than the ADDLIBS variable.
     1719PCADDLIBS=""
     1720
     1721
    17161722# As backup, we make sure we don't loose an FLIBS if it has been set
    17171723# by the user
     
    58855891*-*-irix6*)
    58865892  # Find out which ABI we are using.
    5887   echo '#line 5887 "configure"' > conftest.$ac_ext
     5893  echo '#line 5893 "configure"' > conftest.$ac_ext
    58885894  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58895895  (eval $ac_compile) 2>&5
     
    70197025
    70207026# Provide some information about the compiler.
    7021 echo "$as_me:7021:" \
     7027echo "$as_me:7027:" \
    70227028     "checking for Fortran 77 compiler version" >&5
    70237029ac_compiler=`set X $ac_compile; echo $2`
     
    80868092   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80878093   -e 's:$: $lt_compiler_flag:'`
    8088    (eval echo "\"\$as_me:8088: $lt_compile\"" >&5)
     8094   (eval echo "\"\$as_me:8094: $lt_compile\"" >&5)
    80898095   (eval "$lt_compile" 2>conftest.err)
    80908096   ac_status=$?
    80918097   cat conftest.err >&5
    8092    echo "$as_me:8092: \$? = $ac_status" >&5
     8098   echo "$as_me:8098: \$? = $ac_status" >&5
    80938099   if (exit $ac_status) && test -s "$ac_outfile"; then
    80948100     # The compiler can only warn and ignore the option if not recognized
     
    83548360   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83558361   -e 's:$: $lt_compiler_flag:'`
    8356    (eval echo "\"\$as_me:8356: $lt_compile\"" >&5)
     8362   (eval echo "\"\$as_me:8362: $lt_compile\"" >&5)
    83578363   (eval "$lt_compile" 2>conftest.err)
    83588364   ac_status=$?
    83598365   cat conftest.err >&5
    8360    echo "$as_me:8360: \$? = $ac_status" >&5
     8366   echo "$as_me:8366: \$? = $ac_status" >&5
    83618367   if (exit $ac_status) && test -s "$ac_outfile"; then
    83628368     # The compiler can only warn and ignore the option if not recognized
     
    84588464   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84598465   -e 's:$: $lt_compiler_flag:'`
    8460    (eval echo "\"\$as_me:8460: $lt_compile\"" >&5)
     8466   (eval echo "\"\$as_me:8466: $lt_compile\"" >&5)
    84618467   (eval "$lt_compile" 2>out/conftest.err)
    84628468   ac_status=$?
    84638469   cat out/conftest.err >&5
    8464    echo "$as_me:8464: \$? = $ac_status" >&5
     8470   echo "$as_me:8470: \$? = $ac_status" >&5
    84658471   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84668472   then
     
    1080310809  lt_status=$lt_dlunknown
    1080410810  cat > conftest.$ac_ext <<EOF
    10805 #line 10805 "configure"
     10811#line 10811 "configure"
    1080610812#include "confdefs.h"
    1080710813
     
    1090310909  lt_status=$lt_dlunknown
    1090410910  cat > conftest.$ac_ext <<EOF
    10905 #line 10905 "configure"
     10911#line 10911 "configure"
    1090610912#include "confdefs.h"
    1090710913
     
    1324713253   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1324813254   -e 's:$: $lt_compiler_flag:'`
    13249    (eval echo "\"\$as_me:13249: $lt_compile\"" >&5)
     13255   (eval echo "\"\$as_me:13255: $lt_compile\"" >&5)
    1325013256   (eval "$lt_compile" 2>conftest.err)
    1325113257   ac_status=$?
    1325213258   cat conftest.err >&5
    13253    echo "$as_me:13253: \$? = $ac_status" >&5
     13259   echo "$as_me:13259: \$? = $ac_status" >&5
    1325413260   if (exit $ac_status) && test -s "$ac_outfile"; then
    1325513261     # The compiler can only warn and ignore the option if not recognized
     
    1335113357   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1335213358   -e 's:$: $lt_compiler_flag:'`
    13353    (eval echo "\"\$as_me:13353: $lt_compile\"" >&5)
     13359   (eval echo "\"\$as_me:13359: $lt_compile\"" >&5)
    1335413360   (eval "$lt_compile" 2>out/conftest.err)
    1335513361   ac_status=$?
    1335613362   cat out/conftest.err >&5
    13357    echo "$as_me:13357: \$? = $ac_status" >&5
     13363   echo "$as_me:13363: \$? = $ac_status" >&5
    1335813364   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1335913365   then
     
    1492114927   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1492214928   -e 's:$: $lt_compiler_flag:'`
    14923    (eval echo "\"\$as_me:14923: $lt_compile\"" >&5)
     14929   (eval echo "\"\$as_me:14929: $lt_compile\"" >&5)
    1492414930   (eval "$lt_compile" 2>conftest.err)
    1492514931   ac_status=$?
    1492614932   cat conftest.err >&5
    14927    echo "$as_me:14927: \$? = $ac_status" >&5
     14933   echo "$as_me:14933: \$? = $ac_status" >&5
    1492814934   if (exit $ac_status) && test -s "$ac_outfile"; then
    1492914935     # The compiler can only warn and ignore the option if not recognized
     
    1502515031   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1502615032   -e 's:$: $lt_compiler_flag:'`
    15027    (eval echo "\"\$as_me:15027: $lt_compile\"" >&5)
     15033   (eval echo "\"\$as_me:15033: $lt_compile\"" >&5)
    1502815034   (eval "$lt_compile" 2>out/conftest.err)
    1502915035   ac_status=$?
    1503015036   cat out/conftest.err >&5
    15031    echo "$as_me:15031: \$? = $ac_status" >&5
     15037   echo "$as_me:15037: \$? = $ac_status" >&5
    1503215038   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1503315039   then
     
    1723217238   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1723317239   -e 's:$: $lt_compiler_flag:'`
    17234    (eval echo "\"\$as_me:17234: $lt_compile\"" >&5)
     17240   (eval echo "\"\$as_me:17240: $lt_compile\"" >&5)
    1723517241   (eval "$lt_compile" 2>conftest.err)
    1723617242   ac_status=$?
    1723717243   cat conftest.err >&5
    17238    echo "$as_me:17238: \$? = $ac_status" >&5
     17244   echo "$as_me:17244: \$? = $ac_status" >&5
    1723917245   if (exit $ac_status) && test -s "$ac_outfile"; then
    1724017246     # The compiler can only warn and ignore the option if not recognized
     
    1750017506   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1750117507   -e 's:$: $lt_compiler_flag:'`
    17502    (eval echo "\"\$as_me:17502: $lt_compile\"" >&5)
     17508   (eval echo "\"\$as_me:17508: $lt_compile\"" >&5)
    1750317509   (eval "$lt_compile" 2>conftest.err)
    1750417510   ac_status=$?
    1750517511   cat conftest.err >&5
    17506    echo "$as_me:17506: \$? = $ac_status" >&5
     17512   echo "$as_me:17512: \$? = $ac_status" >&5
    1750717513   if (exit $ac_status) && test -s "$ac_outfile"; then
    1750817514     # The compiler can only warn and ignore the option if not recognized
     
    1760417610   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1760517611   -e 's:$: $lt_compiler_flag:'`
    17606    (eval echo "\"\$as_me:17606: $lt_compile\"" >&5)
     17612   (eval echo "\"\$as_me:17612: $lt_compile\"" >&5)
    1760717613   (eval "$lt_compile" 2>out/conftest.err)
    1760817614   ac_status=$?
    1760917615   cat out/conftest.err >&5
    17610    echo "$as_me:17610: \$? = $ac_status" >&5
     17616   echo "$as_me:17616: \$? = $ac_status" >&5
    1761117617   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1761217618   then
     
    2071620722
    2071720723
    20718 #check if user provided LIBS, CFLAGS, and DATA for module
     20724#check if user provided LIBS, CFLAGS, or DATA for module
    2071920725if test $coin_has_coinutils != skipping; then
    2072020726
     
    2072520731  coin_has_coinutils=yes
    2072620732       COINUTILS_LIBS="$withval"
    20727        ADDLIBS="$withval $ADDLIBS"
     20733       PCADDLIBS="$withval $PCADDLIBS"
    2072820734
    2072920735fi;
     
    2101621022    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
    2101721023
    21018     ADDLIBS="$COINUTILS_LIBS $ADDLIBS"
    21019        REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
     21024    REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
    2102021025
    2102121026
     
    2108621091
    2108721092
    21088 #check if user provided LIBS, CFLAGS, and DATA for module
     21093#check if user provided LIBS, CFLAGS, or DATA for module
    2108921094if test $coin_has_sample != skipping; then
    2109021095
     
    2131321318
    2131421319
    21315 #check if user provided LIBS, CFLAGS, and DATA for module
     21320#check if user provided LIBS, CFLAGS, or DATA for module
    2131621321if test $coin_has_netlib != skipping; then
    2131721322
     
    2154021545
    2154121546
    21542 #check if user provided LIBS, CFLAGS, and DATA for module
     21547#check if user provided LIBS, CFLAGS, or DATA for module
    2154321548if test $coin_has_glpk != skipping; then
    2154421549
     
    2274422749    ADDLIBS="$ADDLIBS $FLIBS"
    2274522750  fi
     22751  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2274622752
    2274722753  # library extension
     
    2358023586s,@build_os@,$build_os,;t t
    2358123587s,@ADDLIBS@,$ADDLIBS,;t t
     23588s,@PCADDLIBS@,$PCADDLIBS,;t t
    2358223589s,@FADDLIBS@,$FADDLIBS,;t t
    2358323590s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
  • trunk/Osi/osi.pc.in

    r1516 r1538  
    77Description: COIN-OR Open Solver Interface
    88Version: @PACKAGE_VERSION@
    9 Libs: -L${libdir} -lOsi
     9Libs: -L${libdir} -lOsi @PCADDLIBS@
    1010Cflags: -I${includedir}
    1111Requires: @REQUIREDPACKAGES@
  • trunk/Osi/src/Makefile.in

    r1527 r1538  
    226226PACKAGE_VERSION = @PACKAGE_VERSION@
    227227PATH_SEPARATOR = @PATH_SEPARATOR@
     228PCADDLIBS = @PCADDLIBS@
    228229PKG_CONFIG = @PKG_CONFIG@
    229230RANLIB = @RANLIB@
  • trunk/Osi/src/OsiCpx/Makefile.in

    r1527 r1538  
    213213PACKAGE_VERSION = @PACKAGE_VERSION@
    214214PATH_SEPARATOR = @PATH_SEPARATOR@
     215PCADDLIBS = @PCADDLIBS@
    215216PKG_CONFIG = @PKG_CONFIG@
    216217RANLIB = @RANLIB@
  • trunk/Osi/src/OsiGlpk/Makefile.in

    r1527 r1538  
    213213PACKAGE_VERSION = @PACKAGE_VERSION@
    214214PATH_SEPARATOR = @PATH_SEPARATOR@
     215PCADDLIBS = @PCADDLIBS@
    215216PKG_CONFIG = @PKG_CONFIG@
    216217RANLIB = @RANLIB@
  • trunk/Osi/src/OsiGrb/Makefile.in

    r1527 r1538  
    211211PACKAGE_VERSION = @PACKAGE_VERSION@
    212212PATH_SEPARATOR = @PATH_SEPARATOR@
     213PCADDLIBS = @PCADDLIBS@
    213214PKG_CONFIG = @PKG_CONFIG@
    214215RANLIB = @RANLIB@
  • trunk/Osi/src/OsiMsk/Makefile.in

    r1527 r1538  
    213213PACKAGE_VERSION = @PACKAGE_VERSION@
    214214PATH_SEPARATOR = @PATH_SEPARATOR@
     215PCADDLIBS = @PCADDLIBS@
    215216PKG_CONFIG = @PKG_CONFIG@
    216217RANLIB = @RANLIB@
  • trunk/Osi/src/OsiSpx/Makefile.in

    r1527 r1538  
    211211PACKAGE_VERSION = @PACKAGE_VERSION@
    212212PATH_SEPARATOR = @PATH_SEPARATOR@
     213PCADDLIBS = @PCADDLIBS@
    213214PKG_CONFIG = @PKG_CONFIG@
    214215RANLIB = @RANLIB@
  • trunk/Osi/src/OsiXpr/Makefile.in

    r1527 r1538  
    213213PACKAGE_VERSION = @PACKAGE_VERSION@
    214214PATH_SEPARATOR = @PATH_SEPARATOR@
     215PCADDLIBS = @PCADDLIBS@
    215216PKG_CONFIG = @PKG_CONFIG@
    216217RANLIB = @RANLIB@
  • trunk/Osi/src/unittests/Makefile.in

    r1527 r1538  
    212212PACKAGE_VERSION = @PACKAGE_VERSION@
    213213PATH_SEPARATOR = @PATH_SEPARATOR@
     214PCADDLIBS = @PCADDLIBS@
    214215PKG_CONFIG = @PKG_CONFIG@
    215216RANLIB = @RANLIB@
  • trunk/Osi/test/Makefile.in

    r1527 r1538  
    258258PACKAGE_VERSION = @PACKAGE_VERSION@
    259259PATH_SEPARATOR = @PATH_SEPARATOR@
     260PCADDLIBS = @PCADDLIBS@
    260261PKG_CONFIG = @PKG_CONFIG@
    261262RANLIB = @RANLIB@
Note: See TracChangeset for help on using the changeset viewer.