Changeset 1379 for ThirdParty/Glpk

Timestamp:

Jul 26, 2009 2:33:41 PM (11 years ago)

Author:

stefan

Message:

towards making thirdparty projects behave like normal projects: add addlibs and dummy README files; install lib, header, addlibs and README file; compile always but require code to be available

Location:

ThirdParty/Glpk/trunk

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (19 diffs)
• README (added)
• config_glpk.h.in (modified) (1 diff)
• configure (modified) (30 diffs)
• configure.ac (modified) (7 diffs)

ThirdParty/Glpk/trunk/Makefile.am

@@ -9 +9 @@
 EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
 
-if COIN_BUILD_GLPK
-  noinst_LTLIBRARIES = libcoinglpk.la
-else
-  noinst_LTLIBRARIES =
-endif
+thirdpartylibdir = $(prefix)/lib/ThirdParty
+thirdpartylib_LTLIBRARIES = libcoinglpk.la
 
 GLPKDIR = @GLPKDIR@
 
-nodist_libcoinglpk_la_SOURCES = \
+libcoinglpk_la_SOURCES = \
 $(GLPKDIR)/src/glpapi01.c \
 $(GLPKDIR)/src/glpapi02.c \
@@ -173 +170 @@
 libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
 
+thirdpartyincludedir = $(includedir)/coin/ThirdParty
+thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
+
+addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
+addlibs_DATA = glpk_addlibs.txt README
+
 ########################################################################
 #                         Maintainer Stuff                             #

ThirdParty/Glpk/trunk/Makefile.in

@@ -28 +28 @@
 #                    Documentation installation                        #
 ########################################################################
+
+
 
 srcdir = @srcdir@
@@ -51 +53 @@
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__configure_deps) \
+DIST_COMMON = README $(am__configure_deps) \
         $(srcdir)/../../BuildTools/Makemain.inc \
         $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
@@ -58 +60 @@
         $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
         $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
-        $(top_srcdir)/configure
+        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
@@ -72 +74 @@
 CONFIG_HEADER = config_glpk.h
 CONFIG_CLEAN_FILES = glpk_addlibs.txt
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
+        "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"
+thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
 libcoinglpk_la_LIBADD =
-nodist_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
+am_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
         glpapi04.lo glpapi05.lo glpapi06.lo glpapi07.lo glpapi08.lo \
         glpapi09.lo glpapi10.lo glpapi11.lo glpapi12.lo glpapi13.lo \
@@ -97 +108 @@
         amd_order.lo amd_postorder.lo amd_post_tree.lo \
         amd_preprocess.lo amd_valid.lo colamd.lo
-libcoinglpk_la_OBJECTS = $(nodist_libcoinglpk_la_OBJECTS)
-@COIN_BUILD_GLPK_TRUE@am_libcoinglpk_la_rpath =
+libcoinglpk_la_OBJECTS = $(am_libcoinglpk_la_OBJECTS)
 depcomp = $(SHELL) $(top_srcdir)/../../depcomp
 am__depfiles_maybe = depfiles
@@ -109 +119 @@
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
         $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(nodist_libcoinglpk_la_SOURCES)
