- Timestamp:
- Nov 2, 2010 4:11:58 PM (10 years ago)
- Location:
- trunk/Clp
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/Makefile.in
r1603 r1618 133 133 CDEFS = @CDEFS@ 134 134 CFLAGS = @CFLAGS@ 135 CLPLIB_CFLAGS = @CLPLIB_CFLAGS@ 135 136 CLPLIB_LIBS = @CLPLIB_LIBS@ 136 137 CLPLIB_PCLIBS = @CLPLIB_PCLIBS@ … … 202 203 OPT_CFLAGS = @OPT_CFLAGS@ 203 204 OPT_CXXFLAGS = @OPT_CXXFLAGS@ 205 OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@ 204 206 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@ 205 207 OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@ -
trunk/Clp/configure
r1603 r1618 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 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_DATAOSICLPLIB_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'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 CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSICLPLIB_CFLAGS 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' 476 476 ac_subst_files='' 477 477 … … 5298 5298 full_prefix=`cd $full_prefix ; pwd` 5299 5299 5300 abs_lib_dir=$full_prefix/lib 5300 abs_lib_dir=$full_prefix/lib/coin 5301 5301 5302 5302 abs_include_dir=$full_prefix/include … … 20400 20400 if test "$GXX" = "yes"; then 20401 20401 RPATH_FLAGS= 20402 for dir in $abs_lib_dir /coin $abs_lib_dir/coin/ThirdParty; do20402 for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do 20403 20403 RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir" 20404 20404 done … … 20417 20417 *-*-solaris*) 20418 20418 RPATH_FLAGS= 20419 for dir in $abs_lib_dir /coin $abs_lib_dir/coin/ThirdParty; do20419 for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do 20420 20420 RPATH_FLAGS="$RPATH_FLAGS -R$dir" 20421 20421 done … … 20719 20719 20720 20720 20721 20721 20722 #check if user provided LIBS, CFLAGS, or DATA for module 20722 20723 if test $coin_has_coinutils != skipping; then … … 20769 20770 if test -n "$PKG_CONFIG" ; then 20770 20771 if $PKG_CONFIG --exists "coinutils = trunk"; then 20771 COINUTILS_VERSIONS="`$PKG_CONFIG --modversion coinutils = trunk2>/dev/null`"20772 COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils = trunk" 2>/dev/null`" 20772 20773 cflags=`$PKG_CONFIG --cflags "coinutils = trunk" 2>/dev/null` 20773 20774 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21034 21035 21035 21036 21037 21036 21038 #check if user provided LIBS, CFLAGS, or DATA for module 21037 21039 if test $coin_has_osi != skipping; then … … 21084 21086 if test -n "$PKG_CONFIG" ; then 21085 21087 if $PKG_CONFIG --exists "osi"; then 21086 OSI_VERSIONS="`$PKG_CONFIG --modversion osi2>/dev/null`"21088 OSI_VERSIONS="`$PKG_CONFIG --modversion "osi" 2>/dev/null`" 21087 21089 cflags=`$PKG_CONFIG --cflags "osi" 2>/dev/null` 21088 21090 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21391 21393 if test -n "$PKG_CONFIG" ; then 21392 21394 if $PKG_CONFIG --exists "osi-unittests"; then 21393 OSITESTS_VERSIONS="`$PKG_CONFIG --modversion osi-unittests2>/dev/null`"21395 OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null`" 21394 21396 cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null` 21395 21397 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21680 21682 if test -n "$PKG_CONFIG" ; then 21681 21683 if $PKG_CONFIG --exists "coindatasample"; then 21682 SAMPLE_VERSIONS="`$PKG_CONFIG --modversion coindatasample2>/dev/null`"21684 SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`" 21683 21685 cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null` 21684 21686 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21969 21971 if test -n "$PKG_CONFIG" ; then 21970 21972 if $PKG_CONFIG --exists "coindatanetlib"; then 21971 NETLIB_VERSIONS="`$PKG_CONFIG --modversion coindatanetlib2>/dev/null`"21973 NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`" 21972 21974 cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null` 21973 21975 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 23802 23804 s,@COINUTILS_CFLAGS@,$COINUTILS_CFLAGS,;t t 23803 23805 s,@COINUTILS_DATA@,$COINUTILS_DATA,;t t 23806 s,@CLPLIB_CFLAGS@,$CLPLIB_CFLAGS,;t t 23804 23807 s,@CLPLIB_LIBS@,$CLPLIB_LIBS,;t t 23805 23808 s,@CLPLIB_PCLIBS@,$CLPLIB_PCLIBS,;t t … … 23810 23813 s,@OSI_CFLAGS@,$OSI_CFLAGS,;t t 23811 23814 s,@OSI_DATA@,$OSI_DATA,;t t 23815 s,@OSICLPLIB_CFLAGS@,$OSICLPLIB_CFLAGS,;t t 23812 23816 s,@OSICLPLIB_LIBS@,$OSICLPLIB_LIBS,;t t 23813 23817 s,@OSICLPLIB_PCLIBS@,$OSICLPLIB_PCLIBS,;t t -
trunk/Clp/configure.ac
r1603 r1618 57 57 ############################################################################# 58 58 59 AC_COIN_ HAS_PACKAGE(CoinUtils, [coinutils = trunk], [ClpLib])60 AC_COIN_ HAS_PACKAGE(Osi, [osi], [OsiClpLib])61 AC_COIN_ HAS_PACKAGE(OsiTests, [osi-unittests])62 AC_COIN_ HAS_PACKAGE(Sample, [coindatasample])63 AC_COIN_ HAS_PACKAGE(Netlib, [coindatanetlib])59 AC_COIN_CHECK_PACKAGE(CoinUtils, [coinutils = trunk], [ClpLib]) 60 AC_COIN_CHECK_PACKAGE(Osi, [osi], [OsiClpLib]) 61 AC_COIN_CHECK_PACKAGE(OsiTests, [osi-unittests]) 62 AC_COIN_CHECK_PACKAGE(Sample, [coindatasample]) 63 AC_COIN_CHECK_PACKAGE(Netlib, [coindatanetlib]) 64 64 65 65 ############################################################################# -
trunk/Clp/src/Makefile.in
r1603 r1618 148 148 CDEFS = @CDEFS@ 149 149 CFLAGS = @CFLAGS@ 150 CLPLIB_CFLAGS = @CLPLIB_CFLAGS@ 150 151 CLPLIB_LIBS = @CLPLIB_LIBS@ 151 152 CLPLIB_PCLIBS = @CLPLIB_PCLIBS@ … … 217 218 OPT_CFLAGS = @OPT_CFLAGS@ 218 219 OPT_CXXFLAGS = @OPT_CXXFLAGS@ 220 OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@ 219 221 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@ 220 222 OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@ -
trunk/Clp/src/OsiClp/Makefile.in
r1603 r1618 117 117 CDEFS = @CDEFS@ 118 118 CFLAGS = @CFLAGS@ 119 CLPLIB_CFLAGS = @CLPLIB_CFLAGS@ 119 120 CLPLIB_LIBS = @CLPLIB_LIBS@ 120 121 CLPLIB_PCLIBS = @CLPLIB_PCLIBS@ … … 186 187 OPT_CFLAGS = @OPT_CFLAGS@ 187 188 OPT_CXXFLAGS = @OPT_CXXFLAGS@ 189 OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@ 188 190 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@ 189 191 OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@ -
trunk/Clp/test/Makefile.in
r1603 r1618 105 105 CDEFS = @CDEFS@ 106 106 CFLAGS = @CFLAGS@ 107 CLPLIB_CFLAGS = @CLPLIB_CFLAGS@ 107 108 CLPLIB_LIBS = @CLPLIB_LIBS@ 108 109 CLPLIB_PCLIBS = @CLPLIB_PCLIBS@ … … 174 175 OPT_CFLAGS = @OPT_CFLAGS@ 175 176 OPT_CXXFLAGS = @OPT_CXXFLAGS@ 177 OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@ 176 178 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@ 177 179 OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
Note: See TracChangeset
for help on using the changeset viewer.