Changeset 2578 for branches/autotools-update/coin.m4

Timestamp:

Jul 3, 2012 3:22:43 PM (9 years ago)

Author:

stefan

Message:

revert r2553

File:

• branches/autotools-update/coin.m4 (modified) (23 diffs)

branches/autotools-update/coin.m4

@@ -206 +206 @@
 
 ###########################################################################
+#                          COIN_MINGW_LD_FIX                              #
+###########################################################################
+
+# This macro is included by any PROG_compiler macro, to set the LD
+# environment variable on MinGW to the correct value (link). But note that
+# if we're building in cygwin with -mno-cygwin, we still want ld! If we're
+# building from cygwin with MSVC tools (cl/link), then we do want link and
+# you'd better have your PATH variable straight, else you'll be doing file
+# links instead of code links! Arguably, LDFLAGS should include -mno-cygwin
+# but in practice all linking seems to be handled through the compilers, so
+# CFLAGS and CXXFLAGS suffice.
+
+AC_DEFUN([AC_COIN_MINGW_LD_FIX],
+[case $build in
+  *-mingw*)
+    if test "${LD+set}" = set; then :; else
+      LD=link
+    fi
+    ;;
+ esac
+ case $enable_doscompile in
+   msvc)
+     if test "x${LD+set}" = xset; then :; else
+       LD=link
+     fi
+     ;;
+ esac
+])
+
+###########################################################################
+#                        COIN_ENABLE_DOSCOMPILE                           #
+###########################################################################
+
+# This macro is invoked by any PROG_compiler macro to establish the
+# --enable-doscompile option, used when one wants to compile an executable
+# under Cygwin which also runs directly under DOS (without requiring
+# Cygwin1.dll). The job of this macro is to make sure the option is correct and
+# to set enable_doscompile. Legal values are mingw, msvc, and no (disabled).
+# mingw: Fake mingw under cygwin, using GCC tools and -mno-cygwin. The most
+#        important thing here is that preprocess, compile, and link steps
+#        *all* see -mno-cygwin.
+# msvc:  Assume the presence of cl/link. It's the user's responsibility to
+#        make sure their PATH is correct. In particular, that MSVC link is
+#        found and not cygwin link (we want to do code linking, not file
+#        linking).
+# It's the responsibility of individual PROG_compiler macros to ensure that
+# they correctly set the compiler search list and preprocess, compile, and
+# link flags. This is tied to compiler setup because in practice invocations
+# of the preprocessor and linker are made through the compiler.
+
+AC_DEFUN([AC_COIN_ENABLE_DOSCOMPILE],
+[AC_REQUIRE([AC_CANONICAL_BUILD])
+ AC_ARG_ENABLE([doscompile],
+  [AC_HELP_STRING([--enable-doscompile],
+                  [Under Cygwin, compile so that executables run under DOS.
+                   Set to mingw to use gcc/g++/ld with -mno-cygwin.
+                   Set to msvc to use cl/link (or icl/link).
+                   Default when mentioned: mingw.
+                   Default when not mentioned: disabled.])],
+  [if test "$enable_doscompile" != no; then
+     case $build in
+       *-cygwin* | *-mingw*) ;;
+       *) AC_MSG_ERROR([--enable-doscompile option makes sense only under Cygwin or MinGW]) ;;
+     esac
+   fi],
+  [enable_doscompile=no])
+ case "$enable_doscompile" in
+   mingw)
+     case $build in
+       *-mingw*) enable_doscompile=no ;;
+     esac
+     ;;
+   msvc|no) ;;
+   yes) enable_doscompile=mingw ;;
+   *) AC_MSG_ERROR([Invalid value $enable_doscompile for --enable-doscompile.
+                    Try configure --help=recursive.])
+      ;;
+  esac
+  if test "$enable_doscompile" != no ; then
+    AC_MSG_NOTICE([DOS compile style is: $enable_doscompile])
+  fi
+])
+
+###########################################################################
 #                             COIN_PROG_CXX                               #
 ###########################################################################
 
+# Find the compile command by running AC_PROG_CXX (with compiler names for
+# different operating systems) and put it into CXX (unless it was given by the
+# user). Then find an appropriate value for CXXFLAGS. If either of CXXFLAGS or
+# PRJCT_CXXFLAGS is defined, that value is used (replace PRJCT with the upper
+# case name of this project).  It is possible to provide additional -D flags
+# in the variable CXXDEFS, and additional compilation flags with ADD_CXXFLAGS.
+
 AC_DEFUN([AC_COIN_PROG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-
-# add automake conditional so we can recognize cl compiler in makefile
+[AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
+AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_LANG_PUSH(C++)
+
+AC_ARG_VAR(CXXDEFS,[Additional -D flags to be used when compiling C++ code.])
+AC_ARG_VAR(ADD_CXXFLAGS,[Additional C++ compiler options])
+AC_ARG_VAR(DBG_CXXFLAGS,[Debug C++ compiler options])
+AC_ARG_VAR(OPT_CXXFLAGS,[Optimize C++ compiler options])
+
+coin_has_cxx=yes
+
+save_cxxflags="$CXXFLAGS"
+# For *-*-solaris*, promote Studio/Workshop compiler to front of list.
+case $build in
+  *-cygwin* | *-mingw*)
+             if test "$enable_doscompile" = msvc ; then
+               comps="icl cl"
+             else
+               comps="g++ cl"
+             fi ;;
+  *-*-solaris*)
+             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
+  *-darwin*) comps="g++ c++ CC" ;;
+  *-linux-gnu*)
+             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
+          *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
+esac
+
+# We delete the cached value, since the test might not have been
+# performed with our choice of compilers earlier
+$as_unset ac_cv_prog_CXX || test "${ac_cv_prog_CXX+set}" != set || { ac_cv_prog_CXX=; export ac_cv_prog_CXX; }
+# AC_MSG_NOTICE([C++ compiler candidates: $comps])
+AC_PROG_CXX([$comps])
+
+#AC_PROG_CXX sets CXX to g++ if it cannot find a working C++ compiler
+#thus, we test here whether $CXX is actually working 
+AC_LANG_PUSH(C++)
+AC_MSG_CHECKING([whether C++ compiler $CXX works]);
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(, [int i=0;])],
+  [AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)
+   AC_MSG_ERROR(failed to find a C++ compiler or C++ compiler $CXX does not work)]
+)
+AC_LANG_POP(C++)
+
 coin_cxx_is_cl=false
+# It seems that we need to cleanup something here for the Windows
 case "$CXX" in
   clang* ) ;;
   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
+    mv confdefs.hh confdefs.h
     coin_cxx_is_cl=true
     ;;
 esac
+
+# add automake conditional so we can recognize cl compiler in makefile
 AM_CONDITIONAL(COIN_CXX_IS_CL, [test $coin_cxx_is_cl = true])