-DIST_SOURCES =
+SOURCES = $(libcoinglpk_la_SOURCES)
+DIST_SOURCES = $(libcoinglpk_la_SOURCES)
+addlibsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(addlibs_DATA)
+thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(thirdpartyinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -143 +157 @@
 CDEFS = @CDEFS@
 CFLAGS = @CFLAGS@
-COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
-COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
@@ -169 +181 @@
 FFLAGS = @FFLAGS@
 GLPKDIR = @GLPKDIR@
-GLPKINCDIR = @GLPKINCDIR@
-GLPKLIB = @GLPKLIB@
+GLPKDOCDIR = @GLPKDOCDIR@
 GLPKOBJDIR = @GLPKOBJDIR@
+GLPKSRCDIR = @GLPKSRCDIR@
 HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
 HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
@@ -191 +203 @@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MAKEOKFILE = @MAKEOKFILE@
 MPICC = @MPICC@
 OBJEXT = @OBJEXT@
@@ -264 +275 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch $(am__append_1)
-@COIN_BUILD_GLPK_FALSE@noinst_LTLIBRARIES = 
-@COIN_BUILD_GLPK_TRUE@noinst_LTLIBRARIES = libcoinglpk.la
-nodist_libcoinglpk_la_SOURCES = \
+thirdpartylibdir = $(prefix)/lib/ThirdParty
+thirdpartylib_LTLIBRARIES = libcoinglpk.la
+libcoinglpk_la_SOURCES = \
 $(GLPKDIR)/src/glpapi01.c \
 $(GLPKDIR)/src/glpapi02.c \
@@ -400 +411 @@
 
 libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
+thirdpartyincludedir = $(includedir)/coin/ThirdParty
+thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
+addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
+addlibs_DATA = glpk_addlibs.txt README
 
 ########################################################################
@@ -466 +481 @@
 glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
+        @$(NORMAL_INSTALL)
+        test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
+        @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
+          if test -f $$p; then \
+            f=$(am__strip_dir) \
+            echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
+            $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
+          else :; fi; \
+        done
+
+uninstall-thirdpartylibLTLIBRARIES:
+        @$(NORMAL_UNINSTALL)
+        @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
+          p=$(am__strip_dir) \
+          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
+          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
+        done
+
+clean-thirdpartylibLTLIBRARIES:
+        -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
+        @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
           test "$$dir" != "$$p" || dir=.; \
@@ -476 +509 @@
         done
 libcoinglpk.la: $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_DEPENDENCIES) 
-        $(LINK) $(am_libcoinglpk_la_rpath) $(libcoinglpk_la_LDFLAGS) $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_LIBADD) $(LIBS)
+        $(LINK) -rpath $(thirdpartylibdir) $(libcoinglpk_la_LDFLAGS) $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1395 +1428 @@
         -rm -f libtool
 uninstall-info-am:
+install-addlibsDATA: $(addlibs_DATA)
+        @$(NORMAL_INSTALL)
+        test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
+        @list='$(addlibs_DATA)'; for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          f=$(am__strip_dir) \
+          echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
+          $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
+        done
+
+uninstall-addlibsDATA:
+        @$(NORMAL_UNINSTALL)
+        @list='$(addlibs_DATA)'; for p in $$list; do \
+          f=$(am__strip_dir) \
+          echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
+          rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
+        done
+install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
+        @$(NORMAL_INSTALL)
+        test -z "$(thirdpartyincludedir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartyincludedir)"
+        @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          f=$(am__strip_dir) \
+          echo " $(thirdpartyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
+          $(thirdpartyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
+        done
+
+uninstall-thirdpartyincludeHEADERS:
+        @$(NORMAL_UNINSTALL)
+        @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
+          f=$(am__strip_dir) \
+          echo " rm -f '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
+          rm -f "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
+        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -1447 +1514 @@
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
+        $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -1573 +1640 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) config_glpk.h
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config_glpk.h
 installdirs:
+        for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am
@@ -1602 +1672 @@
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
         mostlyclean-am
 
@@ -1622 +1692 @@
 info-am:
 
-install-data-am:
+install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS \
+        install-thirdpartylibLTLIBRARIES
 
 install-exec-am:
@@ -1652 +1723 @@
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-addlibsDATA uninstall-info-am \
+        uninstall-thirdpartyincludeHEADERS \
+        uninstall-thirdpartylibLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags dist \
-        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-        distcheck distclean distclean-compile distclean-generic \
-        distclean-hdr distclean-libtool distclean-tags distcleancheck \
-        distdir distuninstallcheck dvi dvi-am html html-am info \
-        info-am install install-am install-data install-data-am \
-        install-exec install-exec-am install-info install-info-am \
-        install-man install-strip installcheck installcheck-am \
+        clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
+        ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
+        dist-zip distcheck distclean distclean-compile \
+        distclean-generic distclean-hdr distclean-libtool \
+        distclean-tags distcleancheck distdir distuninstallcheck dvi \
+        dvi-am html html-am info info-am install install-addlibsDATA \
+        install-am install-data install-data-am install-exec \
+        install-exec-am install-info install-info-am install-man \
+        install-strip install-thirdpartyincludeHEADERS \
+        install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
         installdirs maintainer-clean maintainer-clean-generic \
         mostlyclean mostlyclean-compile mostlyclean-generic \
         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-info-am
