Changeset 1585 for ThirdParty/Glpk/trunk

Timestamp:

Jun 19, 2010 2:01:19 PM (11 years ago)

Author:

stefan

Message:

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:

ThirdParty/Glpk/trunk

Files:

• Makefile.in (modified) (2 diffs)
• config_glpk.h.in (modified) (2 diffs)
• configure (modified) (6 diffs)
• configure.ac (modified) (1 diff)

ThirdParty/Glpk/trunk/Makefile.in

@@ -183 +183 @@
 FFLAGS = @FFLAGS@
 GLPKDIR = @GLPKDIR@
+GLPK_SVN_REV = @GLPK_SVN_REV@
 HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
 HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
@@ -220 +221 @@
 VERSION = @VERSION@
 VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
-_SVN_REV = @_SVN_REV@
 abs_bin_dir = @abs_bin_dir@
 abs_include_dir = @abs_include_dir@

ThirdParty/Glpk/trunk/config_glpk.h.in

@@ -9 +9 @@
 /* Define to 1 if zlib is available */
 #undef COIN_HAS_ZLIB
+
+/* SVN revision number of project */
+#undef GLPK_SVN_REV
+
+/* Version number of project */
+#undef GLPK_VERSION
 
 /* Define to 1 if dlfcn support is available */
@@ -103 +109 @@
 #undef VERSION
 
-/* SVN revision number of project */
-#undef _SVN_REV
-
-/* Version number of project */
-#undef _VERSION
-
 /* Define to 1 if windows dll support is available */
 #undef __WOE__

ThirdParty/Glpk/trunk/configure

@@ -473 +473 @@
 #endif"
 
-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'
+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 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'
 ac_subst_files=''
 
@@ -1608 +1608 @@
 
 
-#Set the project's version number
-if test "x" != x; then
+# We set the following variable so that we know later in AC_COIN_FINALIZE
+# that we are in a project main directory
+coin_projectdir=yes
+
+# Set the project's version number
+if test "xGlpk" != x; then
 
 cat >>confdefs.h <<_ACEOF
-#define _VERSION "$PACKAGE_VERSION"
+#define GLPK_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
 fi
 
-#Set the project's SVN revision number
+# Set the project's SVN revision number
 # Extract the first word of "svnversion", so it can be a program name with args.
 set dummy svnversion; ac_word=$2
@@ -1654 +1658 @@
 fi
 
-if test "x$have_svnversion" = xyes && test "x" != x; then
-
-  _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
-  if test $_SVN_REV != exported; then
+if test "x$have_svnversion" = xyes && test "xGlpk" != x; then
+
+  GLPK_SVN_REV=`cd $srcdir/$coin_has_glpk ; svnversion`
+  if test $GLPK_SVN_REV != exported; then
 
 cat >>confdefs.h <<_ACEOF
-#define _SVN_REV "$_SVN_REV"
+#define GLPK_SVN_REV "$GLPK_SVN_REV"
 _ACEOF
 
@@ -1666 +1670 @@
 fi
 
-# We set the following variable so that we know later in AC_COIN_FINALIZE
-# that we are in a project main directory
-coin_projectdir=yes
-
-# Check if a library version is set for libtool
+# Capture libtool library version, if given.
 
 
@@ -2749 +2749 @@
         ;;
       *)
-        coin_opt_cflags="-O3 -fomit-frame-pointer"
+        coin_opt_cflags="-O3"
         coin_add_cflags="-pipe"
         coin_dbg_cflags="-g"
@@ -22906 +22906 @@
 s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
 s,@have_svnversion@,$have_svnversion,;t t
-s,@_SVN_REV@,$_SVN_REV,;t t
+s,@GLPK_SVN_REV@,$GLPK_SVN_REV,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t

ThirdParty/Glpk/trunk/configure.ac

@@ -29 +29 @@
 AC_PREFIX_DEFAULT([`pwd`])
 
-AC_COIN_PROJECTDIR_INIT
+AC_COIN_PROJECTDIR_INIT(Glpk)
 
 #############################################################################