Changeset 1019


Ignore:
Timestamp:
Jun 11, 2008 10:12:42 PM (12 years ago)
Author:
andreasw
Message:

synchronized stable/1.0 with trunk rev 1018

Location:
ThirdParty/ASL/stable/1.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/1.0/compile_MS_ASL.in

    r800 r1019  
    2525
    2626# Acquire the cl version and create details.c
     27# (This is not doing to right thing if we are using the Microsoft compiler)
    2728
    2829clver=`cl 2>&1 | egrep '^Microsoft' | sed -e 's/.*Version \(.*\)/\1/'`
     
    5152libampl=@AMPLSOLVER_A@
    5253MAKEFLAGS=
    53 nmake -f makefile.coin @ASLMAKEFLAGS@
     54nmake -f makefile.coin @ASLMAKEFLAGS@ CC="@CC@"
    5455mv amplsolv.lib ../$libampl
    5556mv stdio1.h arith.h funcadd0.obj ..
  • ThirdParty/ASL/stable/1.0/compile_Unix_ASL.in

    r800 r1019  
    4646# entire build and start from scratch, the `u' in ruv stands for `useless'.
    4747
    48 sed -e 's/\<ar\>/\$(AR)/g' \
     48sed -e 's/ ar / @AR@ /g' \
    4949    -e 's/^ARFLAGS =/# ARFLAGS =/' < makefile.u > makefile.coin
    5050
  • ThirdParty/ASL/stable/1.0/configure

    r1010 r1019  
    2001520015  AMPLSOLVER_A=$ampllib
    2001620016  case "$CC" in
    20017     cl* | */cl* | CL* | */CL*)
     20017    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2001820018      msvc_compile=yes ;;
    2001920019    *)
     
    2025220252
    2025320253
    20254                               ac_config_files="$ac_config_files Makefile compile_MS_ASL compile_Unix_ASL"
     20254          ac_config_files="$ac_config_files Makefile"
     20255
     20256          ac_config_files="$ac_config_files compile_MS_ASL"
     20257
     20258          ac_config_files="$ac_config_files compile_Unix_ASL"
    2025520259
    2025620260
     
    2136921373  fi
    2137021374
     21375  # Run the commands associated with the file.
     21376  case $ac_file in
     21377    compile_MS_ASL ) chmod a+x compile_MS_ASL ;;
     21378    compile_Unix_ASL ) chmod a+x compile_Unix_ASL ;;
     21379  esac
    2137121380done
    2137221381_ACEOF
     
    2167121680
    2167221681
    21673 
    21674 # Finally, we need to make sure that the build scripts are executable
    21675 
    21676 chmod a+x compile_MS_ASL compile_Unix_ASL
  • ThirdParty/ASL/stable/1.0/configure.ac

    r1010 r1019  
    8686  AMPLSOLVER_A=$ampllib
    8787  case "$CC" in
    88     cl* | */cl* | CL* | */CL*)
     88    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    8989      msvc_compile=yes ;;
    9090    *)
     
    198198AM_CONDITIONAL(MSVC_COMPILE, test x$msvc_compile = xyes)
    199199
    200 AC_CONFIG_FILES([Makefile compile_MS_ASL compile_Unix_ASL])
     200AC_CONFIG_FILES([Makefile])
     201AC_CONFIG_FILES([compile_MS_ASL],[chmod a+x compile_MS_ASL])
     202AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL])
    201203
    202204AC_COIN_FINALIZE
    203 
    204 # Finally, we need to make sure that the build scripts are executable
    205 
    206 chmod a+x compile_MS_ASL compile_Unix_ASL
Note: See TracChangeset for help on using the changeset viewer.