Changeset 317 for trunk


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

Several fixes to make autotools work on Cygwin

Location:
trunk/Cbc
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r313 r317  
    17041704
    17051705
     1706# This package is written in C++
     1707ac_ext=cc
     1708ac_cpp='$CXXCPP $CPPFLAGS'
     1709ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     1710ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     1711ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     1712
     1713
    17061714# Get the name of the C++ compiler and appropriate compiler options
    17071715
     
    23042312        coin_add_cxxflags="-pipe"
    23052313        coin_dbg_cxxflags="-g"
    2306         coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wconversion"
     2314        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    23072315
    23082316        case $build in
     
    26272635CXXFLAGS="$coin_cv_cxxflags"
    26282636
    2629 ac_ext=c
    2630 ac_cpp='$CPP $CPPFLAGS'
    2631 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    2632 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    2633 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     2637ac_ext=cc
     2638ac_cpp='$CXXCPP $CPPFLAGS'
     2639ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     2640ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     2641ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    26342642
    26352643
     
    39283936
    39293937
    3930 ac_ext=c
    3931 ac_cpp='$CPP $CPPFLAGS'
    3932 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    3933 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    3934 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     3938ac_ext=cc
     3939ac_cpp='$CXXCPP $CPPFLAGS'
     3940ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     3941ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     3942ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    39353943
    39363944
     
    44834491*-*-irix6*)
    44844492  # Find out which ABI we are using.
    4485   echo '#line 4485 "configure"' > conftest.$ac_ext
     4493  echo '#line 4493 "configure"' > conftest.$ac_ext
    44864494  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    44874495  (eval $ac_compile) 2>&5
     
    56175625
    56185626# Provide some information about the compiler.
    5619 echo "$as_me:5619:" \
     5627echo "$as_me:5627:" \
    56205628     "checking for Fortran 77 compiler version" >&5
    56215629ac_compiler=`set X $ac_compile; echo $2`
     
    57555763
    57565764G77=`test $ac_compiler_gnu = yes && echo yes`
    5757 ac_ext=c
    5758 ac_cpp='$CPP $CPPFLAGS'
    5759 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    5760 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    5761 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     5765ac_ext=cc
     5766ac_cpp='$CXXCPP $CPPFLAGS'
     5767ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     5768ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     5769ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    57625770
    57635771
     
    66846692   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    66856693   -e 's:$: $lt_compiler_flag:'`
    6686    (eval echo "\"\$as_me:6686: $lt_compile\"" >&5)
     6694   (eval echo "\"\$as_me:6694: $lt_compile\"" >&5)
    66876695   (eval "$lt_compile" 2>conftest.err)
    66886696   ac_status=$?
    66896697   cat conftest.err >&5
    6690    echo "$as_me:6690: \$? = $ac_status" >&5
     6698   echo "$as_me:6698: \$? = $ac_status" >&5
    66916699   if (exit $ac_status) && test -s "$ac_outfile"; then
    66926700     # The compiler can only warn and ignore the option if not recognized
     
    69526960   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    69536961   -e 's:$: $lt_compiler_flag:'`
    6954    (eval echo "\"\$as_me:6954: $lt_compile\"" >&5)
     6962   (eval echo "\"\$as_me:6962: $lt_compile\"" >&5)
    69556963   (eval "$lt_compile" 2>conftest.err)
    69566964   ac_status=$?
    69576965   cat conftest.err >&5
    6958    echo "$as_me:6958: \$? = $ac_status" >&5
     6966   echo "$as_me:6966: \$? = $ac_status" >&5
    69596967   if (exit $ac_status) && test -s "$ac_outfile"; then
    69606968     # The compiler can only warn and ignore the option if not recognized
     
    70567064   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70577065   -e 's:$: $lt_compiler_flag:'`
    7058    (eval echo "\"\$as_me:7058: $lt_compile\"" >&5)
     7066   (eval echo "\"\$as_me:7066: $lt_compile\"" >&5)
    70597067   (eval "$lt_compile" 2>out/conftest.err)
    70607068   ac_status=$?
    70617069   cat out/conftest.err >&5
    7062    echo "$as_me:7062: \$? = $ac_status" >&5
     7070   echo "$as_me:7070: \$? = $ac_status" >&5
    70637071   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    70647072   then
     
    94019409  lt_status=$lt_dlunknown
    94029410  cat > conftest.$ac_ext <<EOF
    9403 #line 9403 "configure"
     9411#line 9411 "configure"
    94049412#include "confdefs.h"
    94059413
     
    95019509  lt_status=$lt_dlunknown
    95029510  cat > conftest.$ac_ext <<EOF
    9503 #line 9503 "configure"
     9511#line 9511 "configure"
    95049512#include "confdefs.h"
    95059513
     
    1012510133
    1012610134
    10127 ac_ext=c
    10128 ac_cpp='$CPP $CPPFLAGS'
    10129 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    10130 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    10131 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     10135ac_ext=cc
     10136ac_cpp='$CXXCPP $CPPFLAGS'
     10137ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     10138ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     10139ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1013210140
    1013310141CC="$lt_save_CC"
     
    1184511853   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1184611854   -e 's:$: $lt_compiler_flag:'`
    11847    (eval echo "\"\$as_me:11847: $lt_compile\"" >&5)
     11855   (eval echo "\"\$as_me:11855: $lt_compile\"" >&5)
    1184811856   (eval "$lt_compile" 2>conftest.err)
    1184911857   ac_status=$?
    1185011858   cat conftest.err >&5
    11851    echo "$as_me:11851: \$? = $ac_status" >&5
     11859   echo "$as_me:11859: \$? = $ac_status" >&5
    1185211860   if (exit $ac_status) && test -s "$ac_outfile"; then
    1185311861     # The compiler can only warn and ignore the option if not recognized
     
    1194911957   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1195011958   -e 's:$: $lt_compiler_flag:'`
    11951    (eval echo "\"\$as_me:11951: $lt_compile\"" >&5)
     11959   (eval echo "\"\$as_me:11959: $lt_compile\"" >&5)
    1195211960   (eval "$lt_compile" 2>out/conftest.err)
    1195311961   ac_status=$?
    1195411962   cat out/conftest.err >&5
    11955    echo "$as_me:11955: \$? = $ac_status" >&5
     11963   echo "$as_me:11963: \$? = $ac_status" >&5
    1195611964   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1195711965   then
     
    1313613144
    1313713145
    13138 ac_ext=c
    13139 ac_cpp='$CPP $CPPFLAGS'
    13140 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    13141 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    13142 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     13146ac_ext=cc
     13147ac_cpp='$CXXCPP $CPPFLAGS'
     13148ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     13149ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     13150ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1314313151
    1314413152CC=$lt_save_CC
     
    1351913527   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1352013528   -e 's:$: $lt_compiler_flag:'`
    13521    (eval echo "\"\$as_me:13521: $lt_compile\"" >&5)
     13529   (eval echo "\"\$as_me:13529: $lt_compile\"" >&5)
    1352213530   (eval "$lt_compile" 2>conftest.err)
    1352313531   ac_status=$?
    1352413532   cat conftest.err >&5
    13525    echo "$as_me:13525: \$? = $ac_status" >&5
     13533   echo "$as_me:13533: \$? = $ac_status" >&5
    1352613534   if (exit $ac_status) && test -s "$ac_outfile"; then
    1352713535     # The compiler can only warn and ignore the option if not recognized
     
    1362313631   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1362413632   -e 's:$: $lt_compiler_flag:'`
    13625    (eval echo "\"\$as_me:13625: $lt_compile\"" >&5)
     13633   (eval echo "\"\$as_me:13633: $lt_compile\"" >&5)
    1362613634   (eval "$lt_compile" 2>out/conftest.err)
    1362713635   ac_status=$?
    1362813636   cat out/conftest.err >&5
    13629    echo "$as_me:13629: \$? = $ac_status" >&5
     13637   echo "$as_me:13637: \$? = $ac_status" >&5
    1363013638   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1363113639   then
     
    1572315731
    1572415732
    15725 ac_ext=c
    15726 ac_cpp='$CPP $CPPFLAGS'
    15727 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    15728 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    15729 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     15733ac_ext=cc
     15734ac_cpp='$CXXCPP $CPPFLAGS'
     15735ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     15736ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     15737ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1573015738
    1573115739CC="$lt_save_CC"
     
    1583015838   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1583115839   -e 's:$: $lt_compiler_flag:'`
    15832    (eval echo "\"\$as_me:15832: $lt_compile\"" >&5)
     15840   (eval echo "\"\$as_me:15840: $lt_compile\"" >&5)
    1583315841   (eval "$lt_compile" 2>conftest.err)
    1583415842   ac_status=$?
    1583515843   cat conftest.err >&5
    15836    echo "$as_me:15836: \$? = $ac_status" >&5
     15844   echo "$as_me:15844: \$? = $ac_status" >&5
    1583715845   if (exit $ac_status) && test -s "$ac_outfile"; then
    1583815846     # The compiler can only warn and ignore the option if not recognized
     
    1609816106   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1609916107   -e 's:$: $lt_compiler_flag:'`
    16100    (eval echo "\"\$as_me:16100: $lt_compile\"" >&5)
     16108   (eval echo "\"\$as_me:16108: $lt_compile\"" >&5)
    1610116109   (eval "$lt_compile" 2>conftest.err)
    1610216110   ac_status=$?
    1610316111   cat conftest.err >&5
    16104    echo "$as_me:16104: \$? = $ac_status" >&5
     16112   echo "$as_me:16112: \$? = $ac_status" >&5
    1610516113   if (exit $ac_status) && test -s "$ac_outfile"; then
    1610616114     # The compiler can only warn and ignore the option if not recognized
     
    1620216210   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1620316211   -e 's:$: $lt_compiler_flag:'`
    16204    (eval echo "\"\$as_me:16204: $lt_compile\"" >&5)
     16212   (eval echo "\"\$as_me:16212: $lt_compile\"" >&5)
    1620516213   (eval "$lt_compile" 2>out/conftest.err)
    1620616214   ac_status=$?
    1620716215   cat out/conftest.err >&5
    16208    echo "$as_me:16208: \$? = $ac_status" >&5
     16216   echo "$as_me:16216: \$? = $ac_status" >&5
    1620916217   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1621016218   then
     
    1667816686  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1667916687  (exit $ac_status); } &&
    16680          { ac_try='test -z "$ac_c_werror_flag"
     16688         { ac_try='test -z "$ac_cxx_werror_flag"
    1668116689                         || test ! -s conftest.err'
    1668216690  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1673916747  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1674016748  (exit $ac_status); } &&
    16741          { ac_try='test -z "$ac_c_werror_flag"
     16749         { ac_try='test -z "$ac_cxx_werror_flag"
    1674216750                         || test ! -s conftest.err'
    1674316751  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1832218330
    1832318331
    18324 ac_ext=c
    18325 ac_cpp='$CPP $CPPFLAGS'
    18326 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18327 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    18328 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     18332ac_ext=cc
     18333ac_cpp='$CXXCPP $CPPFLAGS'
     18334ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     18335ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     18336ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1832918337
    1833018338CC="$lt_save_CC"
     
    1880318811
    1880418812
    18805 ac_ext=c
    18806 ac_cpp='$CPP $CPPFLAGS'
    18807 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18808 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    18809 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     18813ac_ext=cc
     18814ac_cpp='$CXXCPP $CPPFLAGS'
     18815ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     18816ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     18817ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1881018818
    1881118819CC="$lt_save_CC"
     
    1950019508      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1950119509          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19502           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="`$CYGPATH_W \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"'` \$compile_deplibs\"'% \
    19503           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="`$CYGPATH_W \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"'` \$compile_deplibs\"'% \
     19510          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19511          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    1950419512          -e 's%lib /OUT:%lib -OUT:%' \
    1950519513          -e "s%cygpath -w%$CYGPATH_W%"\
     
    1997719985  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1997819986  (exit $ac_status); } &&
    19979          { ac_try='test -z "$ac_c_werror_flag"
     19987         { ac_try='test -z "$ac_cxx_werror_flag"
    1998019988                         || test ! -s conftest.err'
    1998119989  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2004520053  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2004620054  (exit $ac_status); } &&
    20047          { ac_try='test -z "$ac_c_werror_flag"
     20055         { ac_try='test -z "$ac_cxx_werror_flag"
    2004820056                         || test ! -s conftest.err'
    2004920057  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2018020188  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2018120189  (exit $ac_status); } &&
    20182          { ac_try='test -z "$ac_c_werror_flag"
     20190         { ac_try='test -z "$ac_cxx_werror_flag"
    2018320191                         || test ! -s conftest.err'
    2018420192  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2034320351  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2034420352  (exit $ac_status); } &&
    20345          { ac_try='test -z "$ac_c_werror_flag"
     20353         { ac_try='test -z "$ac_cxx_werror_flag"
    2034620354                         || test ! -s conftest.err'
    2034720355  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2056820576  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2056920577  (exit $ac_status); } &&
    20570          { ac_try='test -z "$ac_c_werror_flag"
     20578         { ac_try='test -z "$ac_cxx_werror_flag"
    2057120579                         || test ! -s conftest.err'
    2057220580  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2073120739  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2073220740  (exit $ac_status); } &&
    20733          { ac_try='test -z "$ac_c_werror_flag"
     20741         { ac_try='test -z "$ac_cxx_werror_flag"
    2073420742                         || test ! -s conftest.err'
    2073520743  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2098220990  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2098320991  (exit $ac_status); } &&
    20984          { ac_try='test -z "$ac_c_werror_flag"
     20992         { ac_try='test -z "$ac_cxx_werror_flag"
    2098520993                         || test ! -s conftest.err'
    2098620994  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  • trunk/Cbc/configure.ac

    r313 r317  
    4848# Check if user wants to produce debugging code
    4949AC_COIN_DEBUG_COMPILE
     50
     51# This package is written in C++
     52AC_LANG(C++)
    5053
    5154# Get the name of the C++ compiler and appropriate compiler options
  • trunk/Cbc/src/CbcTree.cpp

    r310 r317  
    204204  delete [] nodeArray;
    205205  delete [] depth;
    206 };
     206}
    207207
    208208// Return the best node of the heap using alternate criterion
  • trunk/Cbc/src/CbcTree.hpp

    r135 r317  
    5757  /// Return size
    5858  inline int size() const
    59   { return nodes_.size();};
     59  { return nodes_.size();}
    6060
    6161  /// [] operator
    6262  inline CbcNode * operator [] (int i) const
    63   { return nodes_[i];};
     63  { return nodes_[i];}
    6464
    6565  /// Return a node pointer
    6666  inline CbcNode * nodePointer (int i) const
    67   { return nodes_[i];};
     67  { return nodes_[i];}
    6868
    6969//@}
     
    8686
    8787  /// We may have got an intelligent tree so give it one more chance
    88   virtual void endSearch() {};
     88  virtual void endSearch() {}
    8989//@}
    9090protected:
  • trunk/Cbc/src/Makefile.am

    r316 r317  
    254254        echo "#endif" >>bla.tmp
    255255        if test -r ../inc/$(CONFIG_DIST); then \
    256           if diff ./inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>1 ; then \
     256          if diff ../inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>&1 ; then \
    257257            rm -f bla.tmp; \
    258258          else \
  • trunk/Cbc/src/Makefile.in

    r316 r317  
    924924        echo "#endif" >>bla.tmp
    925925        if test -r ../inc/$(CONFIG_DIST); then \
    926           if diff ./inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>1 ; then \
     926          if diff ../inc/$(CONFIG_DIST) bla.tmp >/dev/null 2>&1 ; then \
    927927            rm -f bla.tmp; \
    928928          else \
  • trunk/Cbc/test/Makefile.am

    r316 r317  
    1515# We are using the CLP solver executable to do the unit test
    1616
    17 test: ../src/cbc ../src/solve
    18         ../src/cbc -miplib -unitTest
    19         ../src/solve -unitTest -netlib
     17test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT)
     18        ../src/cbc$(EXEEXT) -miplib -unitTest
     19        ../src/solve$(EXEEXT) -unitTest -netlib
    2020
    2121.PHONY: test
  • trunk/Cbc/test/Makefile.in

    r316 r317  
    409409# We are using the CLP solver executable to do the unit test
    410410
    411 test: ../src/cbc ../src/solve
    412         ../src/cbc -miplib -unitTest
    413         ../src/solve -unitTest -netlib
     411test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT)
     412        ../src/cbc$(EXEEXT) -miplib -unitTest
     413        ../src/solve$(EXEEXT) -unitTest -netlib
    414414
    415415.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.