Changeset 1537


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

rerun autotools

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r951 r1537  
    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

    r1516 r1537  
    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/Osi/configure

    r1536 r1537  
    2072520725  coin_has_coinutils=yes
    2072620726       COINUTILS_LIBS="$withval"
    20727        ADDLIBS="$ADDLIBS $withval"
     20727       ADDLIBS="$withval $ADDLIBS"
    2072820728
    2072920729fi;
     
    2101621016    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
    2101721017
    21018     ADDLIBS="$ADDLIBS $COINUTILS_LIBS"
     21018    ADDLIBS="$COINUTILS_LIBS $ADDLIBS"
    2101921019       REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
    2102021020
  • trunk/configure

    r1516 r1537  
    11421142  --with-blas-incdir directory with header files for using project Blas
    11431143  --with-blas-datadir directory with data files for using project Blas
     1144  --with-blas             specify BLAS library (or BUILD for compilation)
    11441145  --with-lapack-lib linker flags for using project Lapack
    11451146  --with-lapack-incdir directory with header files for using project Lapack
    11461147  --with-lapack-datadir directory with data files for using project Lapack
     1148  --with-lapack           specify LAPACK library (or BUILD for compilation)
    11471149  --with-sample-lib linker flags for using project Sample
    11481150  --with-sample-incdir directory with header files for using project Sample
     
    26792681        ;;
    26802682      *)
    2681         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2683        coin_opt_cflags="-O3"
    26822684        coin_add_cflags="-pipe"
    26832685        coin_dbg_cflags="-g"
     
    35933595      *)
    35943596# ToDo decide about unroll-loops
    3595         coin_opt_cxxflags="-O3 -fomit-frame-pointer"
     3597        coin_opt_cxxflags="-O3"
    35963598        coin_add_cxxflags="-pipe"
    35973599        coin_dbg_cxxflags="-g"
     
    41964198
    41974199# Provide some information about the compiler.
    4198 echo "$as_me:4198:" \
     4200echo "$as_me:4200:" \
    41994201     "checking for Fortran 77 compiler version" >&5
    42004202ac_compiler=`set X $ac_compile; echo $2`
     
    43624364
    43634365  if test "$G77" = "yes"; then
    4364     coin_opt_fflags="-O3 -fomit-frame-pointer"
     4366    coin_opt_fflags="-O3"
    43654367    coin_add_fflags="-pipe"
    43664368    coin_dbg_fflags="-g"
     
    64556457*-*-irix6*)
    64566458  # Find out which ABI we are using.
    6457   echo '#line 6457 "configure"' > conftest.$ac_ext
     6459  echo '#line 6459 "configure"' > conftest.$ac_ext
    64586460  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64596461  (eval $ac_compile) 2>&5
     
    84198421   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84208422   -e 's:$: $lt_compiler_flag:'`
    8421    (eval echo "\"\$as_me:8421: $lt_compile\"" >&5)
     8423   (eval echo "\"\$as_me:8423: $lt_compile\"" >&5)
    84228424   (eval "$lt_compile" 2>conftest.err)
    84238425   ac_status=$?
    84248426   cat conftest.err >&5
    8425    echo "$as_me:8425: \$? = $ac_status" >&5
     8427   echo "$as_me:8427: \$? = $ac_status" >&5
    84268428   if (exit $ac_status) && test -s "$ac_outfile"; then
    84278429     # The compiler can only warn and ignore the option if not recognized
     
    86878689   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86888690   -e 's:$: $lt_compiler_flag:'`
    8689    (eval echo "\"\$as_me:8689: $lt_compile\"" >&5)
     8691   (eval echo "\"\$as_me:8691: $lt_compile\"" >&5)
    86908692   (eval "$lt_compile" 2>conftest.err)
    86918693   ac_status=$?
    86928694   cat conftest.err >&5
    8693    echo "$as_me:8693: \$? = $ac_status" >&5
     8695   echo "$as_me:8695: \$? = $ac_status" >&5
    86948696   if (exit $ac_status) && test -s "$ac_outfile"; then
    86958697     # The compiler can only warn and ignore the option if not recognized
     
    87918793   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87928794   -e 's:$: $lt_compiler_flag:'`
    8793    (eval echo "\"\$as_me:8793: $lt_compile\"" >&5)
     8795   (eval echo "\"\$as_me:8795: $lt_compile\"" >&5)
    87948796   (eval "$lt_compile" 2>out/conftest.err)
    87958797   ac_status=$?
    87968798   cat out/conftest.err >&5
    8797    echo "$as_me:8797: \$? = $ac_status" >&5
     8799   echo "$as_me:8799: \$? = $ac_status" >&5
    87988800   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87998801   then
     
    1113611138  lt_status=$lt_dlunknown
    1113711139  cat > conftest.$ac_ext <<EOF
    11138 #line 11138 "configure"
     11140#line 11140 "configure"
    1113911141#include "confdefs.h"
    1114011142
     
    1123611238  lt_status=$lt_dlunknown
    1123711239  cat > conftest.$ac_ext <<EOF
    11238 #line 11238 "configure"
     11240#line 11240 "configure"
    1123911241#include "confdefs.h"
    1124011242
     
    1358013582   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1358113583   -e 's:$: $lt_compiler_flag:'`
    13582    (eval echo "\"\$as_me:13582: $lt_compile\"" >&5)
     13584   (eval echo "\"\$as_me:13584: $lt_compile\"" >&5)
    1358313585   (eval "$lt_compile" 2>conftest.err)
    1358413586   ac_status=$?
    1358513587   cat conftest.err >&5
    13586    echo "$as_me:13586: \$? = $ac_status" >&5
     13588   echo "$as_me:13588: \$? = $ac_status" >&5
    1358713589   if (exit $ac_status) && test -s "$ac_outfile"; then
    1358813590     # The compiler can only warn and ignore the option if not recognized
     
    1368413686   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1368513687   -e 's:$: $lt_compiler_flag:'`
    13686    (eval echo "\"\$as_me:13686: $lt_compile\"" >&5)
     13688   (eval echo "\"\$as_me:13688: $lt_compile\"" >&5)
    1368713689   (eval "$lt_compile" 2>out/conftest.err)
    1368813690   ac_status=$?
    1368913691   cat out/conftest.err >&5
    13690    echo "$as_me:13690: \$? = $ac_status" >&5
     13692   echo "$as_me:13692: \$? = $ac_status" >&5
    1369113693   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1369213694   then
     
    1525415256   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1525515257   -e 's:$: $lt_compiler_flag:'`
    15256    (eval echo "\"\$as_me:15256: $lt_compile\"" >&5)
     15258   (eval echo "\"\$as_me:15258: $lt_compile\"" >&5)
    1525715259   (eval "$lt_compile" 2>conftest.err)
    1525815260   ac_status=$?
    1525915261   cat conftest.err >&5
    15260    echo "$as_me:15260: \$? = $ac_status" >&5
     15262   echo "$as_me:15262: \$? = $ac_status" >&5
    1526115263   if (exit $ac_status) && test -s "$ac_outfile"; then
    1526215264     # The compiler can only warn and ignore the option if not recognized
     
    1535815360   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1535915361   -e 's:$: $lt_compiler_flag:'`
    15360    (eval echo "\"\$as_me:15360: $lt_compile\"" >&5)
     15362   (eval echo "\"\$as_me:15362: $lt_compile\"" >&5)
    1536115363   (eval "$lt_compile" 2>out/conftest.err)
    1536215364   ac_status=$?
    1536315365   cat out/conftest.err >&5
    15364    echo "$as_me:15364: \$? = $ac_status" >&5
     15366   echo "$as_me:15366: \$? = $ac_status" >&5
    1536515367   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1536615368   then
     
    1756517567   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1756617568   -e 's:$: $lt_compiler_flag:'`
    17567    (eval echo "\"\$as_me:17567: $lt_compile\"" >&5)
     17569   (eval echo "\"\$as_me:17569: $lt_compile\"" >&5)
    1756817570   (eval "$lt_compile" 2>conftest.err)
    1756917571   ac_status=$?
    1757017572   cat conftest.err >&5
    17571    echo "$as_me:17571: \$? = $ac_status" >&5
     17573   echo "$as_me:17573: \$? = $ac_status" >&5
    1757217574   if (exit $ac_status) && test -s "$ac_outfile"; then
    1757317575     # The compiler can only warn and ignore the option if not recognized
     
    1783317835   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1783417836   -e 's:$: $lt_compiler_flag:'`
    17835    (eval echo "\"\$as_me:17835: $lt_compile\"" >&5)
     17837   (eval echo "\"\$as_me:17837: $lt_compile\"" >&5)
    1783617838   (eval "$lt_compile" 2>conftest.err)
    1783717839   ac_status=$?
    1783817840   cat conftest.err >&5
    17839    echo "$as_me:17839: \$? = $ac_status" >&5
     17841   echo "$as_me:17841: \$? = $ac_status" >&5
    1784017842   if (exit $ac_status) && test -s "$ac_outfile"; then
    1784117843     # The compiler can only warn and ignore the option if not recognized
     
    1793717939   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1793817940   -e 's:$: $lt_compiler_flag:'`
    17939    (eval echo "\"\$as_me:17939: $lt_compile\"" >&5)
     17941   (eval echo "\"\$as_me:17941: $lt_compile\"" >&5)
    1794017942   (eval "$lt_compile" 2>out/conftest.err)
    1794117943   ac_status=$?
    1794217944   cat out/conftest.err >&5
    17943    echo "$as_me:17943: \$? = $ac_status" >&5
     17945   echo "$as_me:17945: \$? = $ac_status" >&5
    1794417946   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1794517947   then
     
    2073620738      if test "$GXX" = "yes"; then
    2073720739        RPATH_FLAGS=
    20738         for dir in $abs_lib_dir; do
     20740        for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
    2073920741          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2074020742        done
     
    2075320755    *-*-solaris*)
    2075420756        RPATH_FLAGS=
    20755         for dir in $abs_lib_dir; do
     20757        for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
    2075620758          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2075720759        done
     
    2107421076  coin_has_glpk=installed
    2107521077fi;
     21078
     21079
     21080
     21081
     21082
    2107621083fi
    2107721084
     
    2112621133if test "$coin_has_glpk" = notGiven; then
    2112721134  if test -d $srcdir/ThirdParty/Glpk; then
     21135    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21136    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21137    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2112821138    for i in $srcdir/ThirdParty/Glpk/glpk/src/glplpx01.c; do
    2112921139         if test -r $i; then
     
    2120821218  coin_has_blas=installed
    2120921219fi;
     21220
     21221
     21222    #--with-blas can overwrite --with-blas-lib, and can be set to BUILD to enforce building blas
     21223
     21224# Check whether --with-blas or --without-blas was given.
     21225if test "${with_blas+set}" = set; then
     21226  withval="$with_blas"
     21227  if test x$withval = "xBUILD" ; then
     21228           coin_has_blas=notGiven
     21229         else
     21230           coin_has_blas=installed
     21231         fi
     21232fi;
     21233
     21234
     21235
    2121021236fi
    2121121237
     
    2126021286if test "$coin_has_blas" = notGiven; then
    2126121287  if test -d $srcdir/ThirdParty/Blas; then
     21288    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21289    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21290    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2126221291    for i in $srcdir/ThirdParty/Blas/daxpy.f; do
    2126321292         if test -r $i; then
     
    2134221371  coin_has_lapack=installed
    2134321372fi;
     21373
     21374
     21375
     21376
     21377    #--with-lapack can overwrite --with-lapack-lib, and can be set to BUILD to enforce building lapack
     21378
     21379# Check whether --with-lapack or --without-lapack was given.
     21380if test "${with_lapack+set}" = set; then
     21381  withval="$with_lapack"
     21382  if test x$withval = "xBUILD" ; then
     21383           coin_has_lapack=notGiven
     21384         else
     21385           coin_has_lapack=installed
     21386         fi
     21387fi;
     21388
    2134421389fi
    2134521390
     
    2139421439if test "$coin_has_lapack" = notGiven; then
    2139521440  if test -d $srcdir/ThirdParty/Lapack; then
     21441    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21442    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21443    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2139621444    for i in $srcdir/ThirdParty/Lapack/LAPACK/SRC/dlarf.f; do
    2139721445         if test -r $i; then
     
    2147621524  coin_has_sample=installed
    2147721525fi;
     21526
     21527
     21528
     21529
     21530
    2147821531fi
    2147921532
     
    2152821581if test "$coin_has_sample" = notGiven; then
    2152921582  if test -d $srcdir/Data/Sample; then
     21583    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21584    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21585    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2153021586     coin_have_project_dir=yes
    2153121587
     
    2160621662  coin_has_netlib=installed
    2160721663fi;
     21664
     21665
     21666
     21667
     21668
    2160821669fi
    2160921670
     
    2165821719if test "$coin_has_netlib" = notGiven; then
    2165921720  if test -d $srcdir/Data/Netlib; then
     21721    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21722    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21723    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2166021724     coin_have_project_dir=yes
    2166121725
     
    2173621800  coin_has_coinutils=installed
    2173721801fi;
     21802
     21803
     21804
     21805
     21806
    2173821807fi
    2173921808
     
    2178821857if test "$coin_has_coinutils" = notGiven; then
    2178921858  if test -d $srcdir//CoinUtils; then
     21859    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21860    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21861    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2179021862     coin_have_project_dir=yes
    2179121863
    2179221864    if test $coin_have_project_dir = yes; then
    21793       coin_has_coinutils=/CoinUtils
     21865      coin_has_coinutils=CoinUtils
    2179421866    fi
    2179521867  fi
     
    2180321875if test "$coin_have_project_dir" = yes ; then
    2180421876
    21805   if test -r $srcdir//CoinUtils/configure; then
     21877  if test -r $srcdir/CoinUtils/configure; then
    2180621878    coin_subdirs="$coin_subdirs CoinUtils"
    2180721879    echo "$as_me:$LINENO: result: yes" >&5
     
    2186621938  coin_has_osi=installed
    2186721939fi;
     21940
     21941
     21942
     21943
     21944
    2186821945fi
    2186921946
     
    2191821995if test "$coin_has_osi" = notGiven; then
    2191921996  if test -d $srcdir//Osi; then
     21997    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21998    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21999    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2192022000     coin_have_project_dir=yes
    2192122001
    2192222002    if test $coin_have_project_dir = yes; then
    21923       coin_has_osi=/Osi
     22003      coin_has_osi=Osi
    2192422004    fi
    2192522005  fi
     
    2193322013if test "$coin_have_project_dir" = yes ; then
    2193422014
    21935   if test -r $srcdir//Osi/configure; then
     22015  if test -r $srcdir/Osi/configure; then
    2193622016    coin_subdirs="$coin_subdirs Osi"
    2193722017    echo "$as_me:$LINENO: result: yes" >&5
Note: See TracChangeset for help on using the changeset viewer.