Changeset 1483


Ignore:
Timestamp:
Jul 18, 2010 9:20:41 AM (9 years ago)
Author:
stefan
Message:

rerun autotools

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1480 r1483  
    2074620746  coin_has_coindepend=yes
    2074720747       COINDEPEND_LIBS="$withval"
    20748        ADDLIBS="$ADDLIBS $withval"
     20748       ADDLIBS="$withval $ADDLIBS"
    2074920749
    2075020750fi;
     
    2109821098    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
    2109921099
    21100     ADDLIBS="$ADDLIBS $COINUTILS_LIBS"
     21100    ADDLIBS="$COINUTILS_LIBS $ADDLIBS"
    2110121101       REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
    2110221102
     
    2116221162    OSI_DATA=`sed -n -e 's/datadir=//gp' ../Osi/osi-uninstalled.pc`
    2116321163
    21164     ADDLIBS="$ADDLIBS $OSI_LIBS"
     21164    ADDLIBS="$OSI_LIBS $ADDLIBS"
    2116521165       REQUIREDPACKAGES="osi $REQUIREDPACKAGES"
    2116621166
     
    2122621226    CGL_DATA=`sed -n -e 's/datadir=//gp' ../Cgl/cgl-uninstalled.pc`
    2122721227
    21228     ADDLIBS="$ADDLIBS $CGL_LIBS"
     21228    ADDLIBS="$CGL_LIBS $ADDLIBS"
    2122921229       REQUIREDPACKAGES="cgl $REQUIREDPACKAGES"
    2123021230
     
    2130721307  coin_has_clp=yes
    2130821308       CLP_LIBS="$withval"
    21309        ADDLIBS="$ADDLIBS $withval"
     21309       ADDLIBS="$withval $ADDLIBS"
    2131021310
    2131121311fi;
     
    2147221472    CLP_DATA=`sed -n -e 's/datadir=//gp' ../Clp/clp-uninstalled.pc`
    2147321473
    21474     ADDLIBS="$ADDLIBS $CLP_LIBS"
     21474    ADDLIBS="$CLP_LIBS $ADDLIBS"
    2147521475       REQUIREDPACKAGES="clp $REQUIREDPACKAGES"
    2147621476
     
    2155321553    OSICLP_DATA=`sed -n -e 's/datadir=//gp' ../Clp/osi-clp-uninstalled.pc`
    2155421554
    21555     ADDLIBS="$ADDLIBS $OSICLP_LIBS"
     21555    ADDLIBS="$OSICLP_LIBS $ADDLIBS"
    2155621556       REQUIREDPACKAGES="osi-clp $REQUIREDPACKAGES"
    2155721557
     
    2161821618  coin_has_dylp=yes
    2161921619       DYLP_LIBS="$withval"
    21620        ADDLIBS="$ADDLIBS $withval"
     21620       ADDLIBS="$withval $ADDLIBS"
    2162121621
    2162221622fi;
     
    2177021770  coin_has_vol=yes
    2177121771       VOL_LIBS="$withval"
    21772        ADDLIBS="$ADDLIBS $withval"
     21772       ADDLIBS="$withval $ADDLIBS"
    2177321773
    2177421774fi;
     
    2283722837  coin_has_cpx=yes
    2283822838       CPX_LIBS="$withval"
    22839        ADDLIBS="$ADDLIBS $withval"
     22839       ADDLIBS="$withval $ADDLIBS"
    2284022840
    2284122841fi;
     
    2298922989  coin_has_glpk=yes
    2299022990       GLPK_LIBS="$withval"
    22991        ADDLIBS="$ADDLIBS $withval"
     22991       ADDLIBS="$withval $ADDLIBS"
    2299222992
    2299322993fi;
     
    2314123141  coin_has_grb=yes
    2314223142       GRB_LIBS="$withval"
    23143        ADDLIBS="$ADDLIBS $withval"
     23143       ADDLIBS="$withval $ADDLIBS"
    2314423144
    2314523145fi;
     
    2329323293  coin_has_msk=yes
    2329423294       MSK_LIBS="$withval"
    23295        ADDLIBS="$ADDLIBS $withval"
     23295       ADDLIBS="$withval $ADDLIBS"
    2329623296
    2329723297fi;
     
    2344523445  coin_has_spx=yes
    2344623446       SPX_LIBS="$withval"
    23447        ADDLIBS="$ADDLIBS $withval"
     23447       ADDLIBS="$withval $ADDLIBS"
    2344823448
    2344923449fi;
     
    2359723597  coin_has_xpr=yes
    2359823598       XPR_LIBS="$withval"
    23599        ADDLIBS="$ADDLIBS $withval"
     23599       ADDLIBS="$withval $ADDLIBS"
    2360023600
    2360123601fi;
  • trunk/Makefile.am

    r527 r1483  
    4747
    4848# Files that are generated and should be cleaned with make distclean
    49 DISTCLEANFILES =
     49DISTCLEANFILES = coin_subdirs.txt
    5050
    5151include BuildTools/Makemain.inc
  • trunk/Makefile.in

    r1464 r1483  
    246246
    247247# Files that are generated and should be cleaned with make distclean
    248 DISTCLEANFILES = $(am__append_2) $(VPATH_DISTCLEANFILES)
     248DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
     249        $(VPATH_DISTCLEANFILES)
    249250DocFiles = README AUTHORS LICENSE
    250251DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
  • trunk/configure

    r1464 r1483  
    11441144  --with-blas-incdir directory with header files for using project Blas
    11451145  --with-blas-datadir directory with data files for using project Blas
     1146  --with-blas             specify BLAS library (or BUILD for compilation)
    11461147  --with-lapack-lib linker flags for using project Lapack
    11471148  --with-lapack-incdir directory with header files for using project Lapack
    11481149  --with-lapack-datadir directory with data files for using project Lapack
     1150  --with-lapack           specify LAPACK library (or BUILD for compilation)
    11491151  --with-sample-lib linker flags for using project Sample
    11501152  --with-sample-incdir directory with header files for using project Sample
     
    26992701        ;;
    27002702      *)
    2701         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2703        coin_opt_cflags="-O3"
    27022704        coin_add_cflags="-pipe"
    27032705        coin_dbg_cflags="-g"
     
    36133615      *)
    36143616# ToDo decide about unroll-loops
    3615         coin_opt_cxxflags="-O3 -fomit-frame-pointer"
     3617        coin_opt_cxxflags="-O3"
    36163618        coin_add_cxxflags="-pipe"
    36173619        coin_dbg_cxxflags="-g"
     
    42164218
    42174219# Provide some information about the compiler.
    4218 echo "$as_me:4218:" \
     4220echo "$as_me:4220:" \
    42194221     "checking for Fortran 77 compiler version" >&5
    42204222ac_compiler=`set X $ac_compile; echo $2`
     
    43824384
    43834385  if test "$G77" = "yes"; then
    4384     coin_opt_fflags="-O3 -fomit-frame-pointer"
     4386    coin_opt_fflags="-O3"
    43854387    coin_add_fflags="-pipe"
    43864388    coin_dbg_fflags="-g"
     
    64756477*-*-irix6*)
    64766478  # Find out which ABI we are using.
    6477   echo '#line 6477 "configure"' > conftest.$ac_ext
     6479  echo '#line 6479 "configure"' > conftest.$ac_ext
    64786480  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64796481  (eval $ac_compile) 2>&5
     
    84398441   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84408442   -e 's:$: $lt_compiler_flag:'`
    8441    (eval echo "\"\$as_me:8441: $lt_compile\"" >&5)
     8443   (eval echo "\"\$as_me:8443: $lt_compile\"" >&5)
    84428444   (eval "$lt_compile" 2>conftest.err)
    84438445   ac_status=$?
    84448446   cat conftest.err >&5
    8445    echo "$as_me:8445: \$? = $ac_status" >&5
     8447   echo "$as_me:8447: \$? = $ac_status" >&5
    84468448   if (exit $ac_status) && test -s "$ac_outfile"; then
    84478449     # The compiler can only warn and ignore the option if not recognized
     
    87078709   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87088710   -e 's:$: $lt_compiler_flag:'`
    8709    (eval echo "\"\$as_me:8709: $lt_compile\"" >&5)
     8711   (eval echo "\"\$as_me:8711: $lt_compile\"" >&5)
    87108712   (eval "$lt_compile" 2>conftest.err)
    87118713   ac_status=$?
    87128714   cat conftest.err >&5
    8713    echo "$as_me:8713: \$? = $ac_status" >&5
     8715   echo "$as_me:8715: \$? = $ac_status" >&5
    87148716   if (exit $ac_status) && test -s "$ac_outfile"; then
    87158717     # The compiler can only warn and ignore the option if not recognized
     
    88118813   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    88128814   -e 's:$: $lt_compiler_flag:'`
    8813    (eval echo "\"\$as_me:8813: $lt_compile\"" >&5)
     8815   (eval echo "\"\$as_me:8815: $lt_compile\"" >&5)
    88148816   (eval "$lt_compile" 2>out/conftest.err)
    88158817   ac_status=$?
    88168818   cat out/conftest.err >&5
    8817    echo "$as_me:8817: \$? = $ac_status" >&5
     8819   echo "$as_me:8819: \$? = $ac_status" >&5
    88188820   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    88198821   then
     
    1115611158  lt_status=$lt_dlunknown
    1115711159  cat > conftest.$ac_ext <<EOF
    11158 #line 11158 "configure"
     11160#line 11160 "configure"
    1115911161#include "confdefs.h"
    1116011162
     
    1125611258  lt_status=$lt_dlunknown
    1125711259  cat > conftest.$ac_ext <<EOF
    11258 #line 11258 "configure"
     11260#line 11260 "configure"
    1125911261#include "confdefs.h"
    1126011262
     
    1360013602   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1360113603   -e 's:$: $lt_compiler_flag:'`
    13602    (eval echo "\"\$as_me:13602: $lt_compile\"" >&5)
     13604   (eval echo "\"\$as_me:13604: $lt_compile\"" >&5)
    1360313605   (eval "$lt_compile" 2>conftest.err)
    1360413606   ac_status=$?
    1360513607   cat conftest.err >&5
    13606    echo "$as_me:13606: \$? = $ac_status" >&5
     13608   echo "$as_me:13608: \$? = $ac_status" >&5
    1360713609   if (exit $ac_status) && test -s "$ac_outfile"; then
    1360813610     # The compiler can only warn and ignore the option if not recognized
     
    1370413706   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1370513707   -e 's:$: $lt_compiler_flag:'`
    13706    (eval echo "\"\$as_me:13706: $lt_compile\"" >&5)
     13708   (eval echo "\"\$as_me:13708: $lt_compile\"" >&5)
    1370713709   (eval "$lt_compile" 2>out/conftest.err)
    1370813710   ac_status=$?
    1370913711   cat out/conftest.err >&5
    13710    echo "$as_me:13710: \$? = $ac_status" >&5
     13712   echo "$as_me:13712: \$? = $ac_status" >&5
    1371113713   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1371213714   then
     
    1527415276   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1527515277   -e 's:$: $lt_compiler_flag:'`
    15276    (eval echo "\"\$as_me:15276: $lt_compile\"" >&5)
     15278   (eval echo "\"\$as_me:15278: $lt_compile\"" >&5)
    1527715279   (eval "$lt_compile" 2>conftest.err)
    1527815280   ac_status=$?
    1527915281   cat conftest.err >&5
    15280    echo "$as_me:15280: \$? = $ac_status" >&5
     15282   echo "$as_me:15282: \$? = $ac_status" >&5
    1528115283   if (exit $ac_status) && test -s "$ac_outfile"; then
    1528215284     # The compiler can only warn and ignore the option if not recognized
     
    1537815380   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1537915381   -e 's:$: $lt_compiler_flag:'`
    15380    (eval echo "\"\$as_me:15380: $lt_compile\"" >&5)
     15382   (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
    1538115383   (eval "$lt_compile" 2>out/conftest.err)
    1538215384   ac_status=$?
    1538315385   cat out/conftest.err >&5
    15384    echo "$as_me:15384: \$? = $ac_status" >&5
     15386   echo "$as_me:15386: \$? = $ac_status" >&5
    1538515387   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1538615388   then
     
    1758517587   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1758617588   -e 's:$: $lt_compiler_flag:'`
    17587    (eval echo "\"\$as_me:17587: $lt_compile\"" >&5)
     17589   (eval echo "\"\$as_me:17589: $lt_compile\"" >&5)
    1758817590   (eval "$lt_compile" 2>conftest.err)
    1758917591   ac_status=$?
    1759017592   cat conftest.err >&5
    17591    echo "$as_me:17591: \$? = $ac_status" >&5
     17593   echo "$as_me:17593: \$? = $ac_status" >&5
    1759217594   if (exit $ac_status) && test -s "$ac_outfile"; then
    1759317595     # The compiler can only warn and ignore the option if not recognized
     
    1785317855   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1785417856   -e 's:$: $lt_compiler_flag:'`
    17855    (eval echo "\"\$as_me:17855: $lt_compile\"" >&5)
     17857   (eval echo "\"\$as_me:17857: $lt_compile\"" >&5)
    1785617858   (eval "$lt_compile" 2>conftest.err)
    1785717859   ac_status=$?
    1785817860   cat conftest.err >&5
    17859    echo "$as_me:17859: \$? = $ac_status" >&5
     17861   echo "$as_me:17861: \$? = $ac_status" >&5
    1786017862   if (exit $ac_status) && test -s "$ac_outfile"; then
    1786117863     # The compiler can only warn and ignore the option if not recognized
     
    1795717959   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1795817960   -e 's:$: $lt_compiler_flag:'`
    17959    (eval echo "\"\$as_me:17959: $lt_compile\"" >&5)
     17961   (eval echo "\"\$as_me:17961: $lt_compile\"" >&5)
    1796017962   (eval "$lt_compile" 2>out/conftest.err)
    1796117963   ac_status=$?
    1796217964   cat out/conftest.err >&5
    17963    echo "$as_me:17963: \$? = $ac_status" >&5
     17965   echo "$as_me:17965: \$? = $ac_status" >&5
    1796417966   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1796517967   then
     
    2075620758      if test "$GXX" = "yes"; then
    2075720759        RPATH_FLAGS=
    20758         for dir in $abs_lib_dir; do
     20760        for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
    2075920761          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2076020762        done
     
    2077320775    *-*-solaris*)
    2077420776        RPATH_FLAGS=
    20775         for dir in $abs_lib_dir; do
     20777        for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
    2077620778          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2077720779        done
     
    2109421096  coin_has_blas=installed
    2109521097fi;
     21098
     21099
     21100    #--with-blas can overwrite --with-blas-lib, and can be set to BUILD to enforce building blas
     21101
     21102# Check whether --with-blas or --without-blas was given.
     21103if test "${with_blas+set}" = set; then
     21104  withval="$with_blas"
     21105  if test x$withval = "xBUILD" ; then
     21106           coin_has_blas=notGiven
     21107         else
     21108           coin_has_blas=installed
     21109         fi
     21110fi;
     21111
     21112
     21113
    2109621114fi
    2109721115
     
    2114621164if test "$coin_has_blas" = notGiven; then
    2114721165  if test -d $srcdir/ThirdParty/Blas; then
     21166    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21167    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21168    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2114821169    for i in $srcdir/ThirdParty/Blas/daxpy.f; do
    2114921170         if test -r $i; then
     
    2122821249  coin_has_lapack=installed
    2122921250fi;
     21251
     21252
     21253
     21254
     21255    #--with-lapack can overwrite --with-lapack-lib, and can be set to BUILD to enforce building lapack
     21256
     21257# Check whether --with-lapack or --without-lapack was given.
     21258if test "${with_lapack+set}" = set; then
     21259  withval="$with_lapack"
     21260  if test x$withval = "xBUILD" ; then
     21261           coin_has_lapack=notGiven
     21262         else
     21263           coin_has_lapack=installed
     21264         fi
     21265fi;
     21266
    2123021267fi
    2123121268
     
    2128021317if test "$coin_has_lapack" = notGiven; then
    2128121318  if test -d $srcdir/ThirdParty/Lapack; then
     21319    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21320    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21321    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2128221322    for i in $srcdir/ThirdParty/Lapack/LAPACK/SRC/dlarf.f; do
    2128321323         if test -r $i; then
     
    2136221402  coin_has_sample=installed
    2136321403fi;
     21404
     21405
     21406
     21407
     21408
    2136421409fi
    2136521410
     
    2141421459if test "$coin_has_sample" = notGiven; then
    2141521460  if test -d $srcdir/Data/Sample; then
     21461    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21462    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21463    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2141621464     coin_have_project_dir=yes
    2141721465
     
    2149221540  coin_has_netlib=installed
    2149321541fi;
     21542
     21543
     21544
     21545
     21546
    2149421547fi
    2149521548
     
    2154421597if test "$coin_has_netlib" = notGiven; then
    2154521598  if test -d $srcdir/Data/Netlib; then
     21599    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21600    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21601    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2154621602     coin_have_project_dir=yes
    2154721603
     
    2162221678  coin_has_miblib3=installed
    2162321679fi;
     21680
     21681
     21682
     21683
     21684
    2162421685fi
    2162521686
     
    2167421735if test "$coin_has_miblib3" = notGiven; then
    2167521736  if test -d $srcdir/Data/miblib3; then
     21737    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21738    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21739    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2167621740     coin_have_project_dir=yes
    2167721741
     
    2175221816  coin_has_coinutils=installed
    2175321817fi;
     21818
     21819
     21820
     21821
     21822
    2175421823fi
    2175521824
     
    2180421873if test "$coin_has_coinutils" = notGiven; then
    2180521874  if test -d $srcdir//CoinUtils; then
     21875    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21876    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21877    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2180621878     coin_have_project_dir=yes
    2180721879
    2180821880    if test $coin_have_project_dir = yes; then
    21809       coin_has_coinutils=/CoinUtils
     21881      coin_has_coinutils=CoinUtils
    2181021882    fi
    2181121883  fi
     
    2181921891if test "$coin_have_project_dir" = yes ; then
    2182021892
    21821   if test -r $srcdir//CoinUtils/configure; then
     21893  if test -r $srcdir/CoinUtils/configure; then
    2182221894    coin_subdirs="$coin_subdirs CoinUtils"
    2182321895    echo "$as_me:$LINENO: result: yes" >&5
     
    2188221954  coin_has_osi=installed
    2188321955fi;
     21956
     21957
     21958
     21959
     21960
    2188421961fi
    2188521962
     
    2193422011if test "$coin_has_osi" = notGiven; then
    2193522012  if test -d $srcdir//Osi; then
     22013    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22014    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22015    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2193622016     coin_have_project_dir=yes
    2193722017
    2193822018    if test $coin_have_project_dir = yes; then
    21939       coin_has_osi=/Osi
     22019      coin_has_osi=Osi
    2194022020    fi
    2194122021  fi
     
    2194922029if test "$coin_have_project_dir" = yes ; then
    2195022030
    21951   if test -r $srcdir//Osi/configure; then
     22031  if test -r $srcdir/Osi/configure; then
    2195222032    coin_subdirs="$coin_subdirs Osi"
    2195322033    echo "$as_me:$LINENO: result: yes" >&5
     
    2201222092  coin_has_clp=installed
    2201322093fi;
     22094
     22095
     22096
     22097
     22098
    2201422099fi
    2201522100
     
    2206422149if test "$coin_has_clp" = notGiven; then
    2206522150  if test -d $srcdir//Clp; then
     22151    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22152    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22153    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2206622154     coin_have_project_dir=yes
    2206722155
    2206822156    if test $coin_have_project_dir = yes; then
    22069       coin_has_clp=/Clp
     22157      coin_has_clp=Clp
    2207022158    fi
    2207122159  fi
     
    2207922167if test "$coin_have_project_dir" = yes ; then
    2208022168
    22081   if test -r $srcdir//Clp/configure; then
     22169  if test -r $srcdir/Clp/configure; then
    2208222170    coin_subdirs="$coin_subdirs Clp"
    2208322171    echo "$as_me:$LINENO: result: yes" >&5
     
    2214222230  coin_has_dylp=installed
    2214322231fi;
     22232
     22233
     22234
     22235
     22236
    2214422237fi
    2214522238
     
    2219422287if test "$coin_has_dylp" = notGiven; then
    2219522288  if test -d $srcdir//DyLP; then
     22289    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22290    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22291    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2219622292     coin_have_project_dir=yes
    2219722293
    2219822294    if test $coin_have_project_dir = yes; then
    22199       coin_has_dylp=/DyLP
     22295      coin_has_dylp=DyLP
    2220022296    fi
    2220122297  fi
     
    2220922305if test "$coin_have_project_dir" = yes ; then
    2221022306
    22211   if test -r $srcdir//DyLP/configure; then
     22307  if test -r $srcdir/DyLP/configure; then
    2221222308    coin_subdirs="$coin_subdirs DyLP"
    2221322309    echo "$as_me:$LINENO: result: yes" >&5
     
    2227222368  coin_has_vol=installed
    2227322369fi;
     22370
     22371
     22372
     22373
     22374
    2227422375fi
    2227522376
     
    2232422425if test "$coin_has_vol" = notGiven; then
    2232522426  if test -d $srcdir//Vol; then
     22427    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22428    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22429    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2232622430     coin_have_project_dir=yes
    2232722431
    2232822432    if test $coin_have_project_dir = yes; then
    22329       coin_has_vol=/Vol
     22433      coin_has_vol=Vol
    2233022434    fi
    2233122435  fi
     
    2233922443if test "$coin_have_project_dir" = yes ; then
    2234022444
    22341   if test -r $srcdir//Vol/configure; then
     22445  if test -r $srcdir/Vol/configure; then
    2234222446    coin_subdirs="$coin_subdirs Vol"
    2234322447    echo "$as_me:$LINENO: result: yes" >&5
     
    2240222506  coin_has_cgl=installed
    2240322507fi;
     22508
     22509
     22510
     22511
     22512
    2240422513fi
    2240522514
     
    2245422563if test "$coin_has_cgl" = notGiven; then
    2245522564  if test -d $srcdir//Cgl; then
     22565    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22566    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22567    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2245622568     coin_have_project_dir=yes
    2245722569
    2245822570    if test $coin_have_project_dir = yes; then
    22459       coin_has_cgl=/Cgl
     22571      coin_has_cgl=Cgl
    2246022572    fi
    2246122573  fi
     
    2246922581if test "$coin_have_project_dir" = yes ; then
    2247022582
    22471   if test -r $srcdir//Cgl/configure; then
     22583  if test -r $srcdir/Cgl/configure; then
    2247222584    coin_subdirs="$coin_subdirs Cgl"
    2247322585    echo "$as_me:$LINENO: result: yes" >&5
     
    2253222644  coin_has_cbc=installed
    2253322645fi;
     22646
     22647
     22648
     22649
     22650
    2253422651fi
    2253522652
     
    2258422701if test "$coin_has_cbc" = notGiven; then
    2258522702  if test -d $srcdir//Cbc; then
     22703    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22704    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22705    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2258622706     coin_have_project_dir=yes
    2258722707
    2258822708    if test $coin_have_project_dir = yes; then
    22589       coin_has_cbc=/Cbc
     22709      coin_has_cbc=Cbc
    2259022710    fi
    2259122711  fi
     
    2259922719if test "$coin_have_project_dir" = yes ; then
    2260022720
    22601   if test -r $srcdir//Cbc/configure; then
     22721  if test -r $srcdir/Cbc/configure; then
    2260222722    coin_subdirs="$coin_subdirs Cbc"
    2260322723    echo "$as_me:$LINENO: result: yes" >&5
Note: See TracChangeset for help on using the changeset viewer.