Changeset 1566


Ignore:
Timestamp:
Jun 19, 2010 2:13:02 PM (9 years ago)
Author:
stefan
Message:

rerun autotools

Location:
trunk/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r1563 r1566  
    134134CDEFS = @CDEFS@
    135135CFLAGS = @CFLAGS@
     136CLP_SVN_REV = @CLP_SVN_REV@
    136137COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    137138COINUTILS_DATA = @COINUTILS_DATA@
     
    223224VERSION = @VERSION@
    224225VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    225 _SVN_REV = @_SVN_REV@
    226226abs_bin_dir = @abs_bin_dir@
    227227abs_include_dir = @abs_include_dir@
  • trunk/Clp/configure

    r1560 r1566  
    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 _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'
     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 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'
    476476ac_subst_files=''
    477477
     
    17191719
    17201720
    1721 #Set the project's version number
    1722 if test "x" != x; then
     1721# We set the following variable so that we know later in AC_COIN_FINALIZE
     1722# that we are in a project main directory
     1723coin_projectdir=yes
     1724
     1725# Set the project's version number
     1726if test "xClp" != x; then
    17231727
    17241728cat >>confdefs.h <<_ACEOF
    1725 #define _VERSION "$PACKAGE_VERSION"
     1729#define CLP_VERSION "$PACKAGE_VERSION"
    17261730_ACEOF
    17271731
    17281732fi
    17291733
    1730 #Set the project's SVN revision number
     1734# Set the project's SVN revision number
    17311735# Extract the first word of "svnversion", so it can be a program name with args.
    17321736set dummy svnversion; ac_word=$2
     
    17651769fi
    17661770
    1767 if test "x$have_svnversion" = xyes && test "x" != x; then
    1768 
    1769   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1770   if test $_SVN_REV != exported; then
     1771if test "x$have_svnversion" = xyes && test "xClp" != x; then
     1772
     1773  CLP_SVN_REV=`cd $srcdir/$coin_has_clp ; svnversion`
     1774  if test $CLP_SVN_REV != exported; then
    17711775
    17721776cat >>confdefs.h <<_ACEOF
    1773 #define _SVN_REV "$_SVN_REV"
     1777#define CLP_SVN_REV "$CLP_SVN_REV"
    17741778_ACEOF
    17751779
     
    17771781fi
    17781782
    1779 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1780 # that we are in a project main directory
    1781 coin_projectdir=yes
    1782 
    1783 # Check if a library version is set for libtool
     1783# Capture libtool library version, if given.
    17841784
    17851785
     
    27932793        ;;
    27942794      *)
    2795         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2795        coin_opt_cflags="-O3"
    27962796        coin_add_cflags="-pipe"
    27972797        coin_dbg_cflags="-g"
     
    37053705      *)
    37063706# ToDo decide about unroll-loops
    3707         coin_opt_cxxflags="-O3 -fomit-frame-pointer"
     3707        coin_opt_cxxflags="-O3"
    37083708        coin_add_cxxflags="-pipe"
    37093709        coin_dbg_cxxflags="-g"
     
    2209322093
    2209422094#############################################################################
    22095 #                           CLP version number                              #
    22096 #############################################################################
    22097 
    22098 
    22099 cat >>confdefs.h <<_ACEOF
    22100 #define CLP_VERSION "$PACKAGE_VERSION"
    22101 _ACEOF
    22102 
    22103 
    22104 #############################################################################
    2210522095#                             Other dependencies                            #
    2210622096#############################################################################
     
    2328423274s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2328523275s,@have_svnversion@,$have_svnversion,;t t
    23286 s,@_SVN_REV@,$_SVN_REV,;t t
     23276s,@CLP_SVN_REV@,$CLP_SVN_REV,;t t
    2328723277s,@CDEFS@,$CDEFS,;t t
    2328823278s,@ADD_CFLAGS@,$ADD_CFLAGS,;t t
  • trunk/Clp/inc/config_clp.h.in

    r1559 r1566  
    11/* inc/config_clp.h.in.  Generated from configure.ac by autoheader.  */
    22
    3 /* "Version of Clp" */
     3/* SVN revision number of project */
     4#undef CLP_SVN_REV
     5
     6/* Version number of project */
    47#undef CLP_VERSION
    58
     
    8790/* Define to 2 if wssmp_ is available, and to 3 if wssmp is available */
    8891#undef WSSMP_BARRIER
    89 
    90 /* SVN revision number of project */
    91 #undef _SVN_REV
    92 
    93 /* Version number of project */
    94 #undef _VERSION
  • trunk/Clp/src/Makefile.in

    r1563 r1566  
    149149CDEFS = @CDEFS@
    150150CFLAGS = @CFLAGS@
     151CLP_SVN_REV = @CLP_SVN_REV@
    151152COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    152153COINUTILS_DATA = @COINUTILS_DATA@
     
    238239VERSION = @VERSION@
    239240VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    240 _SVN_REV = @_SVN_REV@
    241241abs_bin_dir = @abs_bin_dir@
    242242abs_include_dir = @abs_include_dir@
  • trunk/Clp/src/OsiClp/Makefile.in

    r1563 r1566  
    117117CDEFS = @CDEFS@
    118118CFLAGS = @CFLAGS@
     119CLP_SVN_REV = @CLP_SVN_REV@
    119120COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    120121COINUTILS_DATA = @COINUTILS_DATA@
     
    206207VERSION = @VERSION@
    207208VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    208 _SVN_REV = @_SVN_REV@
    209209abs_bin_dir = @abs_bin_dir@
    210210abs_include_dir = @abs_include_dir@
  • trunk/Clp/test/Makefile.in

    r1563 r1566  
    105105CDEFS = @CDEFS@
    106106CFLAGS = @CFLAGS@
     107CLP_SVN_REV = @CLP_SVN_REV@
    107108COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    108109COINUTILS_DATA = @COINUTILS_DATA@
     
    194195VERSION = @VERSION@
    195196VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    196 _SVN_REV = @_SVN_REV@
    197197abs_bin_dir = @abs_bin_dir@
    198198abs_include_dir = @abs_include_dir@
Note: See TracChangeset for help on using the changeset viewer.