Changeset 1618 for trunk


Ignore:
Timestamp:
Nov 2, 2010 4:11:58 PM (9 years ago)
Author:
tkr
Message:

Making name changes to comply with recent changes in build tools and re-running the autotools

Location:
trunk/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/Makefile.in

    r1603 r1618  
    133133CDEFS = @CDEFS@
    134134CFLAGS = @CFLAGS@
     135CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    135136CLPLIB_LIBS = @CLPLIB_LIBS@
    136137CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
    … …  
    202203OPT_CFLAGS = @OPT_CFLAGS@
    203204OPT_CXXFLAGS = @OPT_CXXFLAGS@
     205OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    204206OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    205207OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@

  • trunk/Clp/configure

    r1603 r1618  
    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 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'
     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_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'
    476476ac_subst_files=''
    477477
    … …  
    52985298full_prefix=`cd $full_prefix ; pwd`
    52995299
    5300 abs_lib_dir=$full_prefix/lib
     5300abs_lib_dir=$full_prefix/lib/coin
    53015301
    53025302abs_include_dir=$full_prefix/include
    … …  
    2040020400      if test "$GXX" = "yes"; then
    2040120401        RPATH_FLAGS=
    20402         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20402        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2040320403          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2040420404        done
    … …  
    2041720417    *-*-solaris*)
    2041820418        RPATH_FLAGS=
    20419         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20419        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2042020420          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2042120421        done
    … …  
    2071920719
    2072020720
     20721
    2072120722#check if user provided LIBS, CFLAGS, or DATA for module
    2072220723if test $coin_has_coinutils != skipping; then
    … …  
    2076920770if test -n "$PKG_CONFIG" ; then
    2077020771  if $PKG_CONFIG --exists "coinutils = trunk"; then
    20771     COINUTILS_VERSIONS="`$PKG_CONFIG --modversion coinutils = trunk 2>/dev/null`"
     20772    COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils = trunk" 2>/dev/null`"
    2077220773     cflags=`$PKG_CONFIG --cflags "coinutils = trunk" 2>/dev/null`
    2077320774    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    … …  
    2103421035
    2103521036
     21037
    2103621038#check if user provided LIBS, CFLAGS, or DATA for module
    2103721039if test $coin_has_osi != skipping; then
    … …  
    2108421086if test -n "$PKG_CONFIG" ; then
    2108521087  if $PKG_CONFIG --exists "osi"; then
    21086     OSI_VERSIONS="`$PKG_CONFIG --modversion osi 2>/dev/null`"
     21088    OSI_VERSIONS="`$PKG_CONFIG --modversion "osi" 2>/dev/null`"
    2108721089     cflags=`$PKG_CONFIG --cflags "osi" 2>/dev/null`
    2108821090    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    … …  
    2139121393if test -n "$PKG_CONFIG" ; then
    2139221394  if $PKG_CONFIG --exists "osi-unittests"; then
    21393     OSITESTS_VERSIONS="`$PKG_CONFIG --modversion osi-unittests 2>/dev/null`"
     21395    OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null`"
    2139421396     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
    2139521397    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    … …  
    2168021682if test -n "$PKG_CONFIG" ; then
    2168121683  if $PKG_CONFIG --exists "coindatasample"; then
    21682     SAMPLE_VERSIONS="`$PKG_CONFIG --modversion coindatasample 2>/dev/null`"
     21684    SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`"
    2168321685     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2168421686    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    … …  
    2196921971if test -n "$PKG_CONFIG" ; then
    2197021972  if $PKG_CONFIG --exists "coindatanetlib"; then
    21971     NETLIB_VERSIONS="`$PKG_CONFIG --modversion coindatanetlib 2>/dev/null`"
     21973    NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`"
    2197221974     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2197321975    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    … …  
    2380223804s,@COINUTILS_CFLAGS@,$COINUTILS_CFLAGS,;t t
    2380323805s,@COINUTILS_DATA@,$COINUTILS_DATA,;t t
     23806s,@CLPLIB_CFLAGS@,$CLPLIB_CFLAGS,;t t
    2380423807s,@CLPLIB_LIBS@,$CLPLIB_LIBS,;t t
    2380523808s,@CLPLIB_PCLIBS@,$CLPLIB_PCLIBS,;t t
    … …  
    2381023813s,@OSI_CFLAGS@,$OSI_CFLAGS,;t t
    2381123814s,@OSI_DATA@,$OSI_DATA,;t t
     23815s,@OSICLPLIB_CFLAGS@,$OSICLPLIB_CFLAGS,;t t
    2381223816s,@OSICLPLIB_LIBS@,$OSICLPLIB_LIBS,;t t
    2381323817s,@OSICLPLIB_PCLIBS@,$OSICLPLIB_PCLIBS,;t t

  • trunk/Clp/configure.ac

    r1603 r1618  
    5757#############################################################################
    5858
    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])
     59AC_COIN_CHECK_PACKAGE(CoinUtils, [coinutils = trunk], [ClpLib])
     60AC_COIN_CHECK_PACKAGE(Osi,       [osi],               [OsiClpLib])
     61AC_COIN_CHECK_PACKAGE(OsiTests,  [osi-unittests])
     62AC_COIN_CHECK_PACKAGE(Sample,    [coindatasample])
     63AC_COIN_CHECK_PACKAGE(Netlib,    [coindatanetlib])
    6464
    6565#############################################################################

  • trunk/Clp/src/Makefile.in

    r1603 r1618  
    148148CDEFS = @CDEFS@
    149149CFLAGS = @CFLAGS@
     150CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    150151CLPLIB_LIBS = @CLPLIB_LIBS@
    151152CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
    … …  
    217218OPT_CFLAGS = @OPT_CFLAGS@
    218219OPT_CXXFLAGS = @OPT_CXXFLAGS@
     220OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    219221OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    220222OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@

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

    r1603 r1618  
    117117CDEFS = @CDEFS@
    118118CFLAGS = @CFLAGS@
     119CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    119120CLPLIB_LIBS = @CLPLIB_LIBS@
    120121CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
    … …  
    186187OPT_CFLAGS = @OPT_CFLAGS@
    187188OPT_CXXFLAGS = @OPT_CXXFLAGS@
     189OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    188190OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    189191OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@

  • trunk/Clp/test/Makefile.in

    r1603 r1618  
    105105CDEFS = @CDEFS@
    106106CFLAGS = @CFLAGS@
     107CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    107108CLPLIB_LIBS = @CLPLIB_LIBS@
    108109CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
    … …  
    174175OPT_CFLAGS = @OPT_CFLAGS@
    175176OPT_CXXFLAGS = @OPT_CXXFLAGS@
     177OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    176178OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    177179OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
Note: See TracChangeset for help on using the changeset viewer.