+
+# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
+case "$CXX" in
+  clang* ) ;;
+  cl* | */cl* | CL* | */CL* )
+    if test "$ac_cv_prog_cxx_g" = yes ; then
+      ac_cv_prog_cxx_g=no
+      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
+    fi ;;
+esac
+CXXFLAGS="$save_cxxflags"
+
+# Check if a project specific CXXFLAGS variable has been set
+if test x$COIN_PRJCT != x; then
+  eval coin_tmp=\${${COIN_PRJCT}_CXXFLAGS+set}
+  if test x$coin_tmp = xset; then
+    eval CXXFLAGS=\${${COIN_PRJCT}_CXXFLAGS}
+  fi
+fi
+
+if test x"$CXXFLAGS" = x; then
+
+# ToDo decide whether we want -DNDEBUG for optimization
+  coin_add_cxxflags=
+  coin_opt_cxxflags=
+  coin_dbg_cxxflags=
+  coin_warn_cxxflags=
+
+  if test "$GXX" = "yes"; then
+    case "$CXX" in
+      icpc* | */icpc*)
+        ;;
+      *)
+# ToDo decide about unroll-loops
+        coin_opt_cxxflags="-O3"
+        coin_add_cxxflags="-pipe"
+        coin_dbg_cxxflags="-g -O0"
+        coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
+        case $build in
+          *-darwin*)
+            ;;
+          *)
+            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+            ;;
+        esac
+
+        case $enable_doscompile in
+          mingw)
+            CXXFLAGS="-mno-cygwin"
+            AC_TRY_LINK(,[int i=0; i++;],[coin_add_cxxflags="-mno-cygwin $coin_add_cxxflags"])
+            CXXFLAGS=
+          ;;
+        esac
+    esac
+  fi
+
+# Note that we do not need to cover GCC in the following tests.
+
+  if test -z "$coin_opt_cxxflags"; then
+    case $build in
+      *-cygwin* | *-mingw*)
+        case "$CXX" in
+          clang* ) ;;
+          cl* | */cl* | CL* | */CL*)
+            # The MT and MTd options are mutually exclusive
+            coin_opt_cxxflags='-MT -O2'
+            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
+            coin_dbg_cxxflags='-MTd'
+            ;;
+          icl* | */icl* | ICL* | */ICL*)
+            # The MT and MTd options are mutually exclusive
+            coin_opt_cxxflags='-MT -Ox'
+            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
+            coin_dbg_cxxflags='-MTd -debug'
+            ;;
+        esac
+        ;;
+      *-linux-*)
+        case "$CXX" in
+          icpc* | */icpc*)
+            coin_opt_cxxflags="-O3 -ip -mp1"
+            coin_add_cxxflags=""
+            coin_dbg_cxxflags="-g"
+            # Check if -i_dynamic is necessary (for new glibc library)
+            CXXFLAGS=
+            AC_TRY_LINK(,[int i=0; i++;],[],
+                        [coin_add_cxxflags="-i_dynamic $coin_add_cxxflags"])
+            ;;
+          pgCC* | */pgCC*)
+            coin_opt_cxxflags="-fast"
+            coin_add_cxxflags="-Kieee -pc 64"
+            coin_dbg_cxxflags="-g"
+            ;;
+        esac
+        ;;
+      *-ibm-*)
+        case "$CXX" in
+          xlC* | */xlC* | mpxlC* | */mpxlC*)
+            coin_opt_cxxflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
+            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 -qsourcetype=c++"
+            coin_dbg_cxxflags="-g"
+            ;;
+        esac
+        ;;
+      *-hp-*)
+        case "$CXX" in
+          aCC* | */aCC* )
+            coin_opt_cxxflags="-O"
+            coin_add_cxxflags="-AA"
+            coin_dbg_cxxflags="-g"
+            ;;
+        esac
+        ;;
+      *-*-solaris*)
+          coin_opt_cxxflags="-O4"
+          coin_dbg_cxxflags="-g"
+        ;;
+    esac
+  fi
+
+# Generic flag settings. If these don't work, add a case above.
+
+  if test "$ac_cv_prog_cxx_g" = yes && test -z "$coin_dbg_cxxflags" ; then
+    coin_dbg_cxxflags="-g"
+  fi
+
+  if test -z "$coin_opt_cxxflags"; then
+    # Try if -O option works if nothing else is set
+    CXXFLAGS=-O
+    AC_TRY_LINK([],[int i=0; i++;],[coin_opt_cxxflags="-O"])
+  fi
+
+  # if PM doesn't want the warning messages, take them out
+  if test x"$coin_skip_warn_cxxflags" = xyes; then
+    coin_warn_cxxflags=
+  fi
+
+# Do final setup of flags based on values determined above.
+
+  if test x${DBG_CXXFLAGS+set} != xset; then
+    DBG_CXXFLAGS="$coin_dbg_cxxflags $coin_add_cxxflags $coin_warn_cxxflags"
+  fi
+  if test x${OPT_CXXFLAGS+set} != xset; then
+    OPT_CXXFLAGS="$coin_opt_cxxflags $coin_add_cxxflags -DNDEBUG $coin_warn_cxxflags"
+  fi
+
+  DBG_CXXFLAGS="$DBG_CXXFLAGS $ADD_CXXFLAGS $CXXDEFS"
+  OPT_CXXFLAGS="$OPT_CXXFLAGS $ADD_CXXFLAGS $CXXDEFS"
+
+  if test "$coin_debug_compile" = "true"; then
+    CXXFLAGS="$DBG_CXXFLAGS"
+  else
+    CXXFLAGS="$OPT_CXXFLAGS"
+  fi
+
+# Handle the case where CXXFLAGS was set externally.
+else
+  CXXFLAGS="$CXXFLAGS $ADD_CXXFLAGS $CXXDEFS"
+  if test x${DBG_CXXFLAGS+set} != xset; then
+    DBG_CXXFLAGS="$CXXFLAGS"
+  fi
+  if test x${OPT_CXXFLAGS+set} != xset; then
+    OPT_CXXFLAGS="$CXXFLAGS"
+  fi
+fi
+
+# If CXXFLAGS contains -mno-cygwin, CPPFLAGS must also have it.
+
+case "$CXXFLAGS" in
+  *-mno-cygwin*)
+    if test x${CPPFLAGS+set} != xset ; then
+      CPPFLAGS="-mno-cygwin"
+    else
+      case "$CPPFLAGS" in
+        *-mno-cygwin*)
+          ;;
+        *)
+          CPPFLAGS="$CPPFLAGS -mno-cygwin"
+          ;;
+      esac
+    fi ;;
+esac
 
 # add -DPROJECT_BUILD to signal compiler preprocessor which config header file to include
@@ -227 +548 @@
 fi
 
+# Try if CXXFLAGS works
+save_CXXFLAGS="$CXXFLAGS"
+AC_TRY_LINK([],[int i=0; i++;],[],[CXXFLAGS=])
+if test -z "$CXXFLAGS"; then
+  AC_MSG_WARN([The flags CXXFLAGS="$save_CXXFLAGS" do not work.  I will now just try '-O', but you might want to set CXXFLAGS manually.])
+  CXXFLAGS='-O'
+  AC_TRY_LINK([],[int i=0; i++;],[],[CXXFLAGS=])
+  if test -z "$CXXFLAGS"; then
+    AC_MSG_WARN([This value for CXXFLAGS does not work.  I will continue with empty CXXFLAGS, but you might want to set CXXFLAGS manually.])
+  fi
+fi
+
 AC_MSG_NOTICE([C++ compiler options are: $CXXFLAGS])
 
