Changeset 764


Ignore:
Timestamp:
May 15, 2006 12:24:43 AM (13 years ago)
Author:
andreasw
Message:

Several fixes to make autotools work on Cygwin

Location:
trunk/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r761 r764  
    16801680
    16811681
     1682# This package is written in C++
     1683ac_ext=cc
     1684ac_cpp='$CXXCPP $CPPFLAGS'
     1685ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     1686ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     1687ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     1688
     1689
    16821690# Get the name of the C++ compiler and appropriate compiler options
    16831691
     
    22802288        coin_add_cxxflags="-pipe"
    22812289        coin_dbg_cxxflags="-g"
    2282         coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wconversion"
     2290        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    22832291
    22842292        case $build in
     
    26032611CXXFLAGS="$coin_cv_cxxflags"
    26042612
    2605 ac_ext=c
    2606 ac_cpp='$CPP $CPPFLAGS'
    2607 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    2608 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    2609 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     2613ac_ext=cc
     2614ac_cpp='$CXXCPP $CPPFLAGS'
     2615ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     2616ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     2617ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    26102618
    26112619
     
    39043912
    39053913
    3906 ac_ext=c
    3907 ac_cpp='$CPP $CPPFLAGS'
    3908 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    3909 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    3910 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     3914ac_ext=cc
     3915ac_cpp='$CXXCPP $CPPFLAGS'
     3916ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     3917ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     3918ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    39113919
    39123920
     
    44594467*-*-irix6*)
    44604468  # Find out which ABI we are using.
    4461   echo '#line 4461 "configure"' > conftest.$ac_ext
     4469  echo '#line 4469 "configure"' > conftest.$ac_ext
    44624470  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    44634471  (eval $ac_compile) 2>&5
     
    55935601
    55945602# Provide some information about the compiler.
    5595 echo "$as_me:5595:" \
     5603echo "$as_me:5603:" \
    55965604     "checking for Fortran 77 compiler version" >&5
    55975605ac_compiler=`set X $ac_compile; echo $2`
     
    57315739
    57325740G77=`test $ac_compiler_gnu = yes && echo yes`
    5733 ac_ext=c
    5734 ac_cpp='$CPP $CPPFLAGS'
    5735 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    5736 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    5737 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     5741ac_ext=cc
     5742ac_cpp='$CXXCPP $CPPFLAGS'
     5743ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     5744ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     5745ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    57385746
    57395747
     
    66606668   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    66616669   -e 's:$: $lt_compiler_flag:'`
    6662    (eval echo "\"\$as_me:6662: $lt_compile\"" >&5)
     6670   (eval echo "\"\$as_me:6670: $lt_compile\"" >&5)
    66636671   (eval "$lt_compile" 2>conftest.err)
    66646672   ac_status=$?
    66656673   cat conftest.err >&5
    6666    echo "$as_me:6666: \$? = $ac_status" >&5
     6674   echo "$as_me:6674: \$? = $ac_status" >&5
    66676675   if (exit $ac_status) && test -s "$ac_outfile"; then
    66686676     # The compiler can only warn and ignore the option if not recognized
     
    69286936   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    69296937   -e 's:$: $lt_compiler_flag:'`
    6930    (eval echo "\"\$as_me:6930: $lt_compile\"" >&5)
     6938   (eval echo "\"\$as_me:6938: $lt_compile\"" >&5)
    69316939   (eval "$lt_compile" 2>conftest.err)
    69326940   ac_status=$?
    69336941   cat conftest.err >&5
    6934    echo "$as_me:6934: \$? = $ac_status" >&5
     6942   echo "$as_me:6942: \$? = $ac_status" >&5
    69356943   if (exit $ac_status) && test -s "$ac_outfile"; then
    69366944     # The compiler can only warn and ignore the option if not recognized
     
    70327040   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70337041   -e 's:$: $lt_compiler_flag:'`
    7034    (eval echo "\"\$as_me:7034: $lt_compile\"" >&5)
     7042   (eval echo "\"\$as_me:7042: $lt_compile\"" >&5)
    70357043   (eval "$lt_compile" 2>out/conftest.err)
    70367044   ac_status=$?
    70377045   cat out/conftest.err >&5
    7038    echo "$as_me:7038: \$? = $ac_status" >&5
     7046   echo "$as_me:7046: \$? = $ac_status" >&5
    70397047   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    70407048   then
     
    93779385  lt_status=$lt_dlunknown
    93789386  cat > conftest.$ac_ext <<EOF
    9379 #line 9379 "configure"
     9387#line 9387 "configure"
    93809388#include "confdefs.h"
    93819389
     
    94779485  lt_status=$lt_dlunknown
    94789486  cat > conftest.$ac_ext <<EOF
    9479 #line 9479 "configure"
     9487#line 9487 "configure"
    94809488#include "confdefs.h"
    94819489
     
    1010110109
    1010210110
    10103 ac_ext=c
    10104 ac_cpp='$CPP $CPPFLAGS'
    10105 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    10106 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    10107 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     10111ac_ext=cc
     10112ac_cpp='$CXXCPP $CPPFLAGS'
     10113ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     10114ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     10115ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1010810116
    1010910117CC="$lt_save_CC"
     
    1182111829   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1182211830   -e 's:$: $lt_compiler_flag:'`
    11823    (eval echo "\"\$as_me:11823: $lt_compile\"" >&5)
     11831   (eval echo "\"\$as_me:11831: $lt_compile\"" >&5)
    1182411832   (eval "$lt_compile" 2>conftest.err)
    1182511833   ac_status=$?
    1182611834   cat conftest.err >&5
    11827    echo "$as_me:11827: \$? = $ac_status" >&5
     11835   echo "$as_me:11835: \$? = $ac_status" >&5
    1182811836   if (exit $ac_status) && test -s "$ac_outfile"; then
    1182911837     # The compiler can only warn and ignore the option if not recognized
     
    1192511933   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1192611934   -e 's:$: $lt_compiler_flag:'`
    11927    (eval echo "\"\$as_me:11927: $lt_compile\"" >&5)
     11935   (eval echo "\"\$as_me:11935: $lt_compile\"" >&5)
    1192811936   (eval "$lt_compile" 2>out/conftest.err)
    1192911937   ac_status=$?
    1193011938   cat out/conftest.err >&5
    11931    echo "$as_me:11931: \$? = $ac_status" >&5
     11939   echo "$as_me:11939: \$? = $ac_status" >&5
    1193211940   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1193311941   then
     
    1311213120
    1311313121
    13114 ac_ext=c
    13115 ac_cpp='$CPP $CPPFLAGS'
    13116 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    13117 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    13118 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     13122ac_ext=cc
     13123ac_cpp='$CXXCPP $CPPFLAGS'
     13124ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     13125ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     13126ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1311913127
    1312013128CC=$lt_save_CC
     
    1349513503   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1349613504   -e 's:$: $lt_compiler_flag:'`
    13497    (eval echo "\"\$as_me:13497: $lt_compile\"" >&5)
     13505   (eval echo "\"\$as_me:13505: $lt_compile\"" >&5)
    1349813506   (eval "$lt_compile" 2>conftest.err)
    1349913507   ac_status=$?
    1350013508   cat conftest.err >&5
    13501    echo "$as_me:13501: \$? = $ac_status" >&5
     13509   echo "$as_me:13509: \$? = $ac_status" >&5
    1350213510   if (exit $ac_status) && test -s "$ac_outfile"; then
    1350313511     # The compiler can only warn and ignore the option if not recognized
     
    1359913607   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1360013608   -e 's:$: $lt_compiler_flag:'`
    13601    (eval echo "\"\$as_me:13601: $lt_compile\"" >&5)
     13609   (eval echo "\"\$as_me:13609: $lt_compile\"" >&5)
    1360213610   (eval "$lt_compile" 2>out/conftest.err)
    1360313611   ac_status=$?
    1360413612   cat out/conftest.err >&5
    13605    echo "$as_me:13605: \$? = $ac_status" >&5
     13613   echo "$as_me:13613: \$? = $ac_status" >&5
    1360613614   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1360713615   then
     
    1569915707
    1570015708
    15701 ac_ext=c
    15702 ac_cpp='$CPP $CPPFLAGS'
    15703 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    15704 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    15705 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     15709ac_ext=cc
     15710ac_cpp='$CXXCPP $CPPFLAGS'
     15711ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     15712ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     15713ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1570615714
    1570715715CC="$lt_save_CC"
     
    1580615814   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1580715815   -e 's:$: $lt_compiler_flag:'`
    15808    (eval echo "\"\$as_me:15808: $lt_compile\"" >&5)
     15816   (eval echo "\"\$as_me:15816: $lt_compile\"" >&5)
    1580915817   (eval "$lt_compile" 2>conftest.err)
    1581015818   ac_status=$?
    1581115819   cat conftest.err >&5
    15812    echo "$as_me:15812: \$? = $ac_status" >&5
     15820   echo "$as_me:15820: \$? = $ac_status" >&5
    1581315821   if (exit $ac_status) && test -s "$ac_outfile"; then
    1581415822     # The compiler can only warn and ignore the option if not recognized
     
    1607416082   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1607516083   -e 's:$: $lt_compiler_flag:'`
    16076    (eval echo "\"\$as_me:16076: $lt_compile\"" >&5)
     16084   (eval echo "\"\$as_me:16084: $lt_compile\"" >&5)
    1607716085   (eval "$lt_compile" 2>conftest.err)
    1607816086   ac_status=$?
    1607916087   cat conftest.err >&5
    16080    echo "$as_me:16080: \$? = $ac_status" >&5
     16088   echo "$as_me:16088: \$? = $ac_status" >&5
    1608116089   if (exit $ac_status) && test -s "$ac_outfile"; then
    1608216090     # The compiler can only warn and ignore the option if not recognized
     
    1617816186   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1617916187   -e 's:$: $lt_compiler_flag:'`
    16180    (eval echo "\"\$as_me:16180: $lt_compile\"" >&5)
     16188   (eval echo "\"\$as_me:16188: $lt_compile\"" >&5)
    1618116189   (eval "$lt_compile" 2>out/conftest.err)
    1618216190   ac_status=$?
    1618316191   cat out/conftest.err >&5
    16184    echo "$as_me:16184: \$? = $ac_status" >&5
     16192   echo "$as_me:16192: \$? = $ac_status" >&5
    1618516193   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1618616194   then
     
    1665416662  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1665516663  (exit $ac_status); } &&
    16656          { ac_try='test -z "$ac_c_werror_flag"
     16664         { ac_try='test -z "$ac_cxx_werror_flag"
    1665716665                         || test ! -s conftest.err'
    1665816666  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1671516723  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1671616724  (exit $ac_status); } &&
    16717          { ac_try='test -z "$ac_c_werror_flag"
     16725         { ac_try='test -z "$ac_cxx_werror_flag"
    1671816726                         || test ! -s conftest.err'
    1671916727  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1829818306
    1829918307
    18300 ac_ext=c
    18301 ac_cpp='$CPP $CPPFLAGS'
    18302 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18303 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    18304 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     18308ac_ext=cc
     18309ac_cpp='$CXXCPP $CPPFLAGS'
     18310ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     18311ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     18312ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1830518313
    1830618314CC="$lt_save_CC"
     
    1877918787
    1878018788
    18781 ac_ext=c
    18782 ac_cpp='$CPP $CPPFLAGS'
    18783 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18784 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    18785 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     18789ac_ext=cc
     18790ac_cpp='$CXXCPP $CPPFLAGS'
     18791ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     18792ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     18793ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1878618794
    1878718795CC="$lt_save_CC"
     
    1947619484      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1947719485          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19478           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="`$CYGPATH_W \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"'` \$compile_deplibs\"'% \
    19479           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="`$CYGPATH_W \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"'` \$compile_deplibs\"'% \
     19486          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19487          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    1948019488          -e 's%lib /OUT:%lib -OUT:%' \
    1948119489          -e "s%cygpath -w%$CYGPATH_W%"\
     
    1964019648  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1964119649  (exit $ac_status); } &&
    19642          { ac_try='test -z "$ac_c_werror_flag"
     19650         { ac_try='test -z "$ac_cxx_werror_flag"
    1964319651                         || test ! -s conftest.err'
    1964419652  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1971719725  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1971819726  (exit $ac_status); } &&
    19719          { ac_try='test -z "$ac_c_werror_flag"
     19727         { ac_try='test -z "$ac_cxx_werror_flag"
    1972019728                         || test ! -s conftest.err'
    1972119729  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1977219780  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1977319781  (exit $ac_status); } &&
    19774          { ac_try='test -z "$ac_c_werror_flag"
     19782         { ac_try='test -z "$ac_cxx_werror_flag"
    1977519783                         || test ! -s conftest.err'
    1977619784  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1984919857  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1985019858  (exit $ac_status); } &&
    19851          { ac_try='test -z "$ac_c_werror_flag"
     19859         { ac_try='test -z "$ac_cxx_werror_flag"
    1985219860                         || test ! -s conftest.err'
    1985319861  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  • trunk/Clp/configure.ac

    r761 r764  
    4949AC_COIN_DEBUG_COMPILE
    5050
     51# This package is written in C++
     52AC_LANG(C++)
     53
    5154# Get the name of the C++ compiler and appropriate compiler options
    5255AC_COIN_PROG_CXX
  • trunk/Clp/src/Makefile.am

    r762 r764  
    155155        echo "#endif" >>bla.tmp
    156156        if test -r ../inc/$(CONFIG_DIST); then \
    157           if diff ./inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>1 ; then \
     157          if diff ../inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>&1 ; then \
    158158            rm -f bla.tmp; \
    159159          else \
  • trunk/Clp/src/Makefile.in

    r762 r764  
    776776        echo "#endif" >>bla.tmp
    777777        if test -r ../inc/$(CONFIG_DIST); then \
    778           if diff ./inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>1 ; then \
     778          if diff ../inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>&1 ; then \
    779779            rm -f bla.tmp; \
    780780          else \
  • trunk/Clp/test/Makefile.am

    r763 r764  
    1515# We are using the CLP solver executable to do the unit test
    1616
    17 test: ../src/clp
    18         ../src/clp -unitTest -netlib -netlibp
     17test: ../src/clp$(EXEEXT)
     18        ../src/clp$(EXEEXT) -unitTest -netlib -netlibp
    1919
    2020.PHONY: test
  • trunk/Clp/test/Makefile.in

    r763 r764  
    357357# We are using the CLP solver executable to do the unit test
    358358
    359 test: ../src/clp
    360         ../src/clp -unitTest -netlib -netlibp
     359test: ../src/clp$(EXEEXT)
     360        ../src/clp$(EXEEXT) -unitTest -netlib -netlibp
    361361
    362362.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.