Ignore:
Timestamp:
Jun 19, 2011 10:12:04 AM (10 years ago)
Author:
stefan
Message:

sync with trunk rev2306

Location:
ThirdParty/ASL/stable/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/1.2

  • ThirdParty/ASL/stable/1.2/configure.ac

    r2009 r2307  
    7070# Set a substitutable variable with the library name, and determine the compilation style.
    7171AC_SUBST(AMPLSOLVER_A)
    72 case "$CC" in
    73   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    74     AMPLSOLVER_A=libamplsolver.lib
    75     msvc_compile=yes
    76     ;;
    77   *)
    78     AMPLSOLVER_A=libamplsolver.a
    79     msvc_compile=no
    80     ;;
    81 esac
    82 AC_MSG_NOTICE([Configuring ASL to build $AMPLSOLVER_A.])
     72if test "x$coin_cc_is_cl" = xtrue ; then
     73  AMPLSOLVER_A=libamplsolver.lib
     74else
     75  AMPLSOLVER_A=libamplsolver.a
     76fi
    8377
    8478# Determine flags to be passed on the command line to (n)make. The main
     
    122116    [asladdcflags="$asladdcflags -DNO_LONG_LONG"],[])
    123117
     118# Check for dlopen, ASL uses it to load userdefined function libraries
     119  AC_CHECK_LIB(dl,[dlopen],[ASL_PCLIBS="-ldl $ASL_PCLIBS"])
     120
    124121# Back to whatever language we were in.
    125122  AC_LANG_POP(C)
     
    133130# Remove -Werror if present, to make sure we are not interrupting compilation
    134131# of ASL because of warning messages. The cl equivalent is -WX.
     132# SV: Our buildsystem should never add these flags to the CFLAGS, so why bother checking for them?
     133#     If the user added some, shouldn't we listen to it and not just remove them again?
    135134  bla=
    136   if test x$msvc_compile = xyes ; then
     135  if test "x$coin_cc_is_cl" = xtrue ; then
    137136    warnToErr="-WX"
    138137  else
     
    144143    fi
    145144  done
     145 
     146# Add -fPIC -DPIC if we actually build shared libraries
     147  if test x$enable_shared != xno; then
     148    asladdcflags="$asladdcflags -fPIC -DPIC"
     149  fi
     150 
    146151  ASLMAKEFLAGS="CFLAGS=\"$bla $asladdcflags\""
    147152
     
    159164# Limit GNU make to one thread. But remember that if we're building with
    160165# cl, ultimately we're going to use nmake, which knows nothing of this.
    161   if test x$msvc_compile = xno ; then
     166  if test "x$coin_cc_is_cl" != xtrue ; then
    162167    rm -rf conftest.mak
    163168    ($am_make -v > conftest.grp) 2>&5
     
    173178AC_ARG_VAR(ASLMAKEFLAGS, [Compilation flags necessary for compiling the AMPL solver library])
    174179
    175 # Set automake conditional and generate the output files.
    176 
    177 AM_CONDITIONAL(MSVC_COMPILE, test x$msvc_compile = xyes)
     180# generate the output files.
    178181
    179182AC_CONFIG_FILES([Makefile])
Note: See TracChangeset for help on using the changeset viewer.