+        uninstall-addlibsDATA uninstall-am uninstall-info-am \
+        uninstall-thirdpartyincludeHEADERS \
+        uninstall-thirdpartylibLTLIBRARIES
 
 

ThirdParty/Glpk/trunk/config_glpk.h.in

@@ -7 +7 @@
 #undef COIN_GLPK_VERBOSITY
 
-/* Define to 1 if Glpk package is available */
+/* Define to 1 if the Glpk package is used */
 #undef COIN_HAS_GLPK
 

ThirdParty/Glpk/trunk/configure

@@ -434 +434 @@
 PACKAGE_BUGREPORT='http://projects.coin-or.org/BuildTools/newticket'
 
-ac_unique_file="Makefile.am"
+ac_unique_file="glpk/include/glpk.h"
 ac_default_prefix=`pwd`
 # Factoring default headers for most tests.
@@ -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 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 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 GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GLPKOBJDIR COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE MAKEOKFILE COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR LIBEXT VPATH_DISTCLEANFILES 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 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 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 GLPKSRCDIR GLPKOBJDIR GLPKDOCDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1073 +1073 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-glpk-libcheck use disable-glpk-libcheck to skip the
-                          link check at configuration time
   --enable-gnu-packages   compile with GNU packages (disabled by default)
   --enable-odbc           enable MathProg ODBC support [default=auto]
@@ -1089 +1087 @@
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-glpk-incdir specify the header file directory for library Glpk
-  --with-glpk-lib specify the flags used to link with the library Glpk
 
 Some influential environment variables:
@@ -1583 +1579 @@
 
 
+# As backup, we make sure we don't loose an FLIBS if it has been set
+# by the user
+save_FLIBS="$FLIBS"
+
 # Initialize the FADDLIBS variable (which is to be used with a fortran
 # compiler and will not include FLIBS)
@@ -1603 +1603 @@
 # that we are in a project main directory
 coin_projectdir=yes
+
+# Check if a library version is set for libtool
+
 
 
@@ -4725 +4728 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4727 "configure"' > conftest.$ac_ext
+  echo '#line 4730 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6324 +6327 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6326:" \
+echo "$as_me:6329:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -7391 +7394 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7393: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7396: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7397: \$? = $ac_status" >&5
+   echo "$as_me:7400: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7659 +7662 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7661: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7664: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7665: \$? = $ac_status" >&5
+   echo "$as_me:7668: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7763 +7766 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7765: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7768: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7769: \$? = $ac_status" >&5
+   echo "$as_me:7772: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10108 +10111 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10110 "configure"
+#line 10113 "configure"
 #include "confdefs.h"
 
@@ -10208 +10211 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10210 "configure"
+#line 10213 "configure"
 #include "confdefs.h"
 
@@ -12552 +12555 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12554: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12557: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12558: \$? = $ac_status" >&5
+   echo "$as_me:12561: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12656 +12659 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12658: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12661: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12662: \$? = $ac_status" >&5
+   echo "$as_me:12665: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14226 +14229 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14231: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14232: \$? = $ac_status" >&5
+   echo "$as_me:14235: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14330 +14333 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14332: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14335: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14336: \$? = $ac_status" >&5
+   echo "$as_me:14339: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -16537 +16540 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16539: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16542: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16543: \$? = $ac_status" >&5
+   echo "$as_me:16546: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16805 +16808 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16807: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16810: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16811: \$? = $ac_status" >&5
+   echo "$as_me:16814: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16909 +16912 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16911: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16914: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16915: \$? = $ac_status" >&5
+   echo "$as_me:16918: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -19794 +19797 @@
 LT_LDFLAGS=
 