+AC_ARG_VAR(MPICXX,[C++ MPI Compiler])
+if test x"$MPICXX" = x; then :; else
+  AC_MSG_NOTICE([Will use MPI C++ compiler $MPICXX])
+  CXX="$MPICXX"
+fi
+
+# correct the LD variable in a mingw build with MS or intel compiler
+case "$CXX" in
+  clang* ) ;;
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    AC_COIN_MINGW_LD_FIX
+    ;;
+esac
+
+AC_LANG_POP(C++)
 ]) # AC_COIN_PROG_CXX
 
 
 ###########################################################################
+#                             COIN_CXXLIBS                                #
+###########################################################################
+
+# Determine the C++ runtime libraries required for linking a C++ library
+# with a Fortran or C compiler.  The result is available in CXXLIBS.
+
+AC_DEFUN([AC_COIN_CXXLIBS],
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_LANG_PUSH(C++)
+AC_ARG_VAR(CXXLIBS,[Libraries necessary for linking C++ code with Fortran compiler])
+if test -z "$CXXLIBS"; then
+  if test "$GXX" = "yes"; then
+    case "$CXX" in
+      icpc* | */icpc*)
+        CXXLIBS="-lstdc++"
+        ;;
+      *)
+        CXXLIBS="-lstdc++ -lm" # -lgcc"
+        ;;
+    esac
+  else
+    case $build in
+     *-mingw32 | *-cygwin* )
+      case "$CXX" in
+      clang* ) ;;
+      cl* | */cl* | CL* | */CL*)
+        CXXLIBS=nothing;;
+      esac;;
+     *-linux-*)
+      case "$CXX" in
+      icpc* | */icpc*)
+        CXXLIBS="-lstdc++"
+             ;;
+      pgCC* | */pgCC*)
+        CXXLIBS="-lstd -lC -lc"
+             ;;
+      esac;;
+    *-ibm-*)
+      CXXLIBS="-lC -lc"
+      ;;
+    *-hp-*)
+      CXXLIBS="-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc"
+      ;;
+    *-*-solaris*)
+      CXXLIBS="-lCstd -lCrun"
+    esac
+  fi
+fi
+if test -z "$CXXLIBS"; then
+  AC_MSG_WARN([Could not automatically determine CXXLIBS (C++ link libraries; necessary if main program is in Fortran or C).])
+else
+  AC_MSG_NOTICE([Assuming that CXXLIBS is \"$CXXLIBS\".])
+fi
+if test x"$CXXLIBS" = xnothing; then
+  CXXLIBS=
+fi
+AC_LANG_POP(C++)
+]) # AC_COIN_CXXLIBS
+
+###########################################################################
 #                           COIN_CHECK_HEADER                             #
 ###########################################################################
 
-AC_DEFUN([AC_COIN_CHECK_HEADER],[AC_CHECK_HEADERS([$1],[$2],[$3],[$4])])
-
-###########################################################################
-#                       COIN_CHECK_CXX_CHEADER                            #
-###########################################################################
-
-# This macro checks for C header files that are used from C++.  For a given
+# This macro checks for a header file, but it does so without the
+# standard header.  This avoids warning messages like:
+#
+# configure: WARNING: dlfcn.h: present but cannot be compiled
+# configure: WARNING: dlfcn.h:     check for missing prerequisite headers?
+# configure: WARNING: dlfcn.h: see the Autoconf documentation
+# configure: WARNING: dlfcn.h:     section "Present But Cannot Be Compiled"
+# configure: WARNING: dlfcn.h: proceeding with the preprocessor's result
+# configure: WARNING: dlfcn.h: in the future, the compiler will take precedence
+
+# My guess that the problem lay with CPPFLAGS seems to be correct. With this
+# macro reduced to a direct call to AC_CHECK_HEADERS, there are no warnings
+# now that CPPFLAGS contains -mno-cygwin when it needs it. -- lh, 061214 --
+
+# AW 070609: I restored the previous version, since otherwise the warnings
+# still pop up for the cl compiler
+
+AC_DEFUN([AC_COIN_CHECK_HEADER],
+[#if test x"$4" = x; then
+#  hdr="#include <$1>"
+#else
+#  hdr="$4"
+#fi
+#AC_CHECK_HEADERS([$1],[$2],[$3],[$hdr])
+AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
+]) # AC_COIN_CHECK_HEADER
+
+###########################################################################
+#                       COIN_CHECK_CXX_CHEADER                             #
+###########################################################################
+
+# This macro checks for C header files that are used from C++.  For a give
 # stub (e.g., math), it first checks if the C++ library (cmath) is available.
 # If it is, it defines HAVE_CMATH (or whatever the stub is).  If it is not
@@ -261 +694 @@
 ###########################################################################
 
+# Find the compile command by running AC_PROG_CC (with compiler names
+# for different operating systems) and put it into CC (unless it was
+# given my the user), and find an appropriate value for CFLAGS.  It is
+# possible to provide additional -D flags in the variable CDEFS.
+
 AC_DEFUN([AC_COIN_PROG_CC],
-[AC_REQUIRE([AC_PROG_CC])
+[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
+AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_LANG_PUSH(C)
+
+# For consistency, we set the C compiler to the same value of the C++
+# compiler, if the C++ is set, but the C compiler isn't (only for CXX=cl)
+if test x"$CXX" != x; then
+  case "$CXX" in
+    clang* ) ;;
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+      if test x"$CC" = x; then
+        CC="$CXX"
+        AC_MSG_WARN([C++ compiler name provided as $CXX, but CC is unset. Setting CC to $CXX])
+      fi
+      ;;
+  esac
+fi
+
+AC_ARG_VAR(CDEFS,[Additional -D flags to be used when compiling C code.])
+AC_ARG_VAR(ADD_CFLAGS,[Additional C compiler options])
+AC_ARG_VAR(DBG_CFLAGS,[Debug C compiler options])
+AC_ARG_VAR(OPT_CFLAGS,[Optimize C compiler options])
+
+coin_has_cc=yes
+
+save_cflags="$CFLAGS"
+
+# 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*)
+             if test "$enable_doscompile" = msvc ; then
+               comps="icl cl"
+             else
+               comps="gcc cl"
+             fi ;;
+  *-*-solaris*)
+             AC_CHECK_PROG(sol_cc_compiler,cc,cc,[],[],/usr/ucb/cc)
+             if test "$sol_cc_compiler" = "cc" ; then
+               comps="cc xlc gcc pgcc icc"
+             else
+               comps="xlc gcc pgcc icc cc"
+             fi
+             ;;
+  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
+  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
+  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
+esac
+
+# We delete the cached value, since the test might not have been
+# performed with our choice of compilers earlier
+$as_unset ac_cv_prog_CC || test "${ac_cv_prog_CC+set}" != set || { ac_cv_prog_CC=; export ac_cv_prog_CC; }
+# AC_MSG_NOTICE([C compiler candidates: $comps])
+AC_PROG_CC([$comps])
+if test -z "$CC" ; then
+  AC_MSG_ERROR([Failed to find a C compiler!])
+fi
+# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
+case "$CC" in
+  clang* ) ;;
+  cl* | */cl* | CL* | */CL* )
+    if test "$ac_cv_prog_cc_g" = yes ; then
+      ac_cv_prog_cc_g=no
+      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
+    fi ;;
+esac
+CFLAGS="$save_cflags"
 
 # add automake conditional so we can recognize cl compiler in makefile
