Changeset 1388 for ThirdParty/ASL

Timestamp:

Aug 1, 2009 9:12:40 AM (10 years ago)

Author:

stefan

Message:

install libraries and header files

Location:

ThirdParty/ASL/trunk

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (15 diffs)
• configure (modified) (24 diffs)
• configure.ac (modified) (4 diffs)

ThirdParty/ASL/trunk/Makefile.am

@@ -17 +17 @@
 libampl   = $(AMPLSOLVER_A)
 
-if SKIPMAKE
-  alltargets =
-else
+#if SKIPMAKE
+#  alltargets =
+#else
   alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
-endif
+#endif
 
 all-local: $(alltargets)
@@ -35 +35 @@
 stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
 
+thirdpartylibdir = $(prefix)/lib/ThirdParty
+install-exec-local: $(libampl)
+        test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
+        $(install_sh_DATA) $(libampl) "$(DESTDIR)$(thirdpartylibdir)/$(libampl)"
+
+uninstall-local:
+        rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
+
+addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
+addlibs_DATA = README asl_addlibs.txt
+
+thirdpartyincludedir = $(includedir)/coin/ThirdParty
+thirdpartyinclude_HEADERS = \
+  solvers/asl.h solvers/asl_pfg.h solvers/asl_pfgh.h solvers/psinfo.h solvers/funcadd.h \
+  solvers/nlp.h solvers/nlp2.h solvers/getstub.h solvers/opcode.hd solvers/r_opn.hd \
+  stdio1.h arith.h
+
 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
 

ThirdParty/ASL/trunk/Makefile.in

@@ -28 +28 @@
 #                    Documentation installation                        #
 ########################################################################
+
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -50 +52 @@
 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 \
         $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
         $(srcdir)/../../missing $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in $(srcdir)/compile_MS_ASL.in \
-        $(srcdir)/compile_Unix_ASL.in $(top_srcdir)/configure
+        $(srcdir)/Makefile.in $(srcdir)/asl_addlibs.txt.in \
+        $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \
+        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
@@ -68 +71 @@
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = compile_MS_ASL compile_Unix_ASL
+CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL
 SOURCES =
 DIST_SOURCES =
+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)$(addlibsdir)" \
+        "$(DESTDIR)$(thirdpartyincludedir)"
+addlibsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(addlibs_DATA)
+thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(thirdpartyinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -92 +109 @@
 AMTAR = @AMTAR@
 AR = @AR@
-ASLLIB = @ASLLIB@
 ASLMAKEFLAGS = @ASLMAKEFLAGS@
-ASL_CPPFLAGS = @ASL_CPPFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -105 +120 @@
 CDEFS = @CDEFS@
 CFLAGS = @CFLAGS@
-COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
-COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -145 +158 @@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MAKEOKFILE = @MAKEOKFILE@
 MPICC = @MPICC@
 MSVC_COMPILE_FALSE = @MSVC_COMPILE_FALSE@
@@ -162 +174 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SKIPMAKE_FALSE = @SKIPMAKE_FALSE@
-SKIPMAKE_TRUE = @SKIPMAKE_TRUE@
 STRIP = @STRIP@
 VERSION = @VERSION@
@@ -228 +238 @@
 compdir = compdir
 libampl = $(AMPLSOLVER_A)
-@SKIPMAKE_FALSE@alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
-@SKIPMAKE_TRUE@alltargets = 
+
+#if SKIPMAKE
+#  alltargets =
+#else
+alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
+thirdpartylibdir = $(prefix)/lib/ThirdParty
+addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
+addlibs_DATA = README asl_addlibs.txt
+thirdpartyincludedir = $(includedir)/coin/ThirdParty
+thirdpartyinclude_HEADERS = \
+  solvers/asl.h solvers/asl_pfg.h solvers/asl_pfgh.h solvers/psinfo.h solvers/funcadd.h \
+  solvers/nlp.h solvers/nlp2.h solvers/getstub.h solvers/opcode.hd solvers/r_opn.hd \
+  stdio1.h arith.h
+
 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
 
@@ -276 +298 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
         cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+asl_addlibs.txt: $(top_builddir)/config.status $(srcdir)/asl_addlibs.txt.in
+        cd $(top_builddir) && $(SHELL) ./config.status $@
 compile_MS_ASL: $(top_builddir)/config.status $(srcdir)/compile_MS_ASL.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -290 +314 @@
         -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)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '    { files[$$0] = 1; } \
+               END { for (i in files) print i; }'`; \
+        mkid -fID $$unique
 tags: TAGS
-TAGS:
-
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        tags=; \
+        here=`pwd`; \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '    { files[$$0] = 1; } \
+               END { for (i in files) print i; }'`; \
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
-CTAGS:
-
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        tags=; \
+        here=`pwd`; \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '    { files[$$0] = 1; } \
+               END { for (i in files) print i; }'`; \
+        test -z "$(CTAGS_ARGS)$$tags$$unique" \
+          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+             $$tags $$unique
+
+GTAGS:
+        here=`$(am__cd) $(top_builddir) && pwd` \
+          && cd $(top_srcdir) \
+          && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
+        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools $(distdir)/solvers
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -426 +526 @@
 check-am: all-am
 check: check-am
-all-am: Makefile all-local
+all-am: Makefile $(DATA) $(HEADERS) all-local
 installdirs:
+        for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am
@@ -461 +564 @@
         -rm -f $(am__CONFIG_DISTCLEAN_FILES)
         -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic distclean-libtool \
+        distclean-tags
 
 dvi: dvi-am
@@ -473 +577 @@
 info-am:
 
-install-data-am:
-
-install-exec-am:
+install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS
+
+install-exec-am: install-exec-local
 
 install-info: install-info-am
@@ -501 +605 @@
 ps-am:
 
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am all-local am--refresh check check-am clean \
-        clean-generic clean-libtool dist dist-all dist-bzip2 dist-gzip \
-        dist-shar dist-tarZ dist-zip distcheck distclean \
-        distclean-generic distclean-libtool 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 installdirs \
-        maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        uninstall uninstall-am uninstall-info-am
-
+uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
+        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 \
+        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-exec-local install-info install-info-am install-man \
+        install-strip install-thirdpartyincludeHEADERS installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+        uninstall-addlibsDATA uninstall-am uninstall-info-am \
+        uninstall-local uninstall-thirdpartyincludeHEADERS
+
+#endif
 
 all-local: $(alltargets)
@@ -524 +633 @@
 
 stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
+install-exec-local: $(libampl)
+        test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
+        $(install_sh_DATA) $(libampl) "$(DESTDIR)$(thirdpartylibdir)/$(libampl)"
+
+uninstall-local:
+        rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
 
 install-doc: $(DocFiles)

ThirdParty/ASL/trunk/configure

@@ -10 +10 @@
 #
 #
-# Copyright 2006 International Business Machines and others.
+# Copyright 2006, 2007, 2009 International Business Machines and others.
 # All Rights Reserved.
 # This file is part of the open source package Coin which is distributed
@@ -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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S 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 ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE MAKEOKFILE SKIPMAKE_TRUE SKIPMAKE_FALSE AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE 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 build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S 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 AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1088 +1088 @@
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-asldir           specify path to AMPL solver directory (or BUILD for
-                          compilation, or "no" for disabling AMPL)
 
 Some influential environment variables:
@@ -1220 +1218 @@
 
 
-Copyright 2006 International Business Machines and others.
+Copyright 2006, 2007, 2009 International Business Machines and others.
 All Rights Reserved.
 This file is part of the open source package Coin which is distributed
@@ -4737 +4735 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4739 "configure"' > conftest.$ac_ext
+  echo '#line 4737 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6336 +6334 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6338:" \
+echo "$as_me:6336:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -7403 +7401 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7405: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7403: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7409: \$? = $ac_status" >&5
+   echo "$as_me:7407: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7671 +7669 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7673: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7671: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7677: \$? = $ac_status" >&5
+   echo "$as_me:7675: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7775 +7773 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7777: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7781: \$? = $ac_status" >&5
+   echo "$as_me:7779: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10120 +10118 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10122 "configure"
+#line 10120 "configure"
 #include "confdefs.h"
 
@@ -10220 +10218 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10222 "configure"
+#line 10220 "configure"
 #include "confdefs.h"
 
@@ -12564 +12562 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12566: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12564: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12570: \$? = $ac_status" >&5
+   echo "$as_me:12568: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12668 +12666 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12670: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12668: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12674: \$? = $ac_status" >&5
+   echo "$as_me:12672: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14238 +14236 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14240: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14238: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14244: \$? = $ac_status" >&5
+   echo "$as_me:14242: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14342 +14340 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14344: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14342: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14348: \$? = $ac_status" >&5
+   echo "$as_me:14346: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -16549 +16547 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16551: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16549: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16555: \$? = $ac_status" >&5
+   echo "$as_me:16553: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16817 +16815 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16819: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16817: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16823: \$? = $ac_status" >&5
+   echo "$as_me:16821: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16921 +16919 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16923: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16921: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16927: \$? = $ac_status" >&5
+   echo "$as_me:16925: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -19824 +19822 @@
 
 # See what we're actually going to do for ASL. This will define ampllib.
-coin_aslobjdir=../ThirdParty/ASL
-coin_aslsrcdir=$srcdir/$coin_aslobjdir
+#AC_COIN_HAS_ASL
 
 # Determine the name of the ASL library
@@ -19836 +19833 @@
 
 
-# Check whether --with-asldir or --without-asldir was given.
-if test "${with_asldir+set}" = set; then
-  withval="$with_asldir"
-  use_asldir=$withval
-else
-  use_asldir=
-fi;
-
-if test "$use_asldir" = BUILD; then
-  if test "$PACKAGE_NAME" != ThirdPartyASL; then
-    # If we are configuring ThirdParty/ASL, don't check
-    if test -r $coin_aslobjdir/.MakeOk; then :; else
-      { { echo "$as_me:$LINENO: error: option \"BUILD\" specified for asldir, but directory is not configure (sources missing?)" >&5
-echo "$as_me: error: option \"BUILD\" specified for asldir, but directory is not configure (sources missing?)" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-elif test -z "$use_asldir"; then
- # try to find sources - if not given don't compile
-  if test "$PACKAGE_NAME" != ThirdPartyASL; then
-    if test -r $coin_aslobjdir/.MakeOk; then
-      use_asldir=BUILD
-    else
-      use_asldir=no
-    fi
-  else
-    use_asldir=no
-  fi
-elif test "$use_asldir" != "no"; then
-  if test -r $use_asldir/$ampllib; then
-
-  :
-else
-  { { echo "$as_me:$LINENO: error: ASL directory \"$use_asldir\" specified, but library missing" >&5
-echo "$as_me: error: ASL directory \"$use_asldir\" specified, but library missing" >&2;}
-   { (exit 1); exit 1; }; }
-  :
-fi
-
-  if test -r $use_asldir/asl.h; then
-
-  :
-else
-  { { echo "$as_me:$LINENO: error: ASL directory \"$use_asldir\" specified, but header files are missing" >&5
-echo "$as_me: error: ASL directory \"$use_asldir\" specified, but header files are missing" >&2;}
-   { (exit 1); exit 1; }; }
-  :
-fi
-
-  use_asldir=`cd $use_asldir; pwd`
-  case $build in
-    *-cygwin*) use_asldir=`cygpath -w $use_asldir | sed -e sX\\\\\\\\X/Xg` ;;
-  esac
-fi
-
-# Variable containing ASL library (including full path)
-
-# Variable containing flags for including ASL header files
-
-
-if test "$use_asldir" = BUILD; then
-  coin_aslobjdir=`cd $coin_aslobjdir; pwd`
-  ASLLIB=`$CYGPATH_W $coin_aslobjdir/$ampllib | sed -e sX\\\\\\\\X/Xg`
-  coin_aslsrcdir=`cd $coin_aslsrcdir; pwd`
-  ASL_CPPFLAGS="-I"`$CYGPATH_W $coin_aslobjdir | sed -e sX\\\\\\\\X/Xg`" -I"`$CYGPATH_W $coin_aslsrcdir/solvers | sed -e sX\\\\\\\\X/Xg`
-elif test "$use_asldir" != no; then
-  ASLLIB=`$CYGPATH_W $use_asldir/$ampllib | sed -e sX\\\\\\\\X/Xg`
-  ASL_CPPFLAGS="-I"`$CYGPATH_W $use_asldir | sed -e sX\\\\\\\\X/Xg`
-fi
-
-if test "$use_asldir" != no; then
-  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
-
-  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
-  ASLLIB="$ASLLIB -ldl"
-fi
-
-  coin_has_asl=yes
-
-cat >>confdefs.h <<\_ACEOF
-#define COIN_HAS_ASL 1
-_ACEOF
-
-  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
-
-else
-  coin_has_asl=no
-fi
-
-
-if test $coin_has_asl = yes; then
-  COIN_HAS_ASL_TRUE=
-  COIN_HAS_ASL_FALSE='#'
-else
-  COIN_HAS_ASL_TRUE='#'
-  COIN_HAS_ASL_FALSE=
-fi
-
-
-
-MAKEOKFILE=.MakeOk
-if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
-  skip_further_test=yes
-  rm -f $MAKEOKFILE
-  { echo "$as_me:$LINENO: The ASL sources don't need to be compiled" >&5
-echo "$as_me: The ASL sources don't need to be compiled" >&6;}
-  MAKEOKFILE=
-else
-  touch $MAKEOKFILE
-fi
-
-
-
-if test -z "$MAKEOKFILE"; then
-  SKIPMAKE_TRUE=
-  SKIPMAKE_FALSE='#'
-else
-  SKIPMAKE_TRUE='#'
-  SKIPMAKE_FALSE=
-fi
-
+#MAKEOKFILE=.MakeOk
+#if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
+#  skip_further_test=yes
+#  rm -f $MAKEOKFILE
+#  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
+#  MAKEOKFILE=
+#else
+#  touch $MAKEOKFILE
+#fi
+#AC_SUBST(MAKEOKFILE)
+#AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
 
 #############################################################################
@@ -20279 +20094 @@
 
 
-          ac_config_files="$ac_config_files Makefile"
+                    ac_config_files="$ac_config_files Makefile asl_addlibs.txt"
 
           ac_config_files="$ac_config_files compile_MS_ASL"
@@ -20504 +20319 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${COIN_HAS_ASL_TRUE}" && test -z "${COIN_HAS_ASL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_ASL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"COIN_HAS_ASL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${SKIPMAKE_TRUE}" && test -z "${SKIPMAKE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"SKIPMAKE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SKIPMAKE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -20968 +20769 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "asl_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES asl_addlibs.txt" ;;
   "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;;
   "compile_Unix_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_Unix_ASL" ;;
@@ -21149 +20951 @@
 s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
 s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
-s,@ASLLIB@,$ASLLIB,;t t
-s,@ASL_CPPFLAGS@,$ASL_CPPFLAGS,;t t
-s,@COIN_HAS_ASL_TRUE@,$COIN_HAS_ASL_TRUE,;t t
-s,@COIN_HAS_ASL_FALSE@,$COIN_HAS_ASL_FALSE,;t t
-s,@MAKEOKFILE@,$MAKEOKFILE,;t t
-s,@SKIPMAKE_TRUE@,$SKIPMAKE_TRUE,;t t
-s,@SKIPMAKE_FALSE@,$SKIPMAKE_FALSE,;t t
 s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
 s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t

ThirdParty/ASL/trunk/configure.ac

@@ -1 @@
-# Copyright (C) 2007 International Business Machines.
+# Copyright (C) 2007, 2009 International Business Machines.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -17 +17 @@
 
 AC_COPYRIGHT([
-Copyright 2006 International Business Machines and others.
+Copyright 2006, 2007, 2009 International Business Machines and others.
 All Rights Reserved.
 This file is part of the open source package Coin which is distributed
@@ -60 +60 @@
 
 # See what we're actually going to do for ASL. This will define ampllib.
-AC_COIN_HAS_ASL
-
-MAKEOKFILE=.MakeOk
-if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
-  skip_further_test=yes
-  rm -f $MAKEOKFILE
-  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
-  MAKEOKFILE=
-else
-  touch $MAKEOKFILE
-fi
-AC_SUBST(MAKEOKFILE)
-AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
+#AC_COIN_HAS_ASL
+
+# Determine the name of the ASL library
+case "$CC" in
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    ampllib=amplsolv.lib ;;
+  *)
+    ampllib=amplsolver.a ;;
+esac
+
+
+#MAKEOKFILE=.MakeOk
+#if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
+#  skip_further_test=yes
+#  rm -f $MAKEOKFILE
+#  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
+#  MAKEOKFILE=
+#else
+#  touch $MAKEOKFILE
+#fi
+#AC_SUBST(MAKEOKFILE)
+#AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
 
 #############################################################################
@@ -198 +207 @@
 AM_CONDITIONAL(MSVC_COMPILE, test x$msvc_compile = xyes)
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile asl_addlibs.txt])
 AC_CONFIG_FILES([compile_MS_ASL],[chmod a+x compile_MS_ASL])
 AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL])