Changeset 88


Ignore:
Timestamp:
Oct 23, 2006 2:34:08 PM (12 years ago)
Author:
pbonami
Message:

Some forgotten configure scripts in last update

Location:
branches/devel/Bonmin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/Makefile.am

    r1 r88  
    1414
    1515# Here list all subdirectories into which to recurse
    16 SUBDIRS = src/IpoptInterface \
    17         src/BonminAmplInterface \
     16SUBDIRS = src/Interfaces \
    1817        src/OaInterface \
    1918        src/CbcBonmin \
     
    5756########################################################################
    5857
    59 .PHONY: doc test unitTest userman astyle
     58.PHONY: doc test unitTest userman astyle nodeSolver
    6059
    6160test: unitTest
     
    6362unitTest: all
    6463        cd test; make test
     64
     65nodeSolver: all
     66        cd src/Apps; make nodeSolver
    6567
    6668doc:    userman
     
    7173astyle:
    7274        cd src/IpoptInterface; $(MAKE) astyle
    73         cd src/BonminAmplInterface; $(MAKE) astyle
    7475        cd src/CbcBonmin; $(MAKE) astyle
    7576        cd src/OaInterface; $(MAKE) astyle
  • branches/devel/Bonmin/Makefile.in

    r64 r88  
    9393ETAGS = etags
    9494CTAGS = ctags
    95 DIST_SUBDIRS = src/IpoptInterface src/BonminAmplInterface \
    96         src/OaInterface src/CbcBonmin src/Apps experimental/FP \
    97         experimental/Bcp test
     95DIST_SUBDIRS = src/Interfaces src/OaInterface src/CbcBonmin src/Apps \
     96        experimental/FP experimental/Bcp test
    9897DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9998distdir = $(PACKAGE)-$(VERSION)
     
    323322
    324323# Here list all subdirectories into which to recurse
    325 SUBDIRS = src/IpoptInterface src/BonminAmplInterface src/OaInterface \
    326         src/CbcBonmin src/Apps $(am__append_1) $(am__append_2) \
    327         $(am__append_3)
     324SUBDIRS = src/Interfaces src/OaInterface src/CbcBonmin src/Apps \
     325        $(am__append_1) $(am__append_2) $(am__append_3)
    328326
    329327########################################################################
     
    789787########################################################################
    790788
    791 .PHONY: doc test unitTest userman astyle
     789.PHONY: doc test unitTest userman astyle nodeSolver
    792790
    793791test: unitTest
     
    796794        cd test; make test
    797795
     796nodeSolver: all
     797        cd src/Apps; make nodeSolver
     798
    798799doc:    userman
    799800
     
    803804astyle:
    804805        cd src/IpoptInterface; $(MAKE) astyle
    805         cd src/BonminAmplInterface; $(MAKE) astyle
    806806        cd src/CbcBonmin; $(MAKE) astyle
    807807        cd src/OaInterface; $(MAKE) astyle
  • branches/devel/Bonmin/configure

    r64 r88  
    10761076  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    10771077  --enable-debug          compile all projects with debug options tests
     1078  --enable-doscompile     Under Cygwin, compile so that executables run under
     1079                          DOS (default: disabled)
    10781080  --enable-static[=PKGS]
    10791081                          build static libraries [default=no]
     
    17811783    ;;
    17821784esac
     1785
     1786# Check whether --enable-doscompile or --disable-doscompile was given.
     1787if test "${enable_doscompile+set}" = set; then
     1788  enableval="$enable_doscompile"
     1789  if test "$enable_doscompile = yes"; then
     1790  case $build in
     1791    *-cygwin*) ;;
     1792    *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes only sense under Cygwin" >&5
     1793echo "$as_me: error: --enable-doscompile option makes only sense under Cygwin" >&2;}
     1794   { (exit 1); exit 1; }; } ;;
     1795  esac
     1796fi
     1797else
     1798  enable_doscompile=no
     1799fi;
     1800
    17831801
    17841802
     
    25622580        coin_dbg_cflags="-g"
    25632581        coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
    2564 
    2565         case $build in
    2566           *-cygwin*)
    2567             CFLAGS="-mno-cygwin"
    2568             cat >conftest.$ac_ext <<_ACEOF
     2582        if test "$enable_doscompile" = yes; then
     2583          case $build in
     2584            *-cygwin*)
     2585              CFLAGS="-mno-cygwin"
     2586              cat >conftest.$ac_ext <<_ACEOF
    25692587/* confdefs.h.  */
    25702588_ACEOF
     
    26112629rm -f conftest.err conftest.$ac_objext \
    26122630      conftest$ac_exeext conftest.$ac_ext
    2613             CFLAGS=
    2614           ;;
    2615         esac
    2616         ;;
     2631              CFLAGS=
     2632            ;;
     2633          esac
     2634        fi
    26172635    esac
    26182636  fi
     
    29382956
    29392957 #Let's try if that overcomes configuration problem with VC++ 6.0
     2958
    29402959ac_ext=cc
    29412960ac_cpp='$CXXCPP $CPPFLAGS'
     
    33463365        coin_dbg_cxxflags="-g"
    33473366        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    3348 
    3349         case $build in
    3350           *-cygwin*)
    3351             CXXFLAGS="-mno-cygwin"
    3352             cat >conftest.$ac_ext <<_ACEOF
     3367        if test "$enable_doscompile" = yes; then
     3368          case $build in
     3369            *-cygwin*)
     3370              CXXFLAGS="-mno-cygwin"
     3371              cat >conftest.$ac_ext <<_ACEOF
    33533372/* confdefs.h.  */
    33543373_ACEOF
     
    33953414rm -f conftest.err conftest.$ac_objext \
    33963415      conftest$ac_exeext conftest.$ac_ext
    3397             CXXFLAGS=
    3398             ;;
    3399         esac
    3400         ;;
     3416              CXXFLAGS=
     3417              ;;
     3418          esac
     3419        fi
    34013420    esac
    34023421  fi
     
    47364755*-*-irix6*)
    47374756  # Find out which ABI we are using.
    4738   echo '#line 4738 "configure"' > conftest.$ac_ext
     4757  echo '#line 4757 "configure"' > conftest.$ac_ext
    47394758  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    47404759  (eval $ac_compile) 2>&5
     
    58705889
    58715890# Provide some information about the compiler.
    5872 echo "$as_me:5872:" \
     5891echo "$as_me:5891:" \
    58735892     "checking for Fortran 77 compiler version" >&5
    58745893ac_compiler=`set X $ac_compile; echo $2`
     
    69376956   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    69386957   -e 's:$: $lt_compiler_flag:'`
    6939    (eval echo "\"\$as_me:6939: $lt_compile\"" >&5)
     6958   (eval echo "\"\$as_me:6958: $lt_compile\"" >&5)
    69406959   (eval "$lt_compile" 2>conftest.err)
    69416960   ac_status=$?
    69426961   cat conftest.err >&5
    6943    echo "$as_me:6943: \$? = $ac_status" >&5
     6962   echo "$as_me:6962: \$? = $ac_status" >&5
    69446963   if (exit $ac_status) && test -s "$ac_outfile"; then
    69456964     # The compiler can only warn and ignore the option if not recognized
     
    72057224   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    72067225   -e 's:$: $lt_compiler_flag:'`
    7207    (eval echo "\"\$as_me:7207: $lt_compile\"" >&5)
     7226   (eval echo "\"\$as_me:7226: $lt_compile\"" >&5)
    72087227   (eval "$lt_compile" 2>conftest.err)
    72097228   ac_status=$?
    72107229   cat conftest.err >&5
    7211    echo "$as_me:7211: \$? = $ac_status" >&5
     7230   echo "$as_me:7230: \$? = $ac_status" >&5
    72127231   if (exit $ac_status) && test -s "$ac_outfile"; then
    72137232     # The compiler can only warn and ignore the option if not recognized
     
    73097328   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    73107329   -e 's:$: $lt_compiler_flag:'`
    7311    (eval echo "\"\$as_me:7311: $lt_compile\"" >&5)
     7330   (eval echo "\"\$as_me:7330: $lt_compile\"" >&5)
    73127331   (eval "$lt_compile" 2>out/conftest.err)
    73137332   ac_status=$?
    73147333   cat out/conftest.err >&5
    7315    echo "$as_me:7315: \$? = $ac_status" >&5
     7334   echo "$as_me:7334: \$? = $ac_status" >&5
    73167335   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    73177336   then
     
    96549673  lt_status=$lt_dlunknown
    96559674  cat > conftest.$ac_ext <<EOF
    9656 #line 9656 "configure"
     9675#line 9675 "configure"
    96579676#include "confdefs.h"
    96589677
     
    97549773  lt_status=$lt_dlunknown
    97559774  cat > conftest.$ac_ext <<EOF
    9756 #line 9756 "configure"
     9775#line 9775 "configure"
    97579776#include "confdefs.h"
    97589777
     
    1209812117   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1209912118   -e 's:$: $lt_compiler_flag:'`
    12100    (eval echo "\"\$as_me:12100: $lt_compile\"" >&5)
     12119   (eval echo "\"\$as_me:12119: $lt_compile\"" >&5)
    1210112120   (eval "$lt_compile" 2>conftest.err)
    1210212121   ac_status=$?
    1210312122   cat conftest.err >&5
    12104    echo "$as_me:12104: \$? = $ac_status" >&5
     12123   echo "$as_me:12123: \$? = $ac_status" >&5
    1210512124   if (exit $ac_status) && test -s "$ac_outfile"; then
    1210612125     # The compiler can only warn and ignore the option if not recognized
     
    1220212221   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1220312222   -e 's:$: $lt_compiler_flag:'`
    12204    (eval echo "\"\$as_me:12204: $lt_compile\"" >&5)
     12223   (eval echo "\"\$as_me:12223: $lt_compile\"" >&5)
    1220512224   (eval "$lt_compile" 2>out/conftest.err)
    1220612225   ac_status=$?
    1220712226   cat out/conftest.err >&5
    12208    echo "$as_me:12208: \$? = $ac_status" >&5
     12227   echo "$as_me:12227: \$? = $ac_status" >&5
    1220912228   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1221012229   then
     
    1377213791   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1377313792   -e 's:$: $lt_compiler_flag:'`
    13774    (eval echo "\"\$as_me:13774: $lt_compile\"" >&5)
     13793   (eval echo "\"\$as_me:13793: $lt_compile\"" >&5)
    1377513794   (eval "$lt_compile" 2>conftest.err)
    1377613795   ac_status=$?
    1377713796   cat conftest.err >&5
    13778    echo "$as_me:13778: \$? = $ac_status" >&5
     13797   echo "$as_me:13797: \$? = $ac_status" >&5
    1377913798   if (exit $ac_status) && test -s "$ac_outfile"; then
    1378013799     # The compiler can only warn and ignore the option if not recognized
     
    1387613895   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1387713896   -e 's:$: $lt_compiler_flag:'`
    13878    (eval echo "\"\$as_me:13878: $lt_compile\"" >&5)
     13897   (eval echo "\"\$as_me:13897: $lt_compile\"" >&5)
    1387913898   (eval "$lt_compile" 2>out/conftest.err)
    1388013899   ac_status=$?
    1388113900   cat out/conftest.err >&5
    13882    echo "$as_me:13882: \$? = $ac_status" >&5
     13901   echo "$as_me:13901: \$? = $ac_status" >&5
    1388313902   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1388413903   then
     
    1608316102   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1608416103   -e 's:$: $lt_compiler_flag:'`
    16085    (eval echo "\"\$as_me:16085: $lt_compile\"" >&5)
     16104   (eval echo "\"\$as_me:16104: $lt_compile\"" >&5)
    1608616105   (eval "$lt_compile" 2>conftest.err)
    1608716106   ac_status=$?
    1608816107   cat conftest.err >&5
    16089    echo "$as_me:16089: \$? = $ac_status" >&5
     16108   echo "$as_me:16108: \$? = $ac_status" >&5
    1609016109   if (exit $ac_status) && test -s "$ac_outfile"; then
    1609116110     # The compiler can only warn and ignore the option if not recognized
     
    1635116370   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1635216371   -e 's:$: $lt_compiler_flag:'`
    16353    (eval echo "\"\$as_me:16353: $lt_compile\"" >&5)
     16372   (eval echo "\"\$as_me:16372: $lt_compile\"" >&5)
    1635416373   (eval "$lt_compile" 2>conftest.err)
    1635516374   ac_status=$?
    1635616375   cat conftest.err >&5
    16357    echo "$as_me:16357: \$? = $ac_status" >&5
     16376   echo "$as_me:16376: \$? = $ac_status" >&5
    1635816377   if (exit $ac_status) && test -s "$ac_outfile"; then
    1635916378     # The compiler can only warn and ignore the option if not recognized
     
    1645516474   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1645616475   -e 's:$: $lt_compiler_flag:'`
    16457    (eval echo "\"\$as_me:16457: $lt_compile\"" >&5)
     16476   (eval echo "\"\$as_me:16476: $lt_compile\"" >&5)
    1645816477   (eval "$lt_compile" 2>out/conftest.err)
    1645916478   ac_status=$?
    1646016479   cat out/conftest.err >&5
    16461    echo "$as_me:16461: \$? = $ac_status" >&5
     16480   echo "$as_me:16480: \$? = $ac_status" >&5
    1646216481   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1646316482   then
     
    2190221921##############################################################################
    2190321922
    21904                                                                                                     ac_config_files="$ac_config_files Makefile src/Apps/Makefile experimental/Bcp/Makefile src/CbcBonmin/Makefile src/IpoptInterface/Makefile src/BonminAmplInterface/Makefile src/OaInterface/Makefile experimental/FP/Makefile test/Makefile examples/CppExample/Makefile"
     21923                                                                                                                        ac_config_files="$ac_config_files Makefile src/Apps/Makefile experimental/Bcp/Makefile src/CbcBonmin/Makefile src/Interfaces/Makefile src/Interfaces/Ipopt/Makefile src/Interfaces/Filter/Makefile src/Interfaces/Ampl/Makefile src/OaInterface/Makefile experimental/FP/Makefile test/Makefile examples/CppExample/Makefile"
    2190521924
    2190621925
     
    2265022669  "experimental/Bcp/Makefile" ) CONFIG_FILES="$CONFIG_FILES experimental/Bcp/Makefile" ;;
    2265122670  "src/CbcBonmin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/CbcBonmin/Makefile" ;;
    22652   "src/IpoptInterface/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/IpoptInterface/Makefile" ;;
    22653   "src/BonminAmplInterface/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/BonminAmplInterface/Makefile" ;;
     22671  "src/Interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Interfaces/Makefile" ;;
     22672  "src/Interfaces/Ipopt/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Interfaces/Ipopt/Makefile" ;;
     22673  "src/Interfaces/Filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Interfaces/Filter/Makefile" ;;
     22674  "src/Interfaces/Ampl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Interfaces/Ampl/Makefile" ;;
    2265422675  "src/OaInterface/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/OaInterface/Makefile" ;;
    2265522676  "experimental/FP/Makefile" ) CONFIG_FILES="$CONFIG_FILES experimental/FP/Makefile" ;;
  • branches/devel/Bonmin/configure.ac

    r64 r88  
    126126                 experimental/Bcp/Makefile
    127127                 src/CbcBonmin/Makefile
    128                  src/IpoptInterface/Makefile
    129                  src/BonminAmplInterface/Makefile
     128                 src/Interfaces/Makefile
     129                 src/Interfaces/Ipopt/Makefile
     130                 src/Interfaces/Filter/Makefile
     131                 src/Interfaces/Ampl/Makefile
    130132                 src/OaInterface/Makefile
    131133                 experimental/FP/Makefile
Note: See TracChangeset for help on using the changeset viewer.