@@ -274 +781 @@
 AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
 
+# Check if a project specific CFLAGS variable has been set
+if test x$COIN_PRJCT != x; then
+  eval coin_tmp=\${${COIN_PRJCT}_CFLAGS+set}
+  if test x$coin_tmp = xset; then
+    eval CFLAGS=\${${COIN_PRJCT}_CFLAGS}
+  fi
+fi
+
+if test x"$CFLAGS" = x; then
+
+  coin_add_cflags=
+  coin_opt_cflags=
+  coin_dbg_cflags=
+  coin_warn_cflags=
+
+  if test "$GCC" = "yes"; then
+    case "$CC" in
+      icc* | */icc*)
+        ;;
+      *)
+        coin_opt_cflags="-O3"
+        coin_add_cflags="-pipe"
+        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*)
+            ;;
+          *)
+            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+            ;;
+        esac
+        case $enable_doscompile in
+          mingw)
+            CFLAGS="-mno-cygwin"
+            AC_TRY_LINK([],[int i=0; i++;],
+                        [coin_add_cflags="-mno-cygwin $coin_add_cflags"])
+            CFLAGS=
+          ;;
+        esac
+    esac
+  fi
+  if test -z "$coin_opt_cflags"; then
+    case $build in
+      *-cygwin* | *-mingw*)
+        case "$CC" in
+          clang* ) ;;
+          cl* | */cl* | CL* | */CL*)
+            coin_opt_cflags='-MT -O2'
+            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
+            coin_dbg_cflags='-MTd'
+            ;;
+          icl* | */icl* | ICL* | */ICL*)
+            coin_opt_cflags='-MT -Ox'
+            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
+            coin_dbg_cflags='-MTd -debug'
+            ;;
+        esac
+        ;;
+      *-linux-*)
+        case "$CC" in
+          icc* | */icc*)
+            coin_opt_cflags="-O3 -ip -mp1"
+            coin_add_cflags=""
+            coin_dbg_cflags="-g"
+            # Check if -i_dynamic is necessary (for new glibc library)
+            CFLAGS=
+            AC_TRY_LINK([],[int i=0; i++;],[],
+                        [coin_add_cflags="-i_dynamic $coin_add_cflags"])
+            ;;
+          pgcc* | */pgcc*)
+            coin_opt_cflags="-fast"
+            coin_add_cflags="-Kieee -pc 64"
+            coin_dbg_cflags="-g"
+            ;;
+        esac
+        ;;
+      *-ibm-*)
+        case "$CC" in
+          xlc* | */xlc* | mpxlc* | */mpxlc*)
+            coin_opt_cflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
+            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
+            coin_dbg_cflags="-g"
+          ;;
+        esac
+        ;;
+      *-hp-*)
+        coin_opt_cflags="-O"
+        coin_add_cflags="-Ae"
+        coin_dbg_cflags="-g"
+        ;;
+      *-*-solaris*)
+        coin_opt_cflags="-xO4"
+        coin_dbg_cflags="-g"
+        ;;
+      *-sgi-*)
+        coin_opt_cflags="-O -OPT:Olimit=0"
+        coin_dbg_cflags="-g"
+        ;;
+    esac
+  fi
+
+  if test "$ac_cv_prog_cc_g" = yes && test -z "$coin_dbg_cflags" ; then
+    coin_dbg_cflags="-g"
+  fi
+
+  if test -z "$coin_opt_cflags"; then
+    # Try if -O option works if nothing else is set
+    CFLAGS="-O"
+    AC_TRY_LINK([],[int i=0; i++;],[coin_opt_cflags="-O"])
+  fi
+
+  # if PM doesn't want the warning messages, take them out
+  if test x"$coin_skip_warn_cflags" = xyes; then
+    coin_warn_cflags=
+  fi
+
+  if test x${DBG_CFLAGS+set} != xset; then
+    DBG_CFLAGS="$coin_dbg_cflags $coin_add_cflags $coin_warn_cflags"
+  fi
+  if test x${OPT_CFLAGS+set} != xset; then
+    OPT_CFLAGS="$coin_opt_cflags $coin_add_cflags -DNDEBUG $coin_warn_cflags"
+  fi
+
+  DBG_CFLAGS="$DBG_CFLAGS $ADD_CFLAGS $CDEFS"
+  OPT_CFLAGS="$OPT_CFLAGS $ADD_CFLAGS $CDEFS"
+
+  if test "$coin_debug_compile" = "true"; then
+    CFLAGS="$DBG_CFLAGS"
+  else
+    CFLAGS="$OPT_CFLAGS"
+  fi
+else
+  CFLAGS="$CFLAGS $ADD_CFLAGS $CDEFS"
+  if test x${DBG_CFLAGS+set} != xset; then
+    DBG_CFLAGS="$CFLAGS"
+  fi
+  if test x${OPT_CFLAGS+set} != xset; then
+    OPT_CFLAGS="$CFLAGS"
+  fi
+fi
+
+# If CFLAGS contains -mno-cygwin, CPPFLAGS must also have it.
+
+case "$CFLAGS" in
+  *-mno-cygwin*)
+    if test x${CPPFLAGS+set} != xset ; then
+      CPPFLAGS="-mno-cygwin"
+    else
+      case "$CPPFLAGS" in
+        *-mno-cygwin*)
+          ;;
+        *)
+          CPPFLAGS="$CPPFLAGS -mno-cygwin"
+          ;;
+      esac
+    fi ;;
+esac
+
 # add -DPROJECT_BUILD to signal compiler preprocessor which config header file to include
 if test x$COIN_PRJCT != x; then
@@ -279 +944 @@
 fi
 
+# Try if CFLAGS works
+save_CFLAGS="$CFLAGS"
+AC_TRY_LINK([],[int i=0; i++;],[],[CFLAGS=])
+if test -z "$CFLAGS"; then
+  AC_MSG_WARN([The value CFLAGS="$save_CFLAGS" do not work.  I will now just try '-O', but you might want to set CFLAGS manually.])
+  CFLAGS='-O'
+  AC_TRY_LINK([],[int i=0; i++;],[],[CFLAGS=])
+  if test -z "$CFLAGS"; then
+    AC_MSG_WARN([This value for CFLAGS does not work.  I will continue with empty CFLAGS, but you might want to set CFLAGS manually.])
+  fi
+fi
+
 AC_MSG_NOTICE([C compiler options are: $CFLAGS])
 
+AC_ARG_VAR(MPICC,[C MPI Compiler])
+if test x"$MPICC" = x; then :; else
+  AC_MSG_NOTICE([Will use MPI C compiler $MPICC])
+  CC="$MPICC"
+fi
+
+# Correct the LD variable if we are using the MS or Intel-windows compiler
+case "$CC" in
+  clang* ) ;;
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    AC_COIN_MINGW_LD_FIX
+    ;;
+esac
+
+AC_LANG_POP(C)
 ]) # AC_COIN_PROG_CC
 
@@ -287 +979 @@
 ###########################################################################
 