+# Check if we want to set the library version
+echo "$as_me:$LINENO: checking if library version is set" >&5
+echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
+if test x"$coin_libversion" != x; then
+  LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
+  echo "$as_me:$LINENO: result: $coin_libversion" >&5
+echo "${ECHO_T}$coin_libversion" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
 
 #END
@@ -19801 +19817 @@
 #                            COIN_HAS_GLPK                                #
 ###########################################################################
+
+echo "$as_me:$LINENO: checking for COIN project Glpk" >&5
+echo $ECHO_N "checking for COIN project Glpk... $ECHO_C" >&6
+
+# First check, if the sub-project is actually available (ToDo: allow
+# other locations)
+
+coin_has_glpk=unavailable
+if test x"$COIN_SKIP_PROJECTS" != x; then
+  for dir in $COIN_SKIP_PROJECTS; do
+    if test $dir = Glpk; then
+      coin_has_glpk=skipping
+    fi
+  done
+fi
+
+if test $coin_has_glpk != skipping; then
+  if test $PACKAGE_TARNAME = glpk; then
+    coin_has_glpk=.
+  else
+    if test -d $srcdir/../Glpk; then
+      coin_has_glpk=../Glpk
+    fi
+  fi
+fi
+
+if test $coin_has_glpk != unavailable &&
+   test $coin_has_glpk != skipping; then
+  # Set the #define if the component is available
+
+cat >>confdefs.h <<\_ACEOF
+#define COIN_HAS_GLPK 1
+_ACEOF
+
+
+  # Set the variables for source and object code location
+
+  GLPKSRCDIR=`cd $srcdir/$coin_has_glpk; pwd`
+
+  GLPKOBJDIR=`pwd`/$coin_has_glpk
+
+  GLPKDOCDIR=$abs_lib_dir/../share/doc/coin/Glpk
+fi
+
+  # Define the Makefile conditional
+
+
+if test $coin_has_glpk != unavailable &&
+                test $coin_has_glpk != skipping; then
+  COIN_HAS_GLPK_TRUE=
+  COIN_HAS_GLPK_FALSE='#'
+else
+  COIN_HAS_GLPK_TRUE='#'
+  COIN_HAS_GLPK_FALSE=
+fi
+
+echo "$as_me:$LINENO: result: $coin_has_glpk" >&5
+echo "${ECHO_T}$coin_has_glpk" >&6
+
 
 # This macro checks for a library containing the GLPK library.  It
@@ -19812 +19887 @@
 
 ## Check if GLPK is already provided by user
-
-if test "$PACKAGE_NAME" = ThirdPartyGlpk; then
-  coin_glpkobjdir=../Glpk
-else
-  coin_glpkobjdir=../ThirdParty/Glpk
-fi
-coin_glpksrcdir=$abs_source_dir/$coin_glpkobjdir
-
-use_thirdpartyglpk=no
-
-# Check for the requested component. If the user specified an external glpk
-# library don't force a ThirdParty build, let the error propagate.
-
-
-  echo "$as_me:$LINENO: checking if user provides library for Glpk" >&5
-echo $ECHO_N "checking if user provides library for Glpk... $ECHO_C" >&6
-
-# Check for header file directory
-
-
-# Check whether --with-glpk-incdir or --without-glpk-incdir was given.
-if test "${with_glpk_incdir+set}" = set; then
-  withval="$with_glpk_incdir"
-  GLPKINCDIR=`cd $withval; pwd`
-fi;
-
-# Check for library directory
-
-
-# Check whether --with-glpk-lib or --without-glpk-lib was given.
-if test "${with_glpk_lib+set}" = set; then
-  withval="$with_glpk_lib"
-  GLPKLIB=$withval
-fi;
-
-# Switch to disable library check if requested
-
-  # Check whether --enable-glpk-libcheck or --disable-glpk-libcheck was given.
-if test "${enable_glpk_libcheck+set}" = set; then
-  enableval="$enable_glpk_libcheck"
-  glpk_libcheck=$enableval
-else
-  glpk_libcheck=yes
-fi;
-
-# At this point, if we're going to use the library, both LBRYINCDIR and
-# LBRYLIB must be defined and not empty.
-
-  if test x"$GLPKINCDIR" != x || test x"$GLPKLIB" != x; then
-    if test x"$GLPKINCDIR" = x || test x"$GLPKLIB" = x; then
-      { { echo "$as_me:$LINENO: error: You need to specify both an include directory and link flags to use library Glpk. Use --with-glpk-incdir of environment variable $GLPKINCDIR to specify the include directory. Use --with-glpk-lib or environment variable $GLPKLIB to specify link flags." >&5
-echo "$as_me: error: You need to specify both an include directory and link flags to use library Glpk. Use --with-glpk-incdir of environment variable $GLPKINCDIR to specify the include directory. Use --with-glpk-lib or environment variable $GLPKLIB to specify link flags." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    coin_has_glpk=true
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  else
-    coin_has_glpk=false
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  fi
-
-# If we have instructions for use, consider header and link checks.
-
-  if test $coin_has_glpk = true; then
-
-# If argument 3 (file) is given, check for the file. Typically this will be a
-# header file, but that's not assumed.
-
-    if test -r $GLPKINCDIR/glpk.h; then
-
-  :
-else
-  { { echo "$as_me:$LINENO: error: Cannot find file glpk.h in $GLPKINCDIR" >&5
-echo "$as_me: error: Cannot find file glpk.h in $GLPKINCDIR" >&2;}
-   { (exit 1); exit 1; }; }
-  :
-fi
-
-
-# Now see if we can link the function. There are arguments for and against
-# assuming argument 3 is a header file declaring the function. A correct
-# function declaration is the main argument in favour. Having to cope with
-# possible dependencies or other oddities are the main arguments against.
-# Force the use of C as the best single choice amongst C++, C, and Fortran.
-# Obviously, this has limits.
-
-    if test x"$glpk_libcheck" != xno; then
-           coin_save_LIBS="$LIBS"
-           LIBS="$GLPKLIB $ADDLIBS"
-           coin_GLPK_link=no
-           ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-           for fnm in _glp_lpx_simplex glp_lpx_simplex ; do
-             echo "$as_me:$LINENO: checking whether symbol $fnm is available with GLPK" >&5
-echo $ECHO_N "checking whether symbol $fnm is available with GLPK... $ECHO_C" >&6
-             cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-$fnm()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"
-                         || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-                  coin_GLPK_link=yes
-                  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-           done
-           ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-           if test x"$coin_GLPK_link" = xyes ; then
-             LIBS="$coin_save_LIBS"
-           else
-             { { echo "$as_me:$LINENO: error: Cannot find symbol(s) _glp_lpx_simplex glp_lpx_simplex with GLPK" >&5
-echo "$as_me: error: Cannot find symbol(s) _glp_lpx_simplex glp_lpx_simplex with GLPK" >&2;}
-   { (exit 1); exit 1; }; }
-           fi
-         fi
-
-
-# If we make it this far, we've verified the file and linked the function. Add
-# the necessary link flags to ADDLIBS and define the preprocessor symbol
-# COIN_HAS_LBRY.
-
-    ADDLIBS="$GLPKLIB $ADDLIBS"
-
-cat >>confdefs.h <<\_ACEOF
-#define COIN_HAS_GLPK 1
-_ACEOF
-
-  fi
-
-# Arrange for configure to substitute LBRYINCDIR and LBRYLIB and create the
-# automake conditional. These actions must occur unconditionally.
-
-
-
-
-
-if test $coin_has_glpk = true; then
-  COIN_HAS_GLPK_TRUE=
-  COIN_HAS_GLPK_FALSE='#'
-else
-  COIN_HAS_GLPK_TRUE='#'
-  COIN_HAS_GLPK_FALSE=
-fi
-
-
- if test x"$coin_has_glpk" = xfalse && test x"$GLPKLIB" = x ; then
-   use_thirdpartyglpk=try
- fi
-
-
-# If the user has supplied an external library, use it. Otherwise, consider
-# a build in ThirdParty/Glpk. If we build, assume we get both glpk and gmpl.
-
-if test x"$use_thirdpartyglpk" = xtry ; then
-  MAKEOKFILE=.MakeOk
-  # Check if the Glpk's ThirdParty project has been configured
-  if test "$PACKAGE_NAME" != ThirdPartyGlpk; then
-    if test -r $coin_glpkobjdir/.MakeOk; then
-      use_thirdpartyglpk=build
-    else
-      use_thirdpartyglpk=no
-    fi
-  else
-    use_thirdpartyglpk=build
-  fi
-
-# If we're building, set the library and include directory variables, create a
-# preprocessor symbol, define a variable that says we're using glpk/gmpl, and
-# another to indicate a link check is a bad idea (hard to do before the library
-# exists).
-
-  if test x"$use_thirdpartyglpk" = xbuild ; then
-    GLPKINCDIR="$coin_glpksrcdir/glpk/include"
-
-
-cat >>confdefs.h <<\_ACEOF
-#define COIN_HAS_GLPK 1
-_ACEOF
-
-    coin_has_glpk=true
-    glpk_libcheck=no
-    GLPKOBJDIR=`cd $coin_glpkobjdir; pwd`
-
-    { echo "$as_me:$LINENO: Using Glpk in ThirdParty/Glpk" >&5
-echo "$as_me: Using Glpk in ThirdParty/Glpk" >&6;}
-  fi
-fi
-
-# Define the necessary automake conditionals.
-
-
-
-if test x"$coin_has_glpk" = xtrue; then
-  COIN_HAS_GLPK_TRUE=
-  COIN_HAS_GLPK_FALSE='#'
-else
-  COIN_HAS_GLPK_TRUE='#'
-  COIN_HAS_GLPK_FALSE=
-fi
-
-
-
-if test x"$use_thirdpartyglpk" = xbuild; then
-  COIN_BUILD_GLPK_TRUE=
-  COIN_BUILD_GLPK_FALSE='#'
-else
-  COIN_BUILD_GLPK_TRUE='#'
-  COIN_BUILD_GLPK_FALSE=
-fi
-
-
-
-
-rm -f $MAKEOKFILE
-if test x"$use_thirdpartyglpk" = xbuild ; then
-  touch $MAKEOKFILE
+#AC_COIN_HAS_GLPK(Glpk)
+
+#rm -f $MAKEOKFILE
+#if test x"$use_thirdpartyglpk" = xbuild ; then
+#  touch $MAKEOKFILE
   echo "$as_me:$LINENO: checking GLPK version" >&5
 echo $ECHO_N "checking GLPK version... $ECHO_C" >&6
-  majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
-  minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
+  majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
+  minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
   echo "$as_me:$LINENO: result: ${majorver}.${minorver}" >&5
 echo "${ECHO_T}${majorver}.${minorver}" >&6
-  if test $majorver != 4 || test $minorver != 38 ; then
+  if test x$majorver != x4 || test x$minorver != x38 ; then
     { { echo "$as_me:$LINENO: error: \"Incorrect GLPK version. This build system is made for GLPK 4.38. Please update by rerunning get.GLPK\"" >&5
 echo "$as_me: error: \"Incorrect GLPK version. This build system is made for GLPK 4.38. Please update by rerunning get.GLPK\"" >&2;}
    { (exit 1); exit 1; }; }
   fi
-else
-  if test x$coin_has_glpk = xtrue ; then
-    { echo "$as_me:$LINENO: The Glpk sources don't need to be compiled" >&5
-echo "$as_me: The Glpk sources don't need to be compiled" >&6;}
-  else
-    { echo "$as_me:$LINENO: WARNING: Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?" >&5
-echo "$as_me: WARNING: Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?" >&2;}
-  fi
-  MAKEOKFILE=
-fi
-
+#else
+#  if test x$coin_has_glpk = xtrue ; then
+#    AC_MSG_NOTICE([The Glpk sources don't need to be compiled])
+#  else
+#    AC_MSG_WARN([Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?])
+#  fi
+#  MAKEOKFILE=
+#fi
+#AC_SUBST(MAKEOKFILE)
 
 ###########################################################################
@@ -20978 +20789 @@
 
 if test "$enable_dl" = "no"; then
-#if test x"" = x; then
+  #if test x"" = x; then
 #  hdr="#include <ltdl.h>"
 #else
@@ -21388 +21199 @@
   enableval="$enable_odbc"
   case $enableval in
-           yes | unix)
+     yes | unix)
        #if test x"" = x; then
 #  hdr="#include <sql.h>"
@@ -21555 +21366 @@
        enable_odbc="no"
      ;;
-           *)
-             { { echo "$as_me:$LINENO: error: invalid value '$enableval' for --enable-odbc" >&5
+     *)
+       { { echo "$as_me:$LINENO: error: invalid value '$enableval' for --enable-odbc" >&5
 echo "$as_me: error: invalid value '$enableval' for --enable-odbc" >&2;}
    { (exit 1); exit 1; }; }
-           ;;
+     ;;
    esac
 else
@@ -21728 +21539 @@
   enableval="$enable_mysql"
   case $enableval in
-           yes)
+     yes)
        #if test x"" = x; then
 #  hdr="#include <mysql.h mysql/mysql.h>"
@@ -21896 +21707 @@
        enable_mysql="no"
      ;;
-           *)
-             { { echo "$as_me:$LINENO: error: invalid value '$enableval' for --enable-mysql" >&5
+     *)
+       { { echo "$as_me:$LINENO: error: invalid value '$enableval' for --enable-mysql" >&5
 echo "$as_me: error: invalid value '$enableval' for --enable-mysql" >&2;}
    { (exit 1); exit 1; }; }
-           ;;
+     ;;
    esac
 else
@@ -22366 +22177 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"COIN_HAS_GLPK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${COIN_HAS_GLPK_TRUE}" && test -z "${COIN_HAS_GLPK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_GLPK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"COIN_HAS_GLPK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${COIN_BUILD_GLPK_TRUE}" && test -z "${COIN_BUILD_GLPK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"COIN_BUILD_GLPK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"COIN_BUILD_GLPK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -23017 +22814 @@
 s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
 s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
-s,@GLPKINCDIR@,$GLPKINCDIR,;t t
-s,@GLPKLIB@,$GLPKLIB,;t t
+s,@GLPKSRCDIR@,$GLPKSRCDIR,;t t
+s,@GLPKOBJDIR@,$GLPKOBJDIR,;t t
+s,@GLPKDOCDIR@,$GLPKDOCDIR,;t t
 s,@COIN_HAS_GLPK_TRUE@,$COIN_HAS_GLPK_TRUE,;t t
 s,@COIN_HAS_GLPK_FALSE@,$COIN_HAS_GLPK_FALSE,;t t
-s,@GLPKOBJDIR@,$GLPKOBJDIR,;t t
-s,@COIN_BUILD_GLPK_TRUE@,$COIN_BUILD_GLPK_TRUE,;t t
-s,@COIN_BUILD_GLPK_FALSE@,$COIN_BUILD_GLPK_FALSE,;t t
-s,@MAKEOKFILE@,$MAKEOKFILE,;t t
 s,@COIN_HAS_ZLIB_TRUE@,$COIN_HAS_ZLIB_TRUE,;t t
 s,@COIN_HAS_ZLIB_FALSE@,$COIN_HAS_ZLIB_FALSE,;t t

ThirdParty/Glpk/trunk/configure.ac

@@ -21 +21 @@
 # List one file in the package so that the configure script can test
 # whether the package is actually there
-AC_CONFIG_SRCDIR(Makefile.am)
+AC_CONFIG_SRCDIR(glpk/include/glpk.h)
 
 # Where should everything be installed by default?  Here, we want it
@@ -54 +54 @@
 #                            COIN_HAS_GLPK                                #
 ###########################################################################
+
+AC_COIN_HAS_PROJECT(Glpk)
 
 # This macro checks for a library containing the GLPK library.  It
@@ -65 +67 @@
 
 ## Check if GLPK is already provided by user
-AC_COIN_HAS_GLPK(Glpk)
-
-rm -f $MAKEOKFILE
-if test x"$use_thirdpartyglpk" = xbuild ; then
-  touch $MAKEOKFILE
+#AC_COIN_HAS_GLPK(Glpk)
+
+#rm -f $MAKEOKFILE
+#if test x"$use_thirdpartyglpk" = xbuild ; then
+#  touch $MAKEOKFILE
   AC_MSG_CHECKING([GLPK version])
-  majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
-  minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
+  majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
+  minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
   AC_MSG_RESULT([${majorver}.${minorver}])
-  if test $majorver != 4 || test $minorver != 38 ; then
+  if test x$majorver != x4 || test x$minorver != x38 ; then
     AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.38. Please update by rerunning get.GLPK"])
   fi
-else
-  if test x$coin_has_glpk = xtrue ; then
-    AC_MSG_NOTICE([The Glpk sources don't need to be compiled])
-  else
-    AC_MSG_WARN([Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?])
-  fi
-  MAKEOKFILE=
-fi
-AC_SUBST(MAKEOKFILE)
+#else
+#  if test x$coin_has_glpk = xtrue ; then
+#    AC_MSG_NOTICE([The Glpk sources don't need to be compiled])
+#  else
+#    AC_MSG_WARN([Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?])
+#  fi
+#  MAKEOKFILE=
+#fi
+#AC_SUBST(MAKEOKFILE)
 
 ###########################################################################
@@ -132 +134 @@
 
 if test "$enable_dl" = "no"; then
-AC_COIN_CHECK_HEADER([ltdl.h],[enable_dl=yes])
+  AC_COIN_CHECK_HEADER([ltdl.h],[enable_dl=yes])
   if test "$enable_dl" = "yes"; then
     #if ltdl.h is there, check also if libltdl is there; if so, set corresponding define for GLPK 
@@ -150 +152 @@
 
 AC_ARG_ENABLE(odbc,
-        AC_HELP_STRING([--enable-odbc],[enable MathProg ODBC support [[default=auto]]]),
-        [case $enableval in
-           yes | unix)
+  AC_HELP_STRING([--enable-odbc],[enable MathProg ODBC support [[default=auto]]]),
+  [case $enableval in
+     yes | unix)
        AC_COIN_CHECK_HEADER([sql.h],,[AC_MSG_ERROR(["need sql.h to enable ODBC support"])])
        enable_odbc="$enableval"
@@ -159 +161 @@
        enable_odbc="no"
      ;;
-           *)
-             AC_MSG_ERROR([invalid value '$enableval' for --enable-odbc])
-           ;;
+     *)
+       AC_MSG_ERROR([invalid value '$enableval' for --enable-odbc])
+     ;;
    esac],
-        [AC_COIN_CHECK_HEADER([sql.h],[enable_odbc=yes],[enable_odbc=no])]
+  [AC_COIN_CHECK_HEADER([sql.h],[enable_odbc=yes],[enable_odbc=no])]
 )
 
 AC_ARG_ENABLE(mysql,
-        AC_HELP_STRING([--enable-mysql],[enable MathProg MySQL support [[default=auto]]]),
-        [case $enableval in
-           yes)
+  AC_HELP_STRING([--enable-mysql],[enable MathProg MySQL support [[default=auto]]]),
+  [case $enableval in
+     yes)
        AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],,[AC_MSG_ERROR(["need mysql.h to enable MySQL support"])])
        enable_mysql="$enableval"
@@ -176 +178 @@
        enable_mysql="no"
      ;;
-           *)
-             AC_MSG_ERROR([invalid value '$enableval' for --enable-mysql])
-           ;;
+     *)
+       AC_MSG_ERROR([invalid value '$enableval' for --enable-mysql])
+     ;;
    esac],
-        [AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],[enable_mysql=yes],[enable_mysql=no])]
+  [AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],[enable_mysql=yes],[enable_mysql=no])]
 )
 
 AC_LANG_POP(C)
-        
+
 if test "$enable_dl" = "yes" && ( test "$enable_odbc" = "yes" || test "$enable_odbc" = "unix"); then
   AC_MSG_CHECKING([checking name of ODBC library])