Changeset 2307

Timestamp:

Jun 19, 2011 10:12:04 AM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2306

Location:

ThirdParty/ASL/stable/1.2

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (19 diffs)
• coinasl-uninstalled.pc.in (modified) (1 diff)
• coinasl.pc.in (modified) (1 diff)
• configure (modified) (47 diffs)
• configure.ac (modified) (6 diffs)

ThirdParty/ASL/stable/1.2/Makefile.am

@@ -5 +5 @@
 ## $Id$
 
+# the idea is to use the ASL Makefiles to build a static $(AMPLSOLVER_A) library via the compile_*_ASL scripts
+# from this library, we create a libcoinasl.la libtool library
+# in a MS VC build, we assume static libraries are used, so we can use the usual libtool machinery via LIBADD
+# in a normal build, we build the libcoinasl.la library by extracting the $(AMPLSOLVER_A) library and relinking it via libtool
+#    in a shared library build, this should give a shared libcoinasl.so library
+#    further, configure should have taken care of adding -fPIC -DPIC to the CFLAGS when compiling the ASL sources
+#    to avoid a failure when building static libraries and a libtool warning, we additionally create .lo files for each object
+
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = get.ASL INSTALL.ASL
+
+if COIN_CC_IS_CL
+lib_LTLIBRARIES = libcoinasl.la
+
+libcoinasl_la_SOURCES = 
+libcoinasl_la_LIBADD = $(AMPLSOLVER_A)
+libcoinasl_la_DEPENDENCIES = $(AMPLSOLVER_A)
+
+# This is for libtool
+libcoinasl_la_LDFLAGS = $(LT_LDFLAGS)
+endif
 
 ########################################################################
@@ -15 +34 @@
 compdir = compdir
 
-libampl   = $(AMPLSOLVER_A)
+alltargets = stdio1.h arith.h funcadd0.$(OBJEXT)
 
-alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
+if COIN_CC_IS_CL
+$(AMPLSOLVER_A):
+        ./compile_MS_ASL
+        
+else
+$(AMPLSOLVER_A):
+        ./compile_Unix_ASL
+
+libcoinasl.la : $(AMPLSOLVER_A)
+        $(mkdir_p) linkdir ; cd linkdir ; \
+        $(AR) x ../$(AMPLSOLVER_A) ; \
+        for i in *.o ; do \
+          lofile=`echo $$i | sed -e 's/.o$$/.lo/'`; \
+          echo "# fake line" > $$lofile ; \
+          echo "# Generated by fake libtool" >> $$lofile ; \
+          echo "pic_object='$$i'" >> $$lofile ; \
+          echo "non_pic_object='$$i'" >> $$lofile ; \
+        done ; cd ..
+        $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $(LT_LDFLAGS) linkdir/*.lo
+        rm -rf linkdir
+
+install-exec-local: libcoinasl.la
+        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+        if test -f libcoinasl.la; then \
+          $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) libcoinasl.la "$(DESTDIR)$(libdir)/libcoinasl.la"; \
+        fi
+        
+uninstall-local:
+        $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/libcoinasl.la"
+
+alltargets += libcoinasl.la
+
+endif
+
+stdio1.h arith.h funcadd0.$(OBJEXT): $(AMPLSOLVER_A)
 
 all-local: $(alltargets)
 
-if MSVC_COMPILE
-$(libampl):
-        ./compile_MS_ASL
-else
-$(libampl):
-        ./compile_Unix_ASL
-endif
-
-stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
+test:
+        @echo "No test available for ASL."
 
 thirdpartyincludedir = $(includedir)/coin/ThirdParty
@@ -37 +83 @@
   stdio1.h arith.h
 
-thirdpartylibdir = $(libdir)
-thirdpartylib_DATA = $(libampl)
-
 pkgconfiglibdir = $(libdir)/pkgconfig
 pkgconfiglib_DATA = coinasl.pc
 
-if COIN_HAS_PKGCONFIG
-addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/ASL
-        
-install-data-hook:
-        @$(mkdir_p) "$(addlibsdir)"
-        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
-        $(PKG_CONFIG) --libs coinasl > $(addlibsdir)/asl_addlibs.txt
-        
-uninstall-hook:
-        rm -f $(addlibsdir)/asl_addlibs.txt
-endif
-
-CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
+CLEANFILES = $(AMPLSOLVER_A) $(alltargets)
 
 ########################################################################
@@ -62 +93 @@
 
 # Files that are generated and should be cleaned with make distclean
-DISTCLEANFILES = $(MAKEOKFILE)
+DISTCLEANFILES =
 
 include BuildTools/Makemain.inc

ThirdParty/ASL/stable/1.2/Makefile.in

@@ -19 +19 @@
 # This file is distributed under the Eclipse Public License.
 
+# the idea is to use the ASL Makefiles to build a static $(AMPLSOLVER_A) library via the compile_*_ASL scripts
+# from this library, we create a libcoinasl.la libtool library
+# in a MS VC build, we assume static libraries are used, so we can use the usual libtool machinery via LIBADD
+# in a normal build, we build the libcoinasl.la library by extracting the $(AMPLSOLVER_A) library and relinking it via libtool
+#    in a shared library build, this should give a shared libcoinasl.so library
+#    further, configure should have taken care of adding -fPIC -DPIC to the CFLAGS when compiling the ASL sources
+#    to avoid a failure when building static libraries and a libtool warning, we additionally create .lo files for each object
+
 # Copyright (C) 2006, 2007 International Business Machines and others.
 # All Rights Reserved.
@@ -28 +36 @@
 #                    Documentation installation                        #
 ########################################################################
+
 
 
@@ -52 +61 @@
 build_triplet = @build@
 host_triplet = @host@
+@COIN_CC_IS_CL_FALSE@am__append_1 = libcoinasl.la
 DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
         $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -58 +68 @@
         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
         config.guess config.sub depcomp install-sh ltmain.sh missing
-@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
-@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
+@HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies
+@HAVE_EXTERNALS_TRUE@am__append_3 = .Dependencies-stamp
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -71 +81 @@
 CONFIG_CLEAN_FILES = compile_MS_ASL compile_Unix_ASL coinasl.pc \
         coinasl-uninstalled.pc
-SOURCES =
-DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -79 +87 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)" \
-        "$(DESTDIR)$(thirdpartylibdir)" \
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
         "$(DESTDIR)$(thirdpartyincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am_libcoinasl_la_OBJECTS =
+libcoinasl_la_OBJECTS = $(am_libcoinasl_la_OBJECTS)
+@COIN_CC_IS_CL_TRUE@am_libcoinasl_la_rpath = -rpath $(libdir)
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libcoinasl_la_SOURCES)
+DIST_SOURCES = $(libcoinasl_la_SOURCES)
 pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
-thirdpartylibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfiglib_DATA) $(thirdpartylib_DATA)
+DATA = $(pkgconfiglib_DATA)
 thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(thirdpartyinclude_HEADERS)
@@ -167 +190 @@
 MAKEINFO = @MAKEINFO@
 MPICC = @MPICC@
-MSVC_COMPILE_FALSE = @MSVC_COMPILE_FALSE@
-MSVC_COMPILE_TRUE = @MSVC_COMPILE_TRUE@
 OBJEXT = @OBJEXT@
 OPT_CFLAGS = @OPT_CFLAGS@
@@ -242 +263 @@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = get.ASL INSTALL.ASL $(am__append_1)
+EXTRA_DIST = get.ASL INSTALL.ASL $(am__append_2)
+@COIN_CC_IS_CL_TRUE@lib_LTLIBRARIES = libcoinasl.la
+@COIN_CC_IS_CL_TRUE@libcoinasl_la_SOURCES = 
+@COIN_CC_IS_CL_TRUE@libcoinasl_la_LIBADD = $(AMPLSOLVER_A)
+@COIN_CC_IS_CL_TRUE@libcoinasl_la_DEPENDENCIES = $(AMPLSOLVER_A)
+
+# This is for libtool
+@COIN_CC_IS_CL_TRUE@libcoinasl_la_LDFLAGS = $(LT_LDFLAGS)
 
 ########################################################################
@@ -248 +276 @@
 ########################################################################
 compdir = compdir
-libampl = $(AMPLSOLVER_A)
-alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
+alltargets = stdio1.h arith.h funcadd0.$(OBJEXT) $(am__append_1)
 thirdpartyincludedir = $(includedir)/coin/ThirdParty
 thirdpartyinclude_HEADERS = \
@@ -256 +283 @@
   stdio1.h arith.h
 
-thirdpartylibdir = $(libdir)
-thirdpartylib_DATA = $(libampl)
 pkgconfiglibdir = $(libdir)/pkgconfig
 pkgconfiglib_DATA = coinasl.pc
-@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/ASL
-CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
+CLEANFILES = $(AMPLSOLVER_A) $(alltargets)
 
 ########################################################################
@@ -268 +292 @@
 
 # Files that are generated and should be cleaned with make distclean
-DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
+DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
 DocFiles = README AUTHORS LICENSE
 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
@@ -315 +339 @@
 coinasl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinasl-uninstalled.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+        @$(NORMAL_INSTALL)
+        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+          if test -f $$p; then \
+            f=$(am__strip_dir) \
+            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+          else :; fi; \
+        done
+
+uninstall-libLTLIBRARIES:
+        @$(NORMAL_UNINSTALL)
+        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+          p=$(am__strip_dir) \
+          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+        done
+
+clean-libLTLIBRARIES:
+        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+          test "$$dir" != "$$p" || dir=.; \
+          echo "rm -f \"$${dir}/so_locations\""; \
+          rm -f "$${dir}/so_locations"; \
+        done
+@COIN_CC_IS_CL_TRUE@libcoinasl.la: $(libcoinasl_la_OBJECTS) $(libcoinasl_la_DEPENDENCIES) 
+@COIN_CC_IS_CL_TRUE@    $(LINK) $(am_libcoinasl_la_rpath) $(libcoinasl_la_LDFLAGS) $(libcoinasl_la_OBJECTS) $(libcoinasl_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+        -rm -f *.$(OBJEXT)
+
+distclean-compile:
+        -rm -f *.tab.c
 
 mostlyclean-libtool:
@@ -341 +400 @@
           echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
           rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
-        done
-install-thirdpartylibDATA: $(thirdpartylib_DATA)
-        @$(NORMAL_INSTALL)
-        test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
-        @list='$(thirdpartylib_DATA)'; for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          f=$(am__strip_dir) \
-          echo " $(thirdpartylibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
-          $(thirdpartylibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
-        done
-
-uninstall-thirdpartylibDATA:
-        @$(NORMAL_UNINSTALL)
-        @list='$(thirdpartylib_DATA)'; for p in $$list; do \
-          f=$(am__strip_dir) \
-          echo " rm -f '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
-          rm -f "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
         done
 install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
@@ -554 +596 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA) $(HEADERS) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-        for dir in "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
@@ -585 +627 @@
         @echo "This command is intended for maintainers to use"
         @echo "it deletes files that may require special tools to rebuild."
-@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
-@COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
+@COIN_CC_IS_CL_TRUE@uninstall-local:
+@COIN_CC_IS_CL_TRUE@install-exec-local:
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+        mostlyclean-am
 
 distclean: distclean-am
         -rm -f $(am__CONFIG_DISTCLEAN_FILES)
         -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-        distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+        distclean-libtool distclean-tags
 
 dvi: dvi-am
@@ -608 +651 @@
 
 install-data-am: install-pkgconfiglibDATA \
-        install-thirdpartyincludeHEADERS install-thirdpartylibDATA
-        @$(NORMAL_INSTALL)
-        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
-install-exec-am:
+        install-thirdpartyincludeHEADERS
+
+install-exec-am: install-exec-local install-libLTLIBRARIES
 
 install-info: install-info-am
@@ -628 +669 @@
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
 
 pdf: pdf-am
@@ -638 +680 @@
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
-        uninstall-thirdpartyincludeHEADERS uninstall-thirdpartylibDATA
-        @$(NORMAL_INSTALL)
-        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+        uninstall-local uninstall-pkgconfiglibDATA \
+        uninstall-thirdpartyincludeHEADERS
 
 .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
-        clean clean-generic clean-libtool ctags dist dist-all \
-        dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
-        distclean distclean-generic distclean-libtool distclean-tags \
+        clean clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+        dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
+        dist-zip distcheck distclean distclean-compile \
+        distclean-generic 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-data-hook install-exec install-exec-am \
-        install-info install-info-am install-man \
-        install-pkgconfiglibDATA install-strip \
-        install-thirdpartyincludeHEADERS install-thirdpartylibDATA \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-generic \
-        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-hook uninstall-info-am \
-        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
-        uninstall-thirdpartylibDATA
-
+        install-data-am install-exec install-exec-am \
+        install-exec-local install-info install-info-am \
+        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
+        install-strip install-thirdpartyincludeHEADERS 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-libLTLIBRARIES uninstall-local \
+        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
+
+
+@COIN_CC_IS_CL_TRUE@$(AMPLSOLVER_A):
+@COIN_CC_IS_CL_TRUE@    ./compile_MS_ASL
+
+@COIN_CC_IS_CL_FALSE@$(AMPLSOLVER_A):
+@COIN_CC_IS_CL_FALSE@   ./compile_Unix_ASL
+
+@COIN_CC_IS_CL_FALSE@libcoinasl.la : $(AMPLSOLVER_A)
+@COIN_CC_IS_CL_FALSE@   $(mkdir_p) linkdir ; cd linkdir ; \
+@COIN_CC_IS_CL_FALSE@   $(AR) x ../$(AMPLSOLVER_A) ; \
+@COIN_CC_IS_CL_FALSE@   for i in *.o ; do \
+@COIN_CC_IS_CL_FALSE@     lofile=`echo $$i | sed -e 's/.o$$/.lo/'`; \
+@COIN_CC_IS_CL_FALSE@     echo "# fake line" > $$lofile ; \
+@COIN_CC_IS_CL_FALSE@     echo "# Generated by fake libtool" >> $$lofile ; \
+@COIN_CC_IS_CL_FALSE@     echo "pic_object='$$i'" >> $$lofile ; \
+@COIN_CC_IS_CL_FALSE@     echo "non_pic_object='$$i'" >> $$lofile ; \
+@COIN_CC_IS_CL_FALSE@   done ; cd ..
+@COIN_CC_IS_CL_FALSE@   $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $(LT_LDFLAGS) linkdir/*.lo
+@COIN_CC_IS_CL_FALSE@   rm -rf linkdir
+
+@COIN_CC_IS_CL_FALSE@install-exec-local: libcoinasl.la
+@COIN_CC_IS_CL_FALSE@   test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+@COIN_CC_IS_CL_FALSE@   if test -f libcoinasl.la; then \
+@COIN_CC_IS_CL_FALSE@          $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) libcoinasl.la "$(DESTDIR)$(libdir)/libcoinasl.la"; \
+@COIN_CC_IS_CL_FALSE@   fi
+
+@COIN_CC_IS_CL_FALSE@uninstall-local:
+@COIN_CC_IS_CL_FALSE@   $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/libcoinasl.la"
+
+stdio1.h arith.h funcadd0.$(OBJEXT): $(AMPLSOLVER_A)
 
 all-local: $(alltargets)
 
-@MSVC_COMPILE_TRUE@$(libampl):
-@MSVC_COMPILE_TRUE@     ./compile_MS_ASL
-@MSVC_COMPILE_FALSE@$(libampl):
-@MSVC_COMPILE_FALSE@    ./compile_Unix_ASL
-
-stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
-
-@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
-@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
-@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
-@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinasl > $(addlibsdir)/asl_addlibs.txt
-
-@COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
-@COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/asl_addlibs.txt
+test:
+        @echo "No test available for ASL."
 
 install-doc: $(DocFiles)
@@ -717 +777 @@
 @MAINTAINER_MODE_TRUE@  cp $< $@
 
-# Take care of updating externals (if Externals file exists)
-@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
-
-@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
-@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
-@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
-
-@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
+# Take care of updating externals (if Dependencies file exists)
+@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
+
+@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
+@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
+@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
+
+@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
 

ThirdParty/ASL/stable/1.2/coinasl-uninstalled.pc.in

@@ -6 +6 @@
 URL: https://projects.coin-or.org/BuildTools
 Version: @PACKAGE_VERSION@
-Libs: ${libdir}/@AMPLSOLVER_A@ @ASL_PCLIBS@
+Libs: ${libdir}/libcoinasl.la @ASL_PCLIBS@
 Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers

ThirdParty/ASL/stable/1.2/coinasl.pc.in

@@ -8 +8 @@
 URL: https://projects.coin-or.org/BuildTools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lamplsolver @ASL_PCLIBS@
+Libs: -L${libdir} -lcoinasl @ASL_PCLIBS@
 Cflags: -I${includedir}

ThirdParty/ASL/stable/1.2/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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion ASL_SVN_REV EGREP LN_S COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE ASL_PCLIBS 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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion ASL_SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED AMPLSOLVER_A ASLMAKEFLAGS ASL_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1064 +1064 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          compile all projects with debug options tests
-  --enable-debug-asl compile this project (ASL) with debug options
+                          (implies --disable-shared)
+  --enable-debug-asl compile project ASL with debug compiler flags
   --enable-doscompile     Under Cygwin, compile so that executables run under
                           DOS. Set to mingw to use gcc/g++/ld with
@@ -1081 +1082 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-pkg-config     use pkg-config if available (default is yes)
+  --disable-pkg-config    disable use of pkg-config (if available)
 
 Optional Packages:
@@ -1672 +1673 @@
 coin_projectdir=yes
 
-# Set the project's version number
-if test "xASL" != x; then
+# Set the project's version numbers
+
 
 cat >>confdefs.h <<_ACEOF
@@ -1679 +1680 @@
 _ACEOF
 
-fi
-
-# Set the project's SVN revision number. The complicated sed expression
-# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
-# as a single number.
-# Extract the first word of "svnversion", so it can be a program name with args.
+
+  coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
+  coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
+  coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
+  if test "x$coin_majorver" = x ; then coin_majorver=9999 ; fi
+  if test "x$coin_minorver" = x ; then coin_minorver=9999 ; fi
+  if test "x$coin_releasever" = x ; then coin_releasever=9999 ; fi
+
+cat >>confdefs.h <<_ACEOF
+#define ASL_VERSION_MAJOR $coin_majorver
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define ASL_VERSION_MINOR $coin_minorver
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define ASL_VERSION_RELEASE $coin_releasever
+_ACEOF
+
+
+  # We use the following variable to have a string with the upper case
+  # version of the project name
+  COIN_PRJCT=ASL
+
+  # Set the project's SVN revision number. The complicated sed expression
+  # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
+  # as a single number.
+  # Extract the first word of "svnversion", so it can be a program name with args.
 set dummy svnversion; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -1720 +1746 @@
 fi
 
-if test "x$have_svnversion" = xyes && test "xASL" != x; then
-
-  svn_rev_tmp=`cd $srcdir/$coin_has_asl ; svnversion`
-  ASL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
-  if test $ASL_SVN_REV != exported; then
+  if test "x$have_svnversion" = xyes; then
+
+    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
+    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
+      ASL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
 
 cat >>confdefs.h <<_ACEOF
@@ -1730 +1756 @@
 _ACEOF
 
+    fi
   fi
-fi
+
+
 
 # Capture libtool library version, if given.
+
 
 
@@ -1771 +1800 @@
   case "${enableval}" in
     yes) coin_debug_compile=true
-         enable_shared=no
          ;;
     no)  coin_debug_compile=false
@@ -1826 +1854 @@
 #define COIN_ASL_CHECKLEVEL $coin_asl_checklevel
 _ACEOF
-
-
-# We use the following variable to have a string with the upper case
-# version of the project name
-COIN_PRJCT=ASL
 
 
@@ -1939 +1962 @@
   esac
 fi
-
-# add automake conditional so we can recognize cl compiler in makefile
-coin_cc_is_cl=false
-if test x"$CXX" != x; then
-  case "$CXX" in
-    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-      coin_cc_is_cl=true
-      ;;
-  esac
-fi
-
-
-if test $coin_cc_is_cl = true; then
-  COIN_CC_IS_CL_TRUE=
-  COIN_CC_IS_CL_FALSE='#'
-else
-  COIN_CC_IS_CL_TRUE='#'
-  COIN_CC_IS_CL_FALSE=
-fi
-
 
 
@@ -2778 +2781 @@
 CFLAGS="$save_cflags"
 
+# add automake conditional so we can recognize cl compiler in makefile
+coin_cc_is_cl=false
+case "$CC" in
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    coin_cc_is_cl=true
+    ;;
+esac
+
+
+if test $coin_cc_is_cl = true; then
+  COIN_CC_IS_CL_TRUE=
+  COIN_CC_IS_CL_FALSE='#'
+else
+  COIN_CC_IS_CL_TRUE='#'
+  COIN_CC_IS_CL_FALSE=
+fi
+
+
 # Check if a project specific CFLAGS variable has been set
 if test x$COIN_PRJCT != x; then
@@ -2800 +2821 @@
         coin_opt_cflags="-O3"
         coin_add_cflags="-pipe"
-        coin_dbg_cflags="-g"
-        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
+        coin_dbg_cflags="-g -O0"
+        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
         case $build in
           *-darwin*)
@@ -3066 +3087 @@
 esac
 
+# add -DPROJECT_BUILD to signal compiler preprocessor which config header file to include
+if test x$COIN_PRJCT != x; then
+  CFLAGS="$CFLAGS -D${COIN_PRJCT}_BUILD"
+fi
+
 # Try if CFLAGS works
 save_CFLAGS="$CFLAGS"
@@ -3612 +3638 @@
 
 
+
 # AC_MSG_NOTICE([Beginning automake initialisation.])
 # Stuff for automake
@@ -4145 +4172 @@
 
 
-  # Check if we have an Externals file
-  if test -r $srcdir/Externals; then
+  # Check if we have an Dependencies file
+  if test -r $srcdir/Dependencies; then
     coin_have_externals=yes
   fi
@@ -4219 +4246 @@
         { { echo "$as_me:$LINENO: error: Cannot find the BuildTools directory" >&5
 echo "$as_me: error: Cannot find the BuildTools directory" >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit better disable maintainer mode.); exit better disable maintainer mode.; }; }
       fi
     fi
   fi
 
+
+  # for running automake by make, we need to have Makemain.inc available at the place where it usually can be found during run_autotools
+  if test "$BUILDTOOLSDIR" != "$srcdir/BuildTools" ; then
+    $LN_S `cd $BUILDTOOLSDIR; pwd` "$srcdir/BuildTools"
+  fi
 
   # The following variable is set to the name of the directory where
@@ -4816 +4848 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4818 "configure"' > conftest.$ac_ext
+  echo '#line 4850 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6415 +6447 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6417:" \
+echo "$as_me:6449:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -7482 +7514 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7484: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7516: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7488: \$? = $ac_status" >&5
+   echo "$as_me:7520: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7750 +7782 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7752: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7784: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7756: \$? = $ac_status" >&5
+   echo "$as_me:7788: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7854 +7886 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7856: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7888: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7860: \$? = $ac_status" >&5
+   echo "$as_me:7892: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10199 +10231 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10201 "configure"
+#line 10233 "configure"
 #include "confdefs.h"
 
@@ -10299 +10331 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10301 "configure"
+#line 10333 "configure"
 #include "confdefs.h"
 
@@ -12643 +12675 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12645: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12677: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12649: \$? = $ac_status" >&5
+   echo "$as_me:12681: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12747 +12779 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12749: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12781: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12753: \$? = $ac_status" >&5
+   echo "$as_me:12785: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14317 +14349 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14319: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14323: \$? = $ac_status" >&5
+   echo "$as_me:14355: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14421 +14453 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14423: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14455: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14427: \$? = $ac_status" >&5
+   echo "$as_me:14459: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -16628 +16660 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16662: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16634: \$? = $ac_status" >&5
+   echo "$as_me:16666: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16896 +16928 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16898: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16930: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16902: \$? = $ac_status" >&5
+   echo "$as_me:16934: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17000 +17032 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17002: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17034: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17006: \$? = $ac_status" >&5
+   echo "$as_me:17038: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -20004 +20036 @@
   fi
   if test -n "$PKG_CONFIG"; then
-    _pkg_min_version=0.9.0
+    _pkg_min_version=0.16.0
     echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
 echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
@@ -20045 +20077 @@
 # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
 if test "x${prefix}" = xNONE ; then
-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
-else
-  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+else
+  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
 fi
 
@@ -20059 +20091 @@
    { (exit 1); exit 1; }; }
    fi
-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
 
 fi;
@@ -20097 +20129 @@
 fi
 
+if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
+  { echo "$as_me:$LINENO: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&5
+echo "$as_me: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&2;}
+fi
+
 
 
@@ -20107 +20144 @@
 # Set a substitutable variable with the library name, and determine the compilation style.
 
-case "$CC" in
-  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-    AMPLSOLVER_A=libamplsolver.lib
-    msvc_compile=yes
-    ;;
-  *)
-    AMPLSOLVER_A=libamplsolver.a
-    msvc_compile=no
-    ;;
-esac
-{ echo "$as_me:$LINENO: Configuring ASL to build $AMPLSOLVER_A." >&5
-echo "$as_me: Configuring ASL to build $AMPLSOLVER_A." >&6;}
+if test "x$coin_cc_is_cl" = xtrue ; then
+  AMPLSOLVER_A=libamplsolver.lib
+else
+  AMPLSOLVER_A=libamplsolver.a
+fi
 
 # Determine flags to be passed on the command line to (n)make. The main
@@ -20270 +20300 @@
 
 
+# Check for dlopen, ASL uses it to load userdefined function libraries
+  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  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
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  ASL_PCLIBS="-ldl $ASL_PCLIBS"
+fi
+
+
 # Back to whatever language we were in.
   ac_ext=c
@@ -20286 +20386 @@
 # Remove -Werror if present, to make sure we are not interrupting compilation
 # of ASL because of warning messages. The cl equivalent is -WX.
+# SV: Our buildsystem should never add these flags to the CFLAGS, so why bother checking for them?
+#     If the user added some, shouldn't we listen to it and not just remove them again?
   bla=
-  if test x$msvc_compile = xyes ; then
+  if test "x$coin_cc_is_cl" = xtrue ; then
     warnToErr="-WX"
   else
@@ -20297 +20399 @@
     fi
   done
+
+# Add -fPIC -DPIC if we actually build shared libraries
+  if test x$enable_shared != xno; then
+    asladdcflags="$asladdcflags -fPIC -DPIC"
+  fi
+
   ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
 
@@ -20312 +20420 @@
 # Limit GNU make to one thread. But remember that if we're building with
 # cl, ultimately we're going to use nmake, which knows nothing of this.
-  if test x$msvc_compile = xno ; then
+  if test "x$coin_cc_is_cl" != xtrue ; then
     rm -rf conftest.mak
     ($am_make -v > conftest.grp) 2>&5
@@ -20327 +20435 @@
 
 
-# Set automake conditional and generate the output files.
-
-
-
-if test x$msvc_compile = xyes; then
-  MSVC_COMPILE_TRUE=
-  MSVC_COMPILE_FALSE='#'
-else
-  MSVC_COMPILE_TRUE='#'
-  MSVC_COMPILE_FALSE=
-fi
-
+# generate the output files.
 
           ac_config_files="$ac_config_files Makefile"
@@ -20427 +20524 @@
 
   fi
+
+  # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
+  # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
+
 
   cat >confcache <<\_ACEOF
@@ -20603 +20704 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"COIN_HAS_PKGCONFIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${MSVC_COMPILE_TRUE}" && test -z "${MSVC_COMPILE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MSVC_COMPILE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MSVC_COMPILE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -21152 +21246 @@
 s,@EGREP@,$EGREP,;t t
 s,@LN_S@,$LN_S,;t t
-s,@COIN_CC_IS_CL_TRUE@,$COIN_CC_IS_CL_TRUE,;t t
-s,@COIN_CC_IS_CL_FALSE@,$COIN_CC_IS_CL_FALSE,;t t
 s,@CDEFS@,$CDEFS,;t t
 s,@ADD_CFLAGS@,$ADD_CFLAGS,;t t
@@ -21166 +21258 @@
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
+s,@COIN_CC_IS_CL_TRUE@,$COIN_CC_IS_CL_TRUE,;t t
+s,@COIN_CC_IS_CL_FALSE@,$COIN_CC_IS_CL_FALSE,;t t
 s,@MPICC@,$MPICC,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
@@ -21246 +21340 @@
 s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
 s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t
-s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
-s,@MSVC_COMPILE_FALSE@,$MSVC_COMPILE_FALSE,;t t
 s,@ASL_PCLIBS@,$ASL_PCLIBS,;t t
 s,@LIBEXT@,$LIBEXT,;t t
@@ -21708 +21800 @@
 
 
+    case $build in
+      *-aix*)
+        { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
+echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
+        sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
+        mv config.status.tmp config.status
+      ;;
+    esac
+
+
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -21784 +21886 @@
   fi
 
+  { echo "$as_me:$LINENO: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&5
+echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
   if test x$coin_projectdir = xyes; then
     { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5

ThirdParty/ASL/stable/1.2/configure.ac

@@ -70 +70 @@
 # Set a substitutable variable with the library name, and determine the compilation style.
 AC_SUBST(AMPLSOLVER_A)
-case "$CC" in
-  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-    AMPLSOLVER_A=libamplsolver.lib
-    msvc_compile=yes
-    ;;
-  *)
-    AMPLSOLVER_A=libamplsolver.a
-    msvc_compile=no
-    ;;
-esac
-AC_MSG_NOTICE([Configuring ASL to build $AMPLSOLVER_A.])
+if test "x$coin_cc_is_cl" = xtrue ; then
+  AMPLSOLVER_A=libamplsolver.lib
+else
+  AMPLSOLVER_A=libamplsolver.a
+fi
 
 # Determine flags to be passed on the command line to (n)make. The main
@@ -122 +116 @@
     [asladdcflags="$asladdcflags -DNO_LONG_LONG"],[])
 
+# Check for dlopen, ASL uses it to load userdefined function libraries
+  AC_CHECK_LIB(dl,[dlopen],[ASL_PCLIBS="-ldl $ASL_PCLIBS"])
+
 # Back to whatever language we were in.
   AC_LANG_POP(C)
@@ -133 +130 @@
 # Remove -Werror if present, to make sure we are not interrupting compilation
 # of ASL because of warning messages. The cl equivalent is -WX.
+# SV: Our buildsystem should never add these flags to the CFLAGS, so why bother checking for them?
+#     If the user added some, shouldn't we listen to it and not just remove them again?
   bla=
-  if test x$msvc_compile = xyes ; then
+  if test "x$coin_cc_is_cl" = xtrue ; then
     warnToErr="-WX"
   else
@@ -144 +143 @@
     fi
   done
+  
+# Add -fPIC -DPIC if we actually build shared libraries
+  if test x$enable_shared != xno; then
+    asladdcflags="$asladdcflags -fPIC -DPIC"
+  fi
+  
   ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
 
@@ -159 +164 @@
 # Limit GNU make to one thread. But remember that if we're building with
 # cl, ultimately we're going to use nmake, which knows nothing of this.
-  if test x$msvc_compile = xno ; then
+  if test "x$coin_cc_is_cl" != xtrue ; then
     rm -rf conftest.mak
     ($am_make -v > conftest.grp) 2>&5
@@ -173 +178 @@
 AC_ARG_VAR(ASLMAKEFLAGS, [Compilation flags necessary for compiling the AMPL solver library])
 
-# Set automake conditional and generate the output files.
-
-AM_CONDITIONAL(MSVC_COMPILE, test x$msvc_compile = xyes)
+# generate the output files.
 
 AC_CONFIG_FILES([Makefile])