+# Find the compile command by running AC_PROG_F77 (with compiler names
+# for different operating systems) and put it into F77 (unless it was
+# given by the user), and find an appropriate value for FFLAGS
 
 AC_DEFUN([AC_COIN_PROG_F77],
-[AC_REQUIRE([AC_PROG_F77])
+[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
+AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_REQUIRE([AC_COIN_PROG_CC])
+AC_REQUIRE([AC_COIN_F77_COMPS])
+AC_LANG_PUSH([Fortran 77])
+
+AC_ARG_VAR(ADD_FFLAGS,[Additional Fortran compiler options])
+AC_ARG_VAR(DBG_FFLAGS,[Debug Fortran compiler options])
+AC_ARG_VAR(OPT_FFLAGS,[Optimize Fortran compiler options])
+
+coin_has_f77=yes
+
+save_fflags="$FFLAGS"
+
+# We delete the cached value, since the test might not have been
+# performed with our choice of compilers earlier
+$as_unset ac_cv_prog_F77 || test "${ac_cv_prog_F77+set}" != set || { ac_cv_prog_F77=; export ac_cv_prog_F77; }
+
+# This is a real belt-and-suspenders approach. AC_COIN_FIND_F77 will use
+# coin_f77_comps to see if there's a program that matches one of the names.
+# If there's no such program, F77 = unavailable. If we match the name,
+# feed AC_PROG_F77 the same search list, just to be sure it's a functioning
+# compiler.
+# AC_MSG_NOTICE([Fortran compiler candidates: $coin_f77_comps])
+AC_COIN_FIND_F77
+if test "$F77" != "unavailable" ; then
+  AC_PROG_F77($coin_f77_comps)
+else
+  AC_MSG_WARN([Failed to find a Fortran compiler!])
+fi
+
+FFLAGS="$save_fflags"
+
+# Check if a project specific FFLAGS variable has been set
+if test x$COIN_PRJCT != x; then
+  eval coin_tmp=\${${COIN_PRJCT}_FFLAGS+set}
+  if test x$coin_tmp = xset; then
+    eval FFLAGS=\${${COIN_PRJCT}_FFLAGS}
+  fi
+fi
+
+if test "$F77" != "unavailable" && test x"$FFLAGS" = x ; then
+
+  coin_add_fflags=
+  coin_opt_fflags=
+  coin_dbg_fflags=
+  coin_warn_fflags=
+
+  if test "$G77" = "yes"; then
+    coin_opt_fflags="-O3"
+    coin_add_fflags="-pipe"
+    coin_dbg_fflags="-g -O0"
+    case $enable_doscompile in
+      mingw)
+        FFLAGS="-mno-cygwin"
+        AC_TRY_LINK(,[      write(*,*) 'Hello world'],
+                    [coin_add_fflags="-mno-cygwin $coin_add_fflags"])
+        FFLAGS=
+      ;;
+    esac
+  else
+    case $build in
+      *-cygwin* | *-mingw*)
+        case $F77 in
+          ifort* | */ifort* | IFORT* | */IFORT* )
+            coin_opt_fflags='-MT -O3'
+            coin_add_fflags='-fpp -nologo'
+            coin_dbg_fflags='-MTd -debug'
+          ;;
+          compile_f2c*)
+            coin_opt_fflags='-MT -O2'
+            coin_add_fflags='-nologo -wd4996'
+            coin_dbg_fflags='-MTd'
+          ;;
+        esac
+        ;;
+      *-linux-*)
+        case $F77 in
+          ifc* | */ifc* | ifort* | */ifort*)
+            coin_opt_fflags="-O3 -ip"
+            coin_add_fflags="-cm -w90 -w95"
+            coin_dbg_fflags="-g -CA -CB -CS"
+            # Check if -i_dynamic is necessary (for new glibc library)
+            FFLAGS=
+            AC_TRY_LINK(,[      write(*,*) 'Hello world'],[],
+                        [coin_add_fflags="-i_dynamic $coin_add_fflags"])
+            ;;
+          pgf77* | */pgf77* | pgf90* | */pgf90*)
+            coin_opt_fflags="-fast"
+            coin_add_fflags="-Kieee -pc 64"
+            coin_dbg_fflags="-g"
+          ;;
+        esac
+        ;;
+      *-ibm-*)
+        case "$F77" in
+          xlf* | */xlf* | mpxlf* | */mpxlf* )
+            coin_opt_fflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
+            coin_add_fflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
+            coin_dbg_fflags="-g -C"
+            ;;
+        esac
+        ;;
+      *-hp-*)
+        coin_opt_fflags="+O3"
+        coin_add_fflags="+U77"
+        coin_dbg_fflags="-C -g"
+        ;;
+      *-*-solaris*)
+        coin_opt_fflags="-O4"
+        coin_dbg_fflags="-g"
+        ;;
+      *-sgi-*)
+        coin_opt_fflags="-O5 -OPT:Olimit=0"
+        coin_dbg_fflags="-g"
+        ;;
+    esac
+  fi
+
+  if test "$ac_cv_prog_f77_g" = yes && test -z "$coin_dbg_fflags" ; then
+    coin_dbg_fflags="-g"
+  fi
+
+  if test -z "$coin_opt_fflags"; then
+    # Try if -O option works if nothing else is set
+    FFLAGS=-O
+    AC_TRY_LINK(,[      integer i], [coin_opt_fflags="-O"])
+  fi
+
+  # if PM doesn't want the warning messages, take them out
+  if test x"$coin_skip_warn_fflags" = xyes; then
+    coin_warn_fflags=
+  fi
+
+  if test x${DBG_FFLAGS+set} != xset; then
+    DBG_FFLAGS="$coin_dbg_fflags $coin_add_fflags $coin_warn_fflags"
+  fi
+  if test x${OPT_FFLAGS+set} != xset; then
+    OPT_FFLAGS="$coin_opt_fflags $coin_add_fflags $coin_warn_fflags"
+  fi
+
+  DBG_FFLAGS="$DBG_FFLAGS $ADD_FFLAGS"
+  OPT_FFLAGS="$OPT_FFLAGS $ADD_FFLAGS"
+
+  if test "$coin_debug_compile" = "true"; then
+    FFLAGS="$DBG_FFLAGS"
+  else
+    FFLAGS="$OPT_FFLAGS"
+  fi
+else
+  FFLAGS="$FFLAGS $ADD_FFLAGS"
+  if test x${DBG_FFLAGS+set} != xset; then
+    DBG_FFLAGS="$FFLAGS"
+  fi
+  if test x${OPT_FFLAGS+set} != xset; then
+    OPT_FFLAGS="$FFLAGS"
+  fi
+fi
+
+# If FFLAGS contains -mno-cygwin, CPPFLAGS must have it.
+case "$FFLAGS" in
+  *-mno-cygwin*)
+    if test x${CPPFLAGS+set} != xset ; then
+      CPPFLAGS="-mno-cygwin"
+    else
+      case "$CPPFLAGS" in
+        *-mno-cygwin*)
+          ;;
+        *)
+          CPPFLAGS="$CPPFLAGS -mno-cygwin"
+          ;;
+      esac
+    fi ;;
+esac
+
+# Try if FFLAGS works
+if test "$F77" != "unavailable" ; then
+  AC_TRY_LINK(,[      integer i],[],[FFLAGS=])
+  if test -z "$FFLAGS"; then
+    AC_MSG_WARN([The flags FFLAGS="$FFLAGS" do not work.  I will now just try '-O', but you might want to set FFLAGS manually.])
+    FFLAGS='-O'
+    AC_TRY_LINK(,[      integer i],[],[FFLAGS=])
+    if test -z "$FFLAGS"; then
+      AC_MSG_WARN([This value for FFLAGS does not work.  I will continue with empty FFLAGS, but you might want to set FFLAGS manually.])
+    fi
+  fi
+fi
 
 AC_MSG_NOTICE([Fortran compiler options are: $FFLAGS])
 
+AC_ARG_VAR(MPIF77,[Fortran MPI Compiler])
+if test x"$MPIF77" = x; then :; else
+  AC_MSG_NOTICE([Will use MPI Fortran compiler $MPIF77])
+  F77="$MPIF77"
+fi
+
+# correct the LD variable if we use the intel fortran compiler in windows
+case "$F77" in
+  ifort* | */ifort* | IFORT* | */IFORT*)
+    AC_COIN_MINGW_LD_FIX
+    ;;
+esac
+
+AC_LANG_POP([Fortran 77])
 ]) # AC_COIN_PROG_F77
 
@@ -299 +1194 @@
 ###########################################################################
 
-AC_DEFUN([AC_COIN_F77_WRAPPERS],[AC_REQUIRE([AC_F77_WRAPPERS])])
+# Calls autoconfs AC_F77_LIBRARY_LDFLAGS and does additional corrections to FLIBS.
+# Then calls AC_F77_WRAPPERS to get Fortran namemangling scheme.
+#
+# To ensure that the FLIBS are determined and corrected before linking against
+# Fortran compilers is attempted by other macros, we put it into an extra macro
+# and call it via AC_REQUIRE. This way it seems to be called before the macros
+# required by AC_F77_WRAPPERS.
+
+AC_DEFUN([_AC_COIN_F77_LIBRARY_LDFLAGS],
+[AC_BEFORE([AC_PROG_F77],[$0])dnl
+
+# get FLIBS
+AC_F77_LIBRARY_LDFLAGS
+orig_FLIBS="$FLIBS"
+
+# If FLIBS has been set by the user, we just restore its value here
+if test x"$save_FLIBS" != x; then
+  FLIBS="$save_FLIBS"
+else
+  # This is to correct a missing exclusion in autoconf 2.59
+  if test x"$FLIBS" != x; then
+    my_flibs=
+    for flag in $FLIBS; do
+      case $flag in
+        -lcrt*.o) ;;
+        -lcygwin) ;;
+               *) my_flibs="$my_flibs $flag" ;;
+      esac
+    done
+    FLIBS="$my_flibs"
+  fi
+
+  case $build in
+  # The following is a fix to define FLIBS for ifort on Windows
+  # In its original version, it linked in libifcorert.lib or libifcorertd.lib on Windows/ifort explicitly.
+  # However, this seem to create a dependency on libifcorert.dll (or libifcorertd.dll) in the executables.
+  # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line.
+  # Further, excluding libc.lib from the default libs seemed to be necessary only for VS < 8.
+  # Since the corresponding flag seems to make more trouble than it avoids, it has been removed now.
+     *-cygwin* | *-mingw*)
+       case "$F77" in
+#         ifort* | */ifort* | IFORT* | */IFORT*)
+#           FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib"
+#           if "$coin_debug_compile" = true ; then
+#             FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib"
+#           else
+#             FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmtd.lib"
+#           fi
+#           ;;
+         compile_f2c*)
+           FLIBS=`$F77 -FLIBS` ;;
+       esac;;
+     *-hp-*)
+         FLIBS="$FLIBS -lm";;
+     *-ibm-*)
+         FLIBS=`echo $FLIBS | sed 's/-lc)/-lc/g'` ;;
+     *-linux-*)
+       case "$F77" in
+         pgf77* | */pgf77* | pgf90* | */pgf90*)
+# ask linker to go through the archives multiple times
+# (the Fortran compiler seems to do that automatically...)
+           FLIBS="-Wl,--start-group $FLIBS -Wl,--end-group" ;;
+       esac
+  esac
+  ac_cv_f77_libs="$FLIBS"
+fi
+
+if test "x$orig_FLIBS" != "x$FLIBS" ; then
+  AC_MSG_NOTICE([Corrected Fortran libraries: $FLIBS])
+fi
+]) # _AC_COIN_F77_LIBRARY_LDFLAGS
+
+AC_DEFUN([AC_COIN_F77_WRAPPERS],
+[AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
+AC_REQUIRE([_AC_COIN_F77_LIBRARY_LDFLAGS])dnl
+
+AC_LANG_PUSH([Fortran 77])
+AC_F77_WRAPPERS
+AC_LANG_POP([Fortran 77])
+
+]) # AC_COIN_F77_WRAPPERS
+
+###########################################################################
+#                             COIN_FIND_F77                               #
+###########################################################################
+
+# Attempt to preempt autoconf by locating an appropriate F77 program. This
+# macro will not trigger a fatal error if a suitable compiler cannot be
+# found. It should be called before COIN_PROG_F77 or COIN_TRY_FLINK.
+
+AC_DEFUN([AC_COIN_FIND_F77],
+[AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_REQUIRE([AC_COIN_F77_COMPS])
+AC_MSG_NOTICE([Trying to determine Fortran compiler name])
+AC_CHECK_TOOLS([F77],[$coin_f77_comps],[unavailable])
+])
+
+# Auxilliary macro to make sure both COIN_PROG_F77 and COIN_FIND_F77 use
+# the same search lists for compiler names.
+# For *-*-solaris*, promote Studio/Workshop compilers to front of list.
+AC_DEFUN([AC_COIN_F77_COMPS],
+[case $build in
+  *-cygwin* | *-mingw*)
+     if test "$enable_doscompile" = msvc ; then
+       coin_f77_comps="ifort fl32 compile_f2c"
+     else
+       coin_f77_comps="gfortran ifort g95 g77 fl32 compile_f2c"
+     fi ;;
+  *-*-solaris*)
+     coin_f77_comps="f95 f90 g95 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
+  *-linux-gnu*)
+     coin_f77_comps="gfortran ifort g95 fort77 f77 g77 pgf90 pgf77 ifc frt af77 xlf_r" ;;
+  *) coin_f77_comps="xlf_r fort77 gfortran ifort g95 f77 g77 pgf90 pgf77 ifc frt af77" ;;
+ esac
+])
 
 ###########################################################################
@@ -353 +1362 @@
 
     # Check whether autoconf is the correct version
-    correct_version='2.69'
+    correct_version='2.59'
     grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     AC_MSG_CHECKING([whether we are using the correct version ($correct_version) of autoconf])
@@ -390 +1399 @@
   
     # Check whether automake is the correct version
-    correct_version='1.12'
+    correct_version='1.9.6'
     grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     AC_MSG_CHECKING([whether we are using the correct version ($correct_version) of automake])
@@ -426 +1435 @@
       want_dir=$AUTOTOOLS_DIR/share
     fi
-    correct_version='2.4.2'
+    correct_version='1.5.22'
     grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
     AC_COIN_CHECK_FILE([$want_dir/libtool/ltmain.sh],
-                       [have_ltmain=yes],
+                       [have_ltmain=yes],
                        [have_ltmain=no])
     AC_MSG_CHECKING([whether we are using the correct version ($correct_version) of libtool.])
@@ -553 +1562 @@
 
 # Initialize automake and libtool
+# AC_MSG_NOTICE([Calling INIT_AUTO_TOOLS from CREATE_LIBTOOL.])
 AC_COIN_INIT_AUTO_TOOLS
+# AC_MSG_NOTICE([Finished INIT_AUTO_TOOLS from CREATE_LIBTOOL.])
 ])
 
@@ -565 +1576 @@
 # RPATH_FLAGS        link flags for hardcoding path to shared objects
 
+# This is a trick to have this code before AC_COIN_PROG_LIBTOOL
+AC_DEFUN([AC_COIN_DISABLE_STATIC],
+[
+# Test if force_shared has been set
+if test "x$1" = xforce_shared; then
+  if test x$enable_shared = xno; then
+    AC_MSG_ERROR([Shared libraries are disabled by user, but this is not feasible with the given options])
+  fi
+  enable_shared=yes;
+else
+  # On Cygwin and AIX, building DLLs doesn't work
+  case $build in
+    *-cygwin*)
+      coin_disable_shared=yes
+      platform=Cygwin
+    ;;
+    *-aix*)
+      coin_disable_shared=yes
+      platform=AIX
+    ;;
+    *-mingw*)
+      coin_disable_shared=yes
+      platform="Msys"
+#      case "$CXX" in
+#        cl*)
+#          coin_disable_shared=yes
+#          platform="Msys with cl"
+#      ;;
+#      esac
+    ;;
+  esac
+fi
+if test x"$coin_disable_shared" = xyes; then
+  if test x"$enable_shared" = xyes; then
+    AC_MSG_WARN([On $platform, shared objects are not supported. I'm disabling your choice.])
+  fi
+  enable_shared=no
+fi
+# By default, we only want the shared objects to be compiled
+AC_DISABLE_STATIC
+])
+
 m4_define([AC_COIN_INIT_AUTO_TOOLS],
 [{AC_BEFORE([AC_COIN_PROG_CXX],[$0])
@@ -570 +1623 @@
 AC_BEFORE([AC_COIN_PROG_F77],[$0])
 
+# START
+AC_COIN_DISABLE_STATIC([$1])
+
 # Initialize automake
 AC_COIN_INIT_AUTOMAKE
@@ -585 +1641 @@
 fi
 
-# ToDo for now, do not reuse libtool script because code below may need some updates
-#   e.g., getting the SED and ECHO variables
-LIBTOOL=
-
 if test "x$LIBTOOL" = x; then
+# AC_MSG_NOTICE([Creating libtool script (calling COIN_PROG_LIBTOOL).])
   # Stuff for libtool
   AC_COIN_PROG_LIBTOOL
+# AC_MSG_NOTICE([Finished COIN_PROG_LIBTOOL.])
   # set RPATH_FLAGS to the compiler link flags required to hardcode location
   # of the shared objects
@@ -613 +1667 @@
       s,@ac_c_preproc_warn_flag@* |  s,@ac_cxx_preproc_warn_flag@* ) 
         command=`echo $oneline | sed -e 's/^s,@//' -e 's/@,/="/' -e 's/,;t t/"/'`
+#        echo "$command"
         eval "$command"
         ;;
       s,@DEFS@* )
         command=`echo $oneline | sed -e 's/^s,@DEFS@,/defsline="/' -e 's/,;t t/"/'`
+#        echo "$command"
         eval "$command"
         ;;
@@ -623 +1679 @@
   IFS=$as_save_IFS
 
-  # And some defines (assuming here that the packages base dir doesn't have a config.h file)
+  # And some defines (assuming here that the packages base dir
+  # doesn't have a config.h file
   for word in $defsline; do
+#    echo word $word 
     case $word in
       -DHAVE_@<:@A-Z_@:>@*_H=1 | -DSTDC_HEADERS=1 )
         i=`echo $word | sed -e 's/-D/#define /' -e 's/=/ /'`
+#        echo dd $i
         echo $i >>confdefs.h
         ;;
@@ -633 +1692 @@
   done
 fi
+
+# AC_MSG_NOTICE([End of INIT_AUTO_TOOLS.])
 
 # ToDo
@@ -651 +1712 @@
 AC_SUBST(LT_LDFLAGS)
 
+#END
 }])
 
 ###########################################################################
+#                      COIN_PATCH_LIBTOOL_CYGWIN                          #
+###########################################################################
+
+# Patches to libtool for cygwin. Lots for cl, a few for GCC.
+# For cl:
+# - cygpath is not correctly quoted in fix_srcfile_path
+# - paths generated for .lib files is not run through cygpath -w
+
+
+AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
+[ case "$CXX" in
+    clang* )
+      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
+      AC_MSG_NOTICE(Applying patches to libtool for CLANG compiler)
+      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
+      ;;
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 
+      AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
+      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
+      ;;
+    *)
+      AC_MSG_NOTICE(Applying patches to libtool for GNU compiler)
+      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
+      ;;
+  esac
+  mv conftest.bla libtool
+  chmod 755 libtool
+]) # COIN_PATCH_LIBTOOL_CYGWIN
+
+###########################################################################
+#                    COIN_PATCH_LIBTOOL_SOLARIS                           #
+###########################################################################
+# If we want to do a 64-bit build with GCC on Solaris, the system search
+# libraries need to point to 64-bit subdirectories. If they do not already do
+# that, fix them. This patch is evolving, as are GCC compilers.  GCC 4.2.1
+# reports the correct search list, given the correct call. GCC 4.1.1 does not.
+# `Correct call' means -m64 is specified. `Correct search list' seems to amount
+# to prepending the list of 64-bit subdirectories to the 32-bit directories.
+# Both SPARC and x86 have this issue, but a different hardware id string is
+# required depending on the underlying CPU. The macro executes isainfo to get
+# the string. This will fail, of course, if we're cross-compiling. The
+# alternative is to fail on a regular basis each time a new CPU identifier is
+# needed. This macro will also fail if the search list reported with
+# -print-search-dirs differs between the C, C++, and Fortran compilers; each
+# have their own setting in libtool.  If GCC reports the correct search list
+# given the -m64 flag, the best solution is to define CC='gcc -m64', and
+# similarly for CXX, F77, so that libtool will make the correct call.
+###########################################################################
+AC_DEFUN([AC_COIN_PATCH_LIBTOOL_SOLARIS],
+[ if test "$GCC" = yes && \
+     (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm64' >/dev/null 2>&1) ; then
+    hdwisa=`isainfo | sed -e 's/\(@<:@^ @:>@*\) .*$/\1/'`
+    if `$EGREP 'sys_lib_search_path_spec=' libtool | $EGREP -v $hdwisa >/dev/null 2>&1` ; then
+      AC_MSG_NOTICE([Applying patches to libtool for 64-bit GCC compilation])
+      fixlibtmp=`$CC -m64 -print-search-dirs | $EGREP '^libraries:'`
+      fixlibtmp=`echo $fixlibtmp | sed -e 's/libraries: =//' -e 's/:/ /g'`
+      if `echo "$fixlibtmp" | $EGREP -v $hdwisa  >/dev/null 2>&1` ; then
+        # AC_MSG_NOTICE(Compensating for broken gcc)
+        for lib in $fixlibtmp ; do
+          if test -d "${lib}${hdwisa}" ; then
+            syslibpath64="$syslibpath64 ${lib}${hdwisa}/"
+          fi
+        done
+        syslibpath64="${syslibpath64} ${fixlibtmp}"
+      else
+        syslibpath64="$fixlibtmp"
+      fi
+      sed -e 's|sys_lib_search_path_spec=".*"|sys_lib_search_path_spec="'"$syslibpath64"'"|' libtool > conftest.bla
+      mv conftest.bla libtool
+      chmod 755 libtool  
+    fi
+    # AC_MSG_NOTICE(Result is )
+    # $EGREP 'sys_lib_search_path_spec=' libtool
+  fi ]) # COIN_PATCH_LIBTOOL_SOLARIS
+
+###########################################################################
 #                           COIN_PROG_LIBTOOL                             #
 ###########################################################################
 
 # Setup the libtool stuff together with any modifications to make it
-# work on additional platforms.
-# If libtool exists in the directory higher up, we use that one
-# instead of creating a new one.
+# work on additional platforms
 
 AC_DEFUN([AC_COIN_PROG_LIBTOOL],
-[
+[# No longer needed now that CPPFLAGS is correctly set -- lh, 061214 --
+ # AC_REQUIRE([AC_COIN_DLFCN_H])
+
+# NEW: If libtool exists in the directory higher up, we use that one
+#      instead of creating a new one
+
 # It turns out that the code for AC_PROG_LIBTOOL is somehow AC_REQUIRED
 # out in front of this macro body. You'll notice that LIBTOOL is already
@@ -687 +1845 @@
   esac
 
+  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-*)
+      if test "$GCC" = yes && (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm32' >& /dev/null); then 
+        AC_MSG_NOTICE(Applying patches to libtool for 32bit compilation)
+        sed -e 's|sys_lib_search_path_spec=".*"|sys_lib_search_path_spec="/lib /usr/lib"|' libtool > conftest.bla
+        mv conftest.bla libtool
+        chmod 755 libtool  
+      fi
+      ;;
+
+    *-solaris*)
+      AC_COIN_PATCH_LIBTOOL_SOLARIS
+      ;;
+    # Cygwin. Ah, cygwin. Too big and ugly to inline; see the macro.
+    *-cygwin* | *-mingw*)
+      AC_COIN_PATCH_LIBTOOL_CYGWIN
+      ;;
+    *-darwin*)
+      AC_MSG_NOTICE(Applying patches to libtool for Darwin)
+      sed -e 's/verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"/verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"/' \
+        -e 's/ -dynamiclib / -dynamiclib -single_module /g' \
+      libtool > conftest.bla
+
+      mv conftest.bla libtool
+      chmod 755 libtool
+      ;;
+  esac
 # This fi matches the commented `if test "x$LIBTOOL" = x;' up at the head of
 # the macro. -- lh, 061214 --
 # fi
 
-  sed -e 's|tool_oldlib|oldlib|' \
-      libtool > conftest.bla
-  mv conftest.bla libtool
-  chmod 755 libtool
-
 # AC_MSG_NOTICE([End libtool initialisation.])
 ]) # AC_COIN_PROG_LIBTOOL
+
+# This is a trick to force the check for the dlfcn header to be done before
+# the checks for libtool
+# No longer needed now that CPPFLAGS is correctly set.  -- lh, 061214 --
+# ACDEFUN([AC_COIN_DLFCN_H],
+# [AC_LANG_PUSH(C)
+# AC_COIN_CHECK_HEADER([dlfcn.h])
+# AC_LANG_POP(C)
+# ]) # AC_COIN_DLFCN_H
 
 ###########################################################################
@@ -793 +1984 @@
 if test x$coin_skip_ac_output != xyes; then
 
+  # library extension
+  AC_SUBST(LIBEXT)
+  case "$CC" in
+    clang* )
+         LIBEXT=a ;;
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+         LIBEXT=lib ;;
+      *) LIBEXT=a ;;
+  esac
+
   # Define VPATH_DISTCLEANFILES to be everything that needs to be
   # cleaned for distclean in a vpath configuration
@@ -892 +2093 @@
                [AC_HELP_STRING([--enable-gnu-packages],
                                [compile with GNU packages (disabled by default)])],
-               [coin_enable_gnu=$enableval],
-               [coin_enable_gnu=no])
+               [coin_enable_gnu=$enableval],
+               [coin_enable_gnu=no])
 ]) # AC_COIN_ENABLE_GNU_PACKAGES
 
@@ -906 +2107 @@
 [AC_BEFORE([AC_COIN_PROG_CC],[$0])
 
-if test x$coin_cxx_is_cl != xtrue && test x$coin_cc_is_cl != xtrue ; then
+if test $coin_cc_is_cl != true ; then
   coin_foreach_w([myvar], [$1], [
     m4_toupper(myvar)_LIBS="-lm $m4_toupper(myvar)_LIBS"
@@ -1315 +2516 @@
 AC_LANG_POP(C++)
 ])
+
+###########################################################################
+#                             COIN_DATA_PATH                              #
+###########################################################################
+
+# This macro defines a preprocessor macro with the absolute path to a
+# subdirectory of Data.  The argument of this macro is the name of the
+# subdirectory (in correct case), and the name of the macro is
+# COIN_DATA_DIR_PATH, where dir is replaced by the capitalized name of
+# the directory.  The path ends with a separator ("/" for linux and
+# '\\' for Windows).  The default value for this path can be
+# overwritten with the input variable with the same name
+# (COIN_DATA_DIR_PATH).  At this point we chech only for the
+# $srcdir/../Data subdirectory.
+
+AC_DEFUN([AC_COIN_DATA_PATH],
+[AC_MSG_CHECKING([absolute path to data directory $1])
+
+AC_ARG_VAR(m4_toupper(COIN_DATA_$1_PATH),[Set to absolute path to Data/$1 subdirectory])
+
+if test x"$m4_toupper(COIN_DATA_$1_PATH)" = x; then
+  m4_toupper(COIN_DATA_$1_PATH)=`cd $srcdir/../Data/$1; pwd`
+fi
+
+# Under Cygwin, use Windows path.  Add separator
+case $build in
+  *-cygwin*)
+    m4_toupper(COIN_DATA_$1_PATH)=`cygwin -w $m4_toupper(COIN_DATA_$1_PATH)`\\
+    ;;
+  *)
+    m4_toupper(COIN_DATA_$1_PATH)="$m4_toupper(COIN_DATA_$1_PATH)/"
+    ;;
+esac
+
+if test -r $m4_toupper(COIN_DATA_$1_PATH); then
+  AC_DEFINE_UNQUOTED(m4_toupper(COIN_DATA_$1_PATH),["$m4_toupper(COIN_DATA_$1_PATH)"],
+            [Define to absolute path for Data subdirectory $1])
+  AC_MSG_RESULT($m4_toupper(COIN_DATA_$1_PATH))
+else
+  AC_MSG_ERROR(Directory $m4_toupper(COIN_DATA_$1_PATH) does not exist)
+fi
+]) # AC_COIN_DATA_PATH
 
 ###########################################################################