Changeset 1585 for ThirdParty/Glpk


Ignore:
Timestamp:
Jun 19, 2010 2:01:19 PM (10 years ago)
Author:
stefan
Message:

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/Glpk/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.in

    r1568 r1585  
    183183FFLAGS = @FFLAGS@
    184184GLPKDIR = @GLPKDIR@
     185GLPK_SVN_REV = @GLPK_SVN_REV@
    185186HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    186187HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    220221VERSION = @VERSION@
    221222VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    222 _SVN_REV = @_SVN_REV@
    223223abs_bin_dir = @abs_bin_dir@
    224224abs_include_dir = @abs_include_dir@
  • ThirdParty/Glpk/trunk/config_glpk.h.in

    r1548 r1585  
    99/* Define to 1 if zlib is available */
    1010#undef COIN_HAS_ZLIB
     11
     12/* SVN revision number of project */
     13#undef GLPK_SVN_REV
     14
     15/* Version number of project */
     16#undef GLPK_VERSION
    1117
    1218/* Define to 1 if dlfcn support is available */
     
    103109#undef VERSION
    104110
    105 /* SVN revision number of project */
    106 #undef _SVN_REV
    107 
    108 /* Version number of project */
    109 #undef _VERSION
    110 
    111111/* Define to 1 if windows dll support is available */
    112112#undef __WOE__
  • ThirdParty/Glpk/trunk/configure

    r1548 r1585  
    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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion _SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR 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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16081608
    16091609
    1610 #Set the project's version number
    1611 if test "x" != x; then
     1610# We set the following variable so that we know later in AC_COIN_FINALIZE
     1611# that we are in a project main directory
     1612coin_projectdir=yes
     1613
     1614# Set the project's version number
     1615if test "xGlpk" != x; then
    16121616
    16131617cat >>confdefs.h <<_ACEOF
    1614 #define _VERSION "$PACKAGE_VERSION"
     1618#define GLPK_VERSION "$PACKAGE_VERSION"
    16151619_ACEOF
    16161620
    16171621fi
    16181622
    1619 #Set the project's SVN revision number
     1623# Set the project's SVN revision number
    16201624# Extract the first word of "svnversion", so it can be a program name with args.
    16211625set dummy svnversion; ac_word=$2
     
    16541658fi
    16551659
    1656 if test "x$have_svnversion" = xyes && test "x" != x; then
    1657 
    1658   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1659   if test $_SVN_REV != exported; then
     1660if test "x$have_svnversion" = xyes && test "xGlpk" != x; then
     1661
     1662  GLPK_SVN_REV=`cd $srcdir/$coin_has_glpk ; svnversion`
     1663  if test $GLPK_SVN_REV != exported; then
    16601664
    16611665cat >>confdefs.h <<_ACEOF
    1662 #define _SVN_REV "$_SVN_REV"
     1666#define GLPK_SVN_REV "$GLPK_SVN_REV"
    16631667_ACEOF
    16641668
     
    16661670fi
    16671671
    1668 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1669 # that we are in a project main directory
    1670 coin_projectdir=yes
    1671 
    1672 # Check if a library version is set for libtool
     1672# Capture libtool library version, if given.
    16731673
    16741674
     
    27492749        ;;
    27502750      *)
    2751         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2751        coin_opt_cflags="-O3"
    27522752        coin_add_cflags="-pipe"
    27532753        coin_dbg_cflags="-g"
     
    2290622906s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2290722907s,@have_svnversion@,$have_svnversion,;t t
    22908 s,@_SVN_REV@,$_SVN_REV,;t t
     22908s,@GLPK_SVN_REV@,$GLPK_SVN_REV,;t t
    2290922909s,@build@,$build,;t t
    2291022910s,@build_cpu@,$build_cpu,;t t
  • ThirdParty/Glpk/trunk/configure.ac

    r1548 r1585  
    2929AC_PREFIX_DEFAULT([`pwd`])
    3030
    31 AC_COIN_PROJECTDIR_INIT
     31AC_COIN_PROJECTDIR_INIT(Glpk)
    3232
    3333#############################################################################
Note: See TracChangeset for help on using the changeset viewer.