- Timestamp:
- Jul 18, 2010 11:12:41 AM (11 years ago)
- Location:
- trunk/Clp
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/Makefile.in
r1566 r1573 212 212 PACKAGE_VERSION = @PACKAGE_VERSION@ 213 213 PATH_SEPARATOR = @PATH_SEPARATOR@ 214 PCADDLIBS = @PCADDLIBS@ 214 215 PKG_CONFIG = @PKG_CONFIG@ 215 216 RANLIB = @RANLIB@ -
trunk/Clp/clp-uninstalled.pc.in
r1559 r1573 5 5 Description: COIN-OR Linear Programming Solver 6 6 Version: @PACKAGE_VERSION@ 7 Libs: -L${libdir} -lClp @ ADDLIBS@7 Libs: -L${libdir} -lClp @PCADDLIBS@ 8 8 Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc 9 9 Requires: @REQUIREDPACKAGES@ -
trunk/Clp/clp.pc.in
r1559 r1573 7 7 Description: COIN-OR Linear Programming Solver 8 8 Version: @PACKAGE_VERSION@ 9 Libs: -L${libdir} -lClp @ ADDLIBS@9 Libs: -L${libdir} -lClp @PCADDLIBS@ 10 10 Cflags: -I${includedir} 11 11 Requires: @REQUIREDPACKAGES@ -
trunk/Clp/configure
r1572 r1573 473 473 #endif" 474 474 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 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 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'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 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS' 476 476 ac_subst_files='' 477 477 … … 1698 1698 1699 1699 1700 # Initialize the PCADDLIBS variable. 1701 # This variable is used to setup library flags for the "Libs:" section in a .pc file. 1702 # In certain cases, it may contain more flags than the ADDLIBS variable. 1703 PCADDLIBS="" 1704 1705 1700 1706 # As backup, we make sure we don't loose an FLIBS if it has been set 1701 1707 # by the user … … 5869 5875 *-*-irix6*) 5870 5876 # Find out which ABI we are using. 5871 echo '#line 587 1"configure"' > conftest.$ac_ext5877 echo '#line 5877 "configure"' > conftest.$ac_ext 5872 5878 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 5873 5879 (eval $ac_compile) 2>&5 … … 7003 7009 7004 7010 # Provide some information about the compiler. 7005 echo "$as_me:70 05:" \7011 echo "$as_me:7011:" \ 7006 7012 "checking for Fortran 77 compiler version" >&5 7007 7013 ac_compiler=`set X $ac_compile; echo $2` … … 8070 8076 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8071 8077 -e 's:$: $lt_compiler_flag:'` 8072 (eval echo "\"\$as_me:807 2: $lt_compile\"" >&5)8078 (eval echo "\"\$as_me:8078: $lt_compile\"" >&5) 8073 8079 (eval "$lt_compile" 2>conftest.err) 8074 8080 ac_status=$? 8075 8081 cat conftest.err >&5 8076 echo "$as_me:80 76: \$? = $ac_status" >&58082 echo "$as_me:8082: \$? = $ac_status" >&5 8077 8083 if (exit $ac_status) && test -s "$ac_outfile"; then 8078 8084 # The compiler can only warn and ignore the option if not recognized … … 8338 8344 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8339 8345 -e 's:$: $lt_compiler_flag:'` 8340 (eval echo "\"\$as_me:834 0: $lt_compile\"" >&5)8346 (eval echo "\"\$as_me:8346: $lt_compile\"" >&5) 8341 8347 (eval "$lt_compile" 2>conftest.err) 8342 8348 ac_status=$? 8343 8349 cat conftest.err >&5 8344 echo "$as_me:83 44: \$? = $ac_status" >&58350 echo "$as_me:8350: \$? = $ac_status" >&5 8345 8351 if (exit $ac_status) && test -s "$ac_outfile"; then 8346 8352 # The compiler can only warn and ignore the option if not recognized … … 8442 8448 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8443 8449 -e 's:$: $lt_compiler_flag:'` 8444 (eval echo "\"\$as_me:84 44: $lt_compile\"" >&5)8450 (eval echo "\"\$as_me:8450: $lt_compile\"" >&5) 8445 8451 (eval "$lt_compile" 2>out/conftest.err) 8446 8452 ac_status=$? 8447 8453 cat out/conftest.err >&5 8448 echo "$as_me:84 48: \$? = $ac_status" >&58454 echo "$as_me:8454: \$? = $ac_status" >&5 8449 8455 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8450 8456 then … … 10787 10793 lt_status=$lt_dlunknown 10788 10794 cat > conftest.$ac_ext <<EOF 10789 #line 107 89"configure"10795 #line 10795 "configure" 10790 10796 #include "confdefs.h" 10791 10797 … … 10887 10893 lt_status=$lt_dlunknown 10888 10894 cat > conftest.$ac_ext <<EOF 10889 #line 108 89"configure"10895 #line 10895 "configure" 10890 10896 #include "confdefs.h" 10891 10897 … … 13231 13237 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13232 13238 -e 's:$: $lt_compiler_flag:'` 13233 (eval echo "\"\$as_me:1323 3: $lt_compile\"" >&5)13239 (eval echo "\"\$as_me:13239: $lt_compile\"" >&5) 13234 13240 (eval "$lt_compile" 2>conftest.err) 13235 13241 ac_status=$? 13236 13242 cat conftest.err >&5 13237 echo "$as_me:132 37: \$? = $ac_status" >&513243 echo "$as_me:13243: \$? = $ac_status" >&5 13238 13244 if (exit $ac_status) && test -s "$ac_outfile"; then 13239 13245 # The compiler can only warn and ignore the option if not recognized … … 13335 13341 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13336 13342 -e 's:$: $lt_compiler_flag:'` 13337 (eval echo "\"\$as_me:133 37: $lt_compile\"" >&5)13343 (eval echo "\"\$as_me:13343: $lt_compile\"" >&5) 13338 13344 (eval "$lt_compile" 2>out/conftest.err) 13339 13345 ac_status=$? 13340 13346 cat out/conftest.err >&5 13341 echo "$as_me:1334 1: \$? = $ac_status" >&513347 echo "$as_me:13347: \$? = $ac_status" >&5 13342 13348 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13343 13349 then … … 14905 14911 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14906 14912 -e 's:$: $lt_compiler_flag:'` 14907 (eval echo "\"\$as_me:149 07: $lt_compile\"" >&5)14913 (eval echo "\"\$as_me:14913: $lt_compile\"" >&5) 14908 14914 (eval "$lt_compile" 2>conftest.err) 14909 14915 ac_status=$? 14910 14916 cat conftest.err >&5 14911 echo "$as_me:1491 1: \$? = $ac_status" >&514917 echo "$as_me:14917: \$? = $ac_status" >&5 14912 14918 if (exit $ac_status) && test -s "$ac_outfile"; then 14913 14919 # The compiler can only warn and ignore the option if not recognized … … 15009 15015 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15010 15016 -e 's:$: $lt_compiler_flag:'` 15011 (eval echo "\"\$as_me:1501 1: $lt_compile\"" >&5)15017 (eval echo "\"\$as_me:15017: $lt_compile\"" >&5) 15012 15018 (eval "$lt_compile" 2>out/conftest.err) 15013 15019 ac_status=$? 15014 15020 cat out/conftest.err >&5 15015 echo "$as_me:150 15: \$? = $ac_status" >&515021 echo "$as_me:15021: \$? = $ac_status" >&5 15016 15022 if (exit $ac_status) && test -s out/conftest2.$ac_objext 15017 15023 then … … 17216 17222 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17217 17223 -e 's:$: $lt_compiler_flag:'` 17218 (eval echo "\"\$as_me:172 18: $lt_compile\"" >&5)17224 (eval echo "\"\$as_me:17224: $lt_compile\"" >&5) 17219 17225 (eval "$lt_compile" 2>conftest.err) 17220 17226 ac_status=$? 17221 17227 cat conftest.err >&5 17222 echo "$as_me:1722 2: \$? = $ac_status" >&517228 echo "$as_me:17228: \$? = $ac_status" >&5 17223 17229 if (exit $ac_status) && test -s "$ac_outfile"; then 17224 17230 # The compiler can only warn and ignore the option if not recognized … … 17484 17490 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17485 17491 -e 's:$: $lt_compiler_flag:'` 17486 (eval echo "\"\$as_me:174 86: $lt_compile\"" >&5)17492 (eval echo "\"\$as_me:17492: $lt_compile\"" >&5) 17487 17493 (eval "$lt_compile" 2>conftest.err) 17488 17494 ac_status=$? 17489 17495 cat conftest.err >&5 17490 echo "$as_me:1749 0: \$? = $ac_status" >&517496 echo "$as_me:17496: \$? = $ac_status" >&5 17491 17497 if (exit $ac_status) && test -s "$ac_outfile"; then 17492 17498 # The compiler can only warn and ignore the option if not recognized … … 17588 17594 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17589 17595 -e 's:$: $lt_compiler_flag:'` 17590 (eval echo "\"\$as_me:1759 0: $lt_compile\"" >&5)17596 (eval echo "\"\$as_me:17596: $lt_compile\"" >&5) 17591 17597 (eval "$lt_compile" 2>out/conftest.err) 17592 17598 ac_status=$? 17593 17599 cat out/conftest.err >&5 17594 echo "$as_me:17 594: \$? = $ac_status" >&517600 echo "$as_me:17600: \$? = $ac_status" >&5 17595 17601 if (exit $ac_status) && test -s out/conftest2.$ac_objext 17596 17602 then … … 20700 20706 20701 20707 20702 #check if user provided LIBS, CFLAGS, andDATA for module20708 #check if user provided LIBS, CFLAGS, or DATA for module 20703 20709 if test $coin_has_coinutils != skipping; then 20704 20710 … … 20709 20715 coin_has_coinutils=yes 20710 20716 COINUTILS_LIBS="$withval" 20711 ADDLIBS="$withval $ADDLIBS"20717 PCADDLIBS="$withval $PCADDLIBS" 20712 20718 20713 20719 fi; … … 21000 21006 COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc` 21001 21007 21002 ADDLIBS="$COINUTILS_LIBS $ADDLIBS" 21003 REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES" 21008 REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES" 21004 21009 21005 21010 … … 21070 21075 21071 21076 21072 #check if user provided LIBS, CFLAGS, andDATA for module21077 #check if user provided LIBS, CFLAGS, or DATA for module 21073 21078 if test $coin_has_osi != skipping; then 21074 21079 … … 21297 21302 21298 21303 21299 #check if user provided LIBS, CFLAGS, andDATA for module21304 #check if user provided LIBS, CFLAGS, or DATA for module 21300 21305 if test $coin_has_ositests != skipping; then 21301 21306 … … 21524 21529 21525 21530 21526 #check if user provided LIBS, CFLAGS, andDATA for module21531 #check if user provided LIBS, CFLAGS, or DATA for module 21527 21532 if test $coin_has_sample != skipping; then 21528 21533 … … 21751 21756 21752 21757 21753 #check if user provided LIBS, CFLAGS, andDATA for module21758 #check if user provided LIBS, CFLAGS, or DATA for module 21754 21759 if test $coin_has_netlib != skipping; then 21755 21760 … … 22473 22478 ADDLIBS="$ADDLIBS $FLIBS" 22474 22479 fi 22480 PCADDLIBS="$PCADDLIBS $ADDLIBS" 22475 22481 22476 22482 # library extension … … 23270 23276 s,@build_os@,$build_os,;t t 23271 23277 s,@ADDLIBS@,$ADDLIBS,;t t 23278 s,@PCADDLIBS@,$PCADDLIBS,;t t 23272 23279 s,@FADDLIBS@,$FADDLIBS,;t t 23273 23280 s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t -
trunk/Clp/src/Makefile.in
r1566 r1573 227 227 PACKAGE_VERSION = @PACKAGE_VERSION@ 228 228 PATH_SEPARATOR = @PATH_SEPARATOR@ 229 PCADDLIBS = @PCADDLIBS@ 229 230 PKG_CONFIG = @PKG_CONFIG@ 230 231 RANLIB = @RANLIB@ -
trunk/Clp/src/OsiClp/Makefile.in
r1566 r1573 195 195 PACKAGE_VERSION = @PACKAGE_VERSION@ 196 196 PATH_SEPARATOR = @PATH_SEPARATOR@ 197 PCADDLIBS = @PCADDLIBS@ 197 198 PKG_CONFIG = @PKG_CONFIG@ 198 199 RANLIB = @RANLIB@ -
trunk/Clp/test/Makefile.in
r1566 r1573 183 183 PACKAGE_VERSION = @PACKAGE_VERSION@ 184 184 PATH_SEPARATOR = @PATH_SEPARATOR@ 185 PCADDLIBS = @PCADDLIBS@ 185 186 PKG_CONFIG = @PKG_CONFIG@ 186 187 RANLIB = @RANLIB@
Note: See TracChangeset
for help on using the changeset viewer.