Changeset 725

Timestamp:

Oct 30, 2007 2:19:15 PM (13 years ago)

Author:

lou

Message:

Changes to build ASL on Solaris / x86. Introduce compile_Unix_ASL.in. Tweaks to
eliminate comptry.bat in compile_MS_ASL.in; solves problem with cygwin / cl.

Location:

ThirdParty/ASL/trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• compile_MS_ASL.in (modified) (1 diff)
• compile_Unix_ASL.in (added)
• configure (modified) (32 diffs)
• configure.ac (modified) (4 diffs)

ThirdParty/ASL/trunk/Makefile.am

@@ -30 +30 @@
 else
 $(libampl):
-        rm -rf $(compdir) ; \
-        $(mkinstalldirs) $(compdir); \
-        files=`cd $(abs_source_dir)/solvers; ls *.[chs] *.[ch]0 *.hd arith.* makefile* `; \
-        cd $(compdir); \
-        for file in $$files; \
-        do \
-          rm -f $$file ;\
-          $(LN_S) $(abs_source_dir)/solvers/$$file $$file ;\
-        done; \
-        rm -f makefile; \
-        $(ASLMAKEFILECMDS); \
-        $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" clean ;\
-        $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" ;\
-        mv amplsolver.a ../$(libampl)
-        -cd $(compdir); mv stdio1.h arith.h funcadd0.$(OBJEXT) ..
-        rm -rf $(compdir)
+        compile_Unix_ASL
 endif
 

ThirdParty/ASL/trunk/Makefile.in

@@ -56 +56 @@
         $(srcdir)/../../missing $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in $(srcdir)/compile_MS_ASL.in \
-        $(top_srcdir)/configure
+        $(srcdir)/compile_Unix_ASL.in $(top_srcdir)/configure
 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
@@ -68 +68 @@
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = compile_MS_ASL
+CONFIG_CLEAN_FILES = compile_MS_ASL compile_Unix_ASL
 SOURCES =
 DIST_SOURCES =
@@ -93 +93 @@
 AR = @AR@
 ASLLIB = @ASLLIB@
-ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
 ASLMAKEFLAGS = @ASLMAKEFLAGS@
 ASL_CPPFLAGS = @ASL_CPPFLAGS@
@@ -218 +217 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+sol_cc_compiler = @sol_cc_compiler@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -275 +275 @@
         cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 compile_MS_ASL: $(top_builddir)/config.status $(srcdir)/compile_MS_ASL.in
+        cd $(top_builddir) && $(SHELL) ./config.status $@
+compile_Unix_ASL: $(top_builddir)/config.status $(srcdir)/compile_Unix_ASL.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
 
@@ -517 +519 @@
 @MSVC_COMPILE_TRUE@     compile_MS_ASL
 @MSVC_COMPILE_FALSE@$(libampl):
-@MSVC_COMPILE_FALSE@    rm -rf $(compdir) ; \
-@MSVC_COMPILE_FALSE@    $(mkinstalldirs) $(compdir); \
-@MSVC_COMPILE_FALSE@    files=`cd $(abs_source_dir)/solvers; ls *.[chs] *.[ch]0 *.hd arith.* makefile* `; \
-@MSVC_COMPILE_FALSE@    cd $(compdir); \
-@MSVC_COMPILE_FALSE@    for file in $$files; \
-@MSVC_COMPILE_FALSE@    do \
-@MSVC_COMPILE_FALSE@      rm -f $$file ;\
-@MSVC_COMPILE_FALSE@      $(LN_S) $(abs_source_dir)/solvers/$$file $$file ;\
-@MSVC_COMPILE_FALSE@    done; \
-@MSVC_COMPILE_FALSE@    rm -f makefile; \
-@MSVC_COMPILE_FALSE@    $(ASLMAKEFILECMDS); \
-@MSVC_COMPILE_FALSE@    $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" clean ;\
-@MSVC_COMPILE_FALSE@    $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" ;\
-@MSVC_COMPILE_FALSE@    mv amplsolver.a ../$(libampl)
-@MSVC_COMPILE_FALSE@    -cd $(compdir); mv stdio1.h arith.h funcadd0.$(OBJEXT) ..
-@MSVC_COMPILE_FALSE@    rm -rf $(compdir)
+@MSVC_COMPILE_FALSE@    compile_Unix_ASL
 
 stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)

ThirdParty/ASL/trunk/compile_MS_ASL.in

@@ -31 +31 @@
 sed -e "s/System_details/$clver/" details.c0 > details.c
 
+# Adjust solvers/makefile.vc for the situation at hand. When building with cl
+# under cygwin, we can't execute comptry.bat. The sole purpose of comptry.bat
+# is to retry the compile with -DNO_LONG_LONG in an environment where long long
+# does not exist. Since we've already tested for long long in configure and set
+# ASLMAKEFLAGS accordingly, we can discard comptry.bat without worry.
+
+sed -e 's/comptry\.bat \$(CC)/$(CC)/' makefile.vc > makefile.coin
+
 # Do the build. CFLAGS specified on the command line (as a result of autoconf
-# replacing ASLMAKEFLAGS) will override the specs in makefile.vc, ensuring
-# that ASL is built with the same compiler flags as other code. It turns out
-# that Gnu make always sets MAKEFLAGS to --unix, and nmake tries to process
-# this, resulting in error U1065. Clear MAKEFLAGS to fix the problem.
+# replacing ASLMAKEFLAGS) will override the specs in makefile.vc, ensuring that
+# ASL is built with the same compiler flags as other code. Makefile.vc also
+# forces CC=cl, but since Coin only uses makefile.vc for the cl compiler,
+# there's no need to override it here.
+
+# It turns out that Gnu make always sets MAKEFLAGS to --unix, and nmake tries
+# to process this, resulting in error U1065. Clear MAKEFLAGS to fix the
+# problem.
 
 libampl=@AMPLSOLVER_A@
 MAKEFLAGS=
-nmake -f makefile.vc @ASLMAKEFLAGS@
+nmake -f makefile.coin @ASLMAKEFLAGS@
 mv amplsolv.lib ../$libampl
 mv stdio1.h arith.h funcadd0.obj ..

ThirdParty/ASL/trunk/configure

@@ -473 +473 @@
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 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 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 ASLMAKEFILECMDS 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 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_files=''
 
@@ -1882 +1882 @@
 
 save_cflags="$CFLAGS"
-# For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
-# ToDo: If Studio/Workshop cc is not present, we may find /usr/ucb/cc, which
-# is likely to be a non-functional shell. But many installations will have
-# both cc and gcc, so promoting gcc isn't good either. How to test reliably?
+
+# For *-*-solaris*, promote Studio/Workshop cc compiler to front of list.
+# Depending on the user's PATH, when Studio/Workshop cc is not present we may
+# find /usr/ucb/cc, which is almost certainly not a good choice for the C
+# compiler. In this case, put cc after gcc.
+
 case $build in
   *-cygwin* | *-mingw*)
@@ -1893 +1895 @@
                comps="gcc cl"
              fi ;;
-  sparc-sun-solaris*)
-             comps="cc xlc gcc pgcc icc" ;;
+  *-*-solaris*)
+             # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_sol_cc_compiler+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$sol_cc_compiler"; then
+  ac_cv_prog_sol_cc_compiler="$sol_cc_compiler" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_sol_cc_compiler="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_sol_cc_compiler
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set sol_cc_compiler to just the basename; use the full file name.
+    shift
+    ac_cv_prog_sol_cc_compiler="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+sol_cc_compiler=$ac_cv_prog_sol_cc_compiler
+if test -n "$sol_cc_compiler"; then
+  echo "$as_me:$LINENO: result: $sol_cc_compiler" >&5
+echo "${ECHO_T}$sol_cc_compiler" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+             if test "$sol_cc_compiler" = "cc" ; then
+               comps="cc xlc gcc pgcc icc"
+             else
+               comps="xlc gcc pgcc icc cc"
+             fi
+             ;;
   *-linux-*) comps="xlc gcc cc pgcc icc" ;;
   *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
@@ -2796 +2855 @@
         coin_dbg_cflags="-g"
         ;;
-      *-sun-*)
+      *-*-solaris*)
         coin_opt_cflags="-xO4"
         coin_dbg_cflags="-g"
@@ -4645 +4704 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4647 "configure"' > conftest.$ac_ext
+  echo '#line 4706 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6244 +6303 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6246:" \
+echo "$as_me:6305:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -7311 +7370 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7313: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7372: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7317: \$? = $ac_status" >&5
+   echo "$as_me:7376: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7579 +7638 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7581: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7640: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7585: \$? = $ac_status" >&5
+   echo "$as_me:7644: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7683 +7742 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7685: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7744: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7689: \$? = $ac_status" >&5
+   echo "$as_me:7748: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10028 +10087 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10030 "configure"
+#line 10089 "configure"
 #include "confdefs.h"
 
@@ -10128 +10187 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10130 "configure"
+#line 10189 "configure"
 #include "confdefs.h"
 
@@ -12472 +12531 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12474: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12533: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12478: \$? = $ac_status" >&5
+   echo "$as_me:12537: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12576 +12635 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12578: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12637: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12582: \$? = $ac_status" >&5
+   echo "$as_me:12641: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14146 +14205 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14148: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14207: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14152: \$? = $ac_status" >&5
+   echo "$as_me:14211: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14250 +14309 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14252: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14311: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14256: \$? = $ac_status" >&5
+   echo "$as_me:14315: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -16457 +16516 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16459: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16518: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16463: \$? = $ac_status" >&5
+   echo "$as_me:16522: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16725 +16784 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16786: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16731: \$? = $ac_status" >&5
+   echo "$as_me:16790: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -16829 +16888 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16831: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16890: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16835: \$? = $ac_status" >&5
+   echo "$as_me:16894: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -19515 +19574 @@
 
 
-# Fix bugs in libtool script for Windows native compilation:
-# - cygpath is not correctly quoted in fix_srcfile_path
-# - paths generated for .lib files is not run through cygpath -w
-
-
-# - lib includes subdirectory information; we want to replace
-#
-# old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
-#
-# by
-#
-# old_archive_cmds="echo \$oldlib | grep .libs >/dev/null; if test \$? = 0; then cd .libs; lib /OUT:\`echo \$oldlib\$oldobjs\$old_deplibs | sed -e s@\.libs/@@g\`; cd .. ; else lib /OUT:\$oldlib\$oldobjs\$old_deplibs ; fi"
-#
-#          -e 's%old_archive_cmds="lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs"%old_archive_cmds="echo \\\$oldlib \| grep .libs >/dev/null; if test \\\$? = 0; then cd .libs; lib /OUT:\\\`echo \\\$oldlib\\\$oldobjs\\\$old_deplibs \| sed -e s@\\.libs/@@g\\\`; cd .. ; else lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs; fi"%' \
-
-# The following was a hack for chaniing @BACKSLASH to \
-#          -e 'sYcompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"'`Ycompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"' | \$Xsed -e '"'"'s%@BACKSLASH@%\\\\\\\\\\\\\\\\%g'"'"'`Y' \
-
-  # Correct cygpath for minGW (ToDo!)
   { echo "$as_me:$LINENO: Build is \"$build\"." >&5
 echo "$as_me: Build is \"$build\"." >&6;}
@@ -19545 +19585 @@
 
   case $build in
+    # Here we need to check if -m32 is specified.  If so, we need to correct
+    # sys_lib_search_path_spec
     *x86_64-*)
-# Here we need to check if -m32 is specified.  If so, we need to correct sys_lib_search_path_spec
       if test "$GCC" = yes && (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm32' >& /dev/null); then
         { echo "$as_me:$LINENO: Applying patches to libtool for 32bit compilation" >&5
@@ -19555 +19596 @@
       fi
       ;;
+    # The opposite problem: if we want to do a 64-bit build, the system search
+    # libraries need to point to the sparcv9 subdirectories. If they do not
+    # already do that, fix them.
+    sparc-sun-solaris*)
+      if test "$GCC" = yes && \
+         (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm64' >/dev/null 2>&1) ; then
+        fixlibtmp=`$CC -print-search-dirs | $EGREP '^libraries:'`
+        if `echo "$fixlibtmp" | $EGREP -v sparcv9  >/dev/null 2>&1` ; then
+          { echo "$as_me:$LINENO: Applying patches to libtool for 64-bit compilation" >&5
+echo "$as_me: Applying patches to libtool for 64-bit compilation" >&6;}
+          fixlibtmp=`echo $fixlibtmp | sed -e 's/libraries: =//' -e 's/:/ /g'`
+          v9syslibpath=
+          for lib in $fixlibtmp ; do
+            if test -d "${lib}sparcv9" ; then
+              v9syslibpath="$v9syslibpath ${lib}sparcv9/"
+            fi
+          done
+          sed -e 's|sys_lib_search_path_spec=".*"|sys_lib_search_path_spec="'"$v9syslibpath"'"|' libtool > conftest.bla
+          mv conftest.bla libtool
+          chmod 755 libtool
+        fi
+      fi
+      ;;
+    # Cygwin. Ah, cygwin. Too big and ugly to inline; see the macro.
     *-cygwin* | *-mingw*)
-    case "$CXX" in
-      cl* | */cl* | CL* | */CL*)
-        { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
+       case "$CXX" in
+    cl* | */cl* | CL* | */CL*)
+      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
 echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
-        sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
-            -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
-            -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
-            -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
-            -e 's%lib /OUT:%lib -OUT:%' \
-            -e "s%cygpath -w%$CYGPATH_W%" \
-            -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
-            -e 's/$AR t/lib -nologo -list/' \
-            -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
-            -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
-            -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
-        libtool > conftest.bla
-
-        mv conftest.bla libtool
-        chmod 755 libtool
-        ;;
-      *)
-        { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
+      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
+          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
+          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
+          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
+          -e 's%lib /OUT:%lib -OUT:%' \
+          -e "s%cygpath -w%$CYGPATH_W%" \
+          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
+          -e 's/$AR t/lib -nologo -list/' \
+          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
+          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
+          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
+      libtool > conftest.bla
+
+      mv conftest.bla libtool
+      chmod 755 libtool
+      ;;
+    *)
+      { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
 echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
-        sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
-            -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
-            -e 's|libext="lib"|libext="a"|' \
-        libtool > conftest.bla
-
-        mv conftest.bla libtool
-        chmod 755 libtool
-        ;;
-    esac
-    ;;
+      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
+          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
+          -e 's|libext="lib"|libext="a"|' \
+      libtool > conftest.bla
+
+      mv conftest.bla libtool
+      chmod 755 libtool
+      ;;
+  esac
+      ;;
     *-darwin*)
       { echo "$as_me:$LINENO: Applying patches to libtool for Darwin" >&5
@@ -19630 +19695 @@
     *-mingw32)
         RPATH_FLAGS=nothing ;;
-    *-sun-*)
+    *-*-solaris*)
         RPATH_FLAGS=
         for dir in $abs_lib_dir; do
@@ -19937 +20002 @@
 # NON_STDIO no longer appears in any source file; removed all mention.
 # No_Control87 seems to be specific to DEC Alpha. Try leaving it undefined.
-# -- lh, 070915 --
 
   if test -z "$ASLMAKEFLAGS" ; then
@@ -19950 +20014 @@
     esac
 
-# The critical function for NO_RUSAGE is getrusage(). Use a standard test.
-# -- lh, 070915 --
-
-    echo "$as_me:$LINENO: checking for getrusage" >&5
-echo $ECHO_N "checking for getrusage... $ECHO_C" >&6
+# Various feature checks. Force the language to be C while we do this to avoid
+# issues with C++ (re)declarations.
+
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -19961 +20023 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+# The critical function for NO_RUSAGE is getrusage(). Use a standard test.
+
+    echo "$as_me:$LINENO: checking for getrusage" >&5
+echo $ECHO_N "checking for getrusage... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20010 +20077 @@
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
+
+# Check for long long; we need to define NO_LONG_LONG if it's not present.  ASL
+# makefile.u and makefile.vc both deal with this, in their own way.
+# Unfortunately, when trying to build with cl under cygwin, the makefile.vc
+# solution, comptry.bat, fails. To safely discard comptry.bat, we need to do
+# this check. It's hardly likely that long long is missing on any modern
+# system, but it's easy to check.
+
+    echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6
+if test "${ac_cv_type_long_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((long long *) 0)
+  return 0;
+if (sizeof (long long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 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_objext'
+  { (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_type_long_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6
+if test $ac_cv_type_long_long = yes; then
+  :
+else
+  asladdcflags="$asladdcflags -DNO_LONG_LONG"
+fi
+
+
+# Back to whatever language we were in.
+
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -20065 +20205 @@
   fi
 
-# End if-then to construct ASLMAKEFLAGS
+# End if-then to construct ASLMAKEFLAGS. Announce the result.
 
   { echo "$as_me:$LINENO: Command line flags for (n)make \"$ASLMAKEFLAGS\"." >&5
 echo "$as_me: Command line flags for (n)make \"$ASLMAKEFLAGS\"." >&6;}
 
-# Now create appropriate makefile commands. This applies only to non-msvc
-# builds. Perhaps convert to a script, following pattern of compile_MS_ASL?
-
-  if test x"$AR" = x; then
-    AR=ar
-  fi
-
-  ASLMAKEFILECMDS="sed -e 's%ar \$\$(ARFLAGS)%$AR \$\$(ARFLAGS)%' makefile.u | sed -e 's%ar ruv%$AR ruv%' "
-  if test "$EXEEXT" = ".exe"; then
-    ASLMAKEFILECMDS="$ASLMAKEFILECMDS | sed 's/a.out/a.exe/'"
-  fi
-  case $build in
-    *-cygwin*)
-      ASLMAKEFILECMDS="$ASLMAKEFILECMDS | sed 's%s/System_details/\`uname -sr\`/%s|System_details|\`uname -sr\`|%'" ;;
-  esac
-  ASLMAKEFILECMDS="$ASLMAKEFILECMDS > makefile"
-
-
-
-
-fi
+
+fi
+
+# Set automake conditional and generate the output files.
 
 
@@ -20103 +20226 @@
 
 
-                    ac_config_files="$ac_config_files Makefile compile_MS_ASL"
+                              ac_config_files="$ac_config_files Makefile compile_MS_ASL compile_Unix_ASL"
 
 
@@ -20789 +20912 @@
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;;
+  "compile_Unix_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_Unix_ASL" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -20888 +21012 @@
 s,@DBG_CFLAGS@,$DBG_CFLAGS,;t t
 s,@OPT_CFLAGS@,$OPT_CFLAGS,;t t
+s,@sol_cc_compiler@,$sol_cc_compiler,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -20976 +21101 @@
 s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
 s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t
-s,@ASLMAKEFILECMDS@,$ASLMAKEFILECMDS,;t t
 s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
 s,@MSVC_COMPILE_FALSE@,$MSVC_COMPILE_FALSE,;t t
@@ -21522 +21646 @@
 
 
-# Finally, we need to make sure that compile_MS_ASL is executable
-chmod a+x compile_MS_ASL
+# Finally, we need to make sure that the build scripts are executable
+
+chmod a+x compile_MS_ASL compile_Unix_ASL

ThirdParty/ASL/trunk/configure.ac

@@ -98 +98 @@
 # NON_STDIO no longer appears in any source file; removed all mention.
 # No_Control87 seems to be specific to DEC Alpha. Try leaving it undefined.
-# -- lh, 070915 --
 
   if test -z "$ASLMAKEFLAGS" ; then
@@ -111 +110 @@
     esac
 
+# Various feature checks. Force the language to be C while we do this to avoid
+# issues with C++ (re)declarations.
+
+    AC_LANG_PUSH(C)
+
 # The critical function for NO_RUSAGE is getrusage(). Use a standard test.
-# -- lh, 070915 --
 
     AC_MSG_CHECKING([for getrusage])
-    AC_LANG_PUSH(C)
     AC_LINK_IFELSE(
       [AC_LANG_PROGRAM([[]],[[getrusage()]])],
@@ -121 +123 @@
       [asladdcflags="$asladdcflags -DNO_RUSAGE"
        AC_MSG_RESULT([no])])
+
+# Check for long long; we need to define NO_LONG_LONG if it's not present.  ASL
+# makefile.u and makefile.vc both deal with this, in their own way.
+# Unfortunately, when trying to build with cl under cygwin, the makefile.vc
+# solution, comptry.bat, fails. To safely discard comptry.bat, we need to do
+# this check. It's hardly likely that long long is missing on any modern
+# system, but it's easy to check.
+
+    AC_CHECK_TYPE([long long],[],
+      [asladdcflags="$asladdcflags -DNO_LONG_LONG"],[])
+
+# Back to whatever language we were in.
+
     AC_LANG_POP(C)
 
@@ -171 +186 @@
   fi
 
-# End if-then to construct ASLMAKEFLAGS
+# End if-then to construct ASLMAKEFLAGS. Announce the result.
 
   AC_MSG_NOTICE([Command line flags for (n)make \"$ASLMAKEFLAGS\".])
-
-# Now create appropriate makefile commands. This applies only to non-msvc
-# builds. Perhaps convert to a script, following pattern of compile_MS_ASL?
-
-  if test x"$AR" = x; then
-    AR=ar
-  fi
-
-  ASLMAKEFILECMDS="sed -e 's%ar \$\$(ARFLAGS)%$AR \$\$(ARFLAGS)%' makefile.u | sed -e 's%ar ruv%$AR ruv%' "
-  if test "$EXEEXT" = ".exe"; then
-    ASLMAKEFILECMDS="$ASLMAKEFILECMDS | sed 's/a.out/a.exe/'"
-  fi
-  case $build in
-    *-cygwin*)
-      ASLMAKEFILECMDS="$ASLMAKEFILECMDS | sed 's%s/System_details/\`uname -sr\`/%s|System_details|\`uname -sr\`|%'" ;;
-  esac
-  ASLMAKEFILECMDS="$ASLMAKEFILECMDS > makefile"
-
-  AC_ARG_VAR(ASLMAKEFLAGS,[Compilation flags necessary for compiling the AMPL solver library])
-  AC_SUBST(ASLMAKEFILECMDS)
+  AC_ARG_VAR(ASLMAKEFLAGS,
+        [Compilation flags necessary for compiling the AMPL solver library])
 
 fi
 
+# Set automake conditional and generate the output files.
+
 AM_CONDITIONAL(MSVC_COMPILE, test x$msvc_compile = xyes)
 
-AC_CONFIG_FILES([Makefile compile_MS_ASL])
+AC_CONFIG_FILES([Makefile compile_MS_ASL compile_Unix_ASL])
 
 AC_COIN_FINALIZE
 
-# Finally, we need to make sure that compile_MS_ASL is executable
-chmod a+x compile_MS_ASL
+# Finally, we need to make sure that the build scripts are executable
+
+chmod a+x compile_MS_ASL compile_Unix_ASL