Changeset 1572


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

rerun autotools

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1571 r1572  
    2070920709  coin_has_coinutils=yes
    2071020710       COINUTILS_LIBS="$withval"
    20711        ADDLIBS="$ADDLIBS $withval"
     20711       ADDLIBS="$withval $ADDLIBS"
    2071220712
    2071320713fi;
     
    2100021000    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
    2100121001
    21002     ADDLIBS="$ADDLIBS $COINUTILS_LIBS"
     21002    ADDLIBS="$COINUTILS_LIBS $ADDLIBS"
    2100321003       REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
    2100421004
  • trunk/Makefile.am

    r915 r1572  
    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

    r1559 r1572  
    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

    r1559 r1572  
    11381138  --with-blas-incdir directory with header files for using project Blas
    11391139  --with-blas-datadir directory with data files for using project Blas
     1140  --with-blas             specify BLAS library (or BUILD for compilation)
    11401141  --with-lapack-lib linker flags for using project Lapack
    11411142  --with-lapack-incdir directory with header files for using project Lapack
    11421143  --with-lapack-datadir directory with data files for using project Lapack
     1144  --with-lapack           specify LAPACK library (or BUILD for compilation)
    11431145  --with-sample-lib linker flags for using project Sample
    11441146  --with-sample-incdir directory with header files for using project Sample
     
    26752677        ;;
    26762678      *)
    2677         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2679        coin_opt_cflags="-O3"
    26782680        coin_add_cflags="-pipe"
    26792681        coin_dbg_cflags="-g"
     
    35893591      *)
    35903592# ToDo decide about unroll-loops
    3591         coin_opt_cxxflags="-O3 -fomit-frame-pointer"
     3593        coin_opt_cxxflags="-O3"
    35923594        coin_add_cxxflags="-pipe"
    35933595        coin_dbg_cxxflags="-g"
     
    41924194
    41934195# Provide some information about the compiler.
    4194 echo "$as_me:4194:" \
     4196echo "$as_me:4196:" \
    41954197     "checking for Fortran 77 compiler version" >&5
    41964198ac_compiler=`set X $ac_compile; echo $2`
     
    43584360
    43594361  if test "$G77" = "yes"; then
    4360     coin_opt_fflags="-O3 -fomit-frame-pointer"
     4362    coin_opt_fflags="-O3"
    43614363    coin_add_fflags="-pipe"
    43624364    coin_dbg_fflags="-g"
     
    64516453*-*-irix6*)
    64526454  # Find out which ABI we are using.
    6453   echo '#line 6453 "configure"' > conftest.$ac_ext
     6455  echo '#line 6455 "configure"' > conftest.$ac_ext
    64546456  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64556457  (eval $ac_compile) 2>&5
     
    84158417   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84168418   -e 's:$: $lt_compiler_flag:'`
    8417    (eval echo "\"\$as_me:8417: $lt_compile\"" >&5)
     8419   (eval echo "\"\$as_me:8419: $lt_compile\"" >&5)
    84188420   (eval "$lt_compile" 2>conftest.err)
    84198421   ac_status=$?
    84208422   cat conftest.err >&5
    8421    echo "$as_me:8421: \$? = $ac_status" >&5
     8423   echo "$as_me:8423: \$? = $ac_status" >&5
    84228424   if (exit $ac_status) && test -s "$ac_outfile"; then
    84238425     # The compiler can only warn and ignore the option if not recognized
     
    86838685   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86848686   -e 's:$: $lt_compiler_flag:'`
    8685    (eval echo "\"\$as_me:8685: $lt_compile\"" >&5)
     8687   (eval echo "\"\$as_me:8687: $lt_compile\"" >&5)
    86868688   (eval "$lt_compile" 2>conftest.err)
    86878689   ac_status=$?
    86888690   cat conftest.err >&5
    8689    echo "$as_me:8689: \$? = $ac_status" >&5
     8691   echo "$as_me:8691: \$? = $ac_status" >&5
    86908692   if (exit $ac_status) && test -s "$ac_outfile"; then
    86918693     # The compiler can only warn and ignore the option if not recognized
     
    87878789   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87888790   -e 's:$: $lt_compiler_flag:'`
    8789    (eval echo "\"\$as_me:8789: $lt_compile\"" >&5)
     8791   (eval echo "\"\$as_me:8791: $lt_compile\"" >&5)
    87908792   (eval "$lt_compile" 2>out/conftest.err)
    87918793   ac_status=$?
    87928794   cat out/conftest.err >&5
    8793    echo "$as_me:8793: \$? = $ac_status" >&5
     8795   echo "$as_me:8795: \$? = $ac_status" >&5
    87948796   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87958797   then
     
    1113211134  lt_status=$lt_dlunknown
    1113311135  cat > conftest.$ac_ext <<EOF
    11134 #line 11134 "configure"
     11136#line 11136 "configure"
    1113511137#include "confdefs.h"
    1113611138
     
    1123211234  lt_status=$lt_dlunknown
    1123311235  cat > conftest.$ac_ext <<EOF
    11234 #line 11234 "configure"
     11236#line 11236 "configure"
    1123511237#include "confdefs.h"
    1123611238
     
    1357613578   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1357713579   -e 's:$: $lt_compiler_flag:'`
    13578    (eval echo "\"\$as_me:13578: $lt_compile\"" >&5)
     13580   (eval echo "\"\$as_me:13580: $lt_compile\"" >&5)
    1357913581   (eval "$lt_compile" 2>conftest.err)
    1358013582   ac_status=$?
    1358113583   cat conftest.err >&5
    13582    echo "$as_me:13582: \$? = $ac_status" >&5
     13584   echo "$as_me:13584: \$? = $ac_status" >&5
    1358313585   if (exit $ac_status) && test -s "$ac_outfile"; then
    1358413586     # The compiler can only warn and ignore the option if not recognized
     
    1368013682   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1368113683   -e 's:$: $lt_compiler_flag:'`
    13682    (eval echo "\"\$as_me:13682: $lt_compile\"" >&5)
     13684   (eval echo "\"\$as_me:13684: $lt_compile\"" >&5)
    1368313685   (eval "$lt_compile" 2>out/conftest.err)
    1368413686   ac_status=$?
    1368513687   cat out/conftest.err >&5
    13686    echo "$as_me:13686: \$? = $ac_status" >&5
     13688   echo "$as_me:13688: \$? = $ac_status" >&5
    1368713689   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1368813690   then
     
    1525015252   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1525115253   -e 's:$: $lt_compiler_flag:'`
    15252    (eval echo "\"\$as_me:15252: $lt_compile\"" >&5)
     15254   (eval echo "\"\$as_me:15254: $lt_compile\"" >&5)
    1525315255   (eval "$lt_compile" 2>conftest.err)
    1525415256   ac_status=$?
    1525515257   cat conftest.err >&5
    15256    echo "$as_me:15256: \$? = $ac_status" >&5
     15258   echo "$as_me:15258: \$? = $ac_status" >&5
    1525715259   if (exit $ac_status) && test -s "$ac_outfile"; then
    1525815260     # The compiler can only warn and ignore the option if not recognized
     
    1535415356   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1535515357   -e 's:$: $lt_compiler_flag:'`
    15356    (eval echo "\"\$as_me:15356: $lt_compile\"" >&5)
     15358   (eval echo "\"\$as_me:15358: $lt_compile\"" >&5)
    1535715359   (eval "$lt_compile" 2>out/conftest.err)
    1535815360   ac_status=$?
    1535915361   cat out/conftest.err >&5
    15360    echo "$as_me:15360: \$? = $ac_status" >&5
     15362   echo "$as_me:15362: \$? = $ac_status" >&5
    1536115363   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1536215364   then
     
    1756117563   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1756217564   -e 's:$: $lt_compiler_flag:'`
    17563    (eval echo "\"\$as_me:17563: $lt_compile\"" >&5)
     17565   (eval echo "\"\$as_me:17565: $lt_compile\"" >&5)
    1756417566   (eval "$lt_compile" 2>conftest.err)
    1756517567   ac_status=$?
    1756617568   cat conftest.err >&5
    17567    echo "$as_me:17567: \$? = $ac_status" >&5
     17569   echo "$as_me:17569: \$? = $ac_status" >&5
    1756817570   if (exit $ac_status) && test -s "$ac_outfile"; then
    1756917571     # The compiler can only warn and ignore the option if not recognized
     
    1782917831   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1783017832   -e 's:$: $lt_compiler_flag:'`
    17831    (eval echo "\"\$as_me:17831: $lt_compile\"" >&5)
     17833   (eval echo "\"\$as_me:17833: $lt_compile\"" >&5)
    1783217834   (eval "$lt_compile" 2>conftest.err)
    1783317835   ac_status=$?
    1783417836   cat conftest.err >&5
    17835    echo "$as_me:17835: \$? = $ac_status" >&5
     17837   echo "$as_me:17837: \$? = $ac_status" >&5
    1783617838   if (exit $ac_status) && test -s "$ac_outfile"; then
    1783717839     # The compiler can only warn and ignore the option if not recognized
     
    1793317935   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1793417936   -e 's:$: $lt_compiler_flag:'`
    17935    (eval echo "\"\$as_me:17935: $lt_compile\"" >&5)
     17937   (eval echo "\"\$as_me:17937: $lt_compile\"" >&5)
    1793617938   (eval "$lt_compile" 2>out/conftest.err)
    1793717939   ac_status=$?
    1793817940   cat out/conftest.err >&5
    17939    echo "$as_me:17939: \$? = $ac_status" >&5
     17941   echo "$as_me:17941: \$? = $ac_status" >&5
    1794017942   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1794117943   then
     
    2073220734      if test "$GXX" = "yes"; then
    2073320735        RPATH_FLAGS=
    20734         for dir in $abs_lib_dir; do
     20736        for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
    2073520737          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2073620738        done
     
    2074920751    *-*-solaris*)
    2075020752        RPATH_FLAGS=
    20751         for dir in $abs_lib_dir; do
     20753        for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
    2075220754          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2075320755        done
     
    2107021072  coin_has_blas=installed
    2107121073fi;
     21074
     21075
     21076    #--with-blas can overwrite --with-blas-lib, and can be set to BUILD to enforce building blas
     21077
     21078# Check whether --with-blas or --without-blas was given.
     21079if test "${with_blas+set}" = set; then
     21080  withval="$with_blas"
     21081  if test x$withval = "xBUILD" ; then
     21082           coin_has_blas=notGiven
     21083         else
     21084           coin_has_blas=installed
     21085         fi
     21086fi;
     21087
     21088
     21089
    2107221090fi
    2107321091
     
    2112221140if test "$coin_has_blas" = notGiven; then
    2112321141  if test -d $srcdir/ThirdParty/Blas; then
     21142    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21143    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21144    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2112421145    for i in $srcdir/ThirdParty/Blas/daxpy.f; do
    2112521146         if test -r $i; then
     
    2120421225  coin_has_lapack=installed
    2120521226fi;
     21227
     21228
     21229
     21230
     21231    #--with-lapack can overwrite --with-lapack-lib, and can be set to BUILD to enforce building lapack
     21232
     21233# Check whether --with-lapack or --without-lapack was given.
     21234if test "${with_lapack+set}" = set; then
     21235  withval="$with_lapack"
     21236  if test x$withval = "xBUILD" ; then
     21237           coin_has_lapack=notGiven
     21238         else
     21239           coin_has_lapack=installed
     21240         fi
     21241fi;
     21242
    2120621243fi
    2120721244
     
    2125621293if test "$coin_has_lapack" = notGiven; then
    2125721294  if test -d $srcdir/ThirdParty/Lapack; then
     21295    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21296    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21297    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2125821298    for i in $srcdir/ThirdParty/Lapack/LAPACK/SRC/dlarf.f; do
    2125921299         if test -r $i; then
     
    2133821378  coin_has_sample=installed
    2133921379fi;
     21380
     21381
     21382
     21383
     21384
    2134021385fi
    2134121386
     
    2139021435if test "$coin_has_sample" = notGiven; then
    2139121436  if test -d $srcdir/Data/Sample; then
     21437    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21438    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21439    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2139221440     coin_have_project_dir=yes
    2139321441
     
    2146821516  coin_has_netlib=installed
    2146921517fi;
     21518
     21519
     21520
     21521
     21522
    2147021523fi
    2147121524
     
    2152021573if test "$coin_has_netlib" = notGiven; then
    2152121574  if test -d $srcdir/Data/Netlib; then
     21575    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21576    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21577    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2152221578     coin_have_project_dir=yes
    2152321579
     
    2159821654  coin_has_coinutils=installed
    2159921655fi;
     21656
     21657
     21658
     21659
     21660
    2160021661fi
    2160121662
     
    2165021711if test "$coin_has_coinutils" = notGiven; then
    2165121712  if test -d $srcdir//CoinUtils; then
     21713    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21714    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21715    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2165221716     coin_have_project_dir=yes
    2165321717
    2165421718    if test $coin_have_project_dir = yes; then
    21655       coin_has_coinutils=/CoinUtils
     21719      coin_has_coinutils=CoinUtils
    2165621720    fi
    2165721721  fi
     
    2166521729if test "$coin_have_project_dir" = yes ; then
    2166621730
    21667   if test -r $srcdir//CoinUtils/configure; then
     21731  if test -r $srcdir/CoinUtils/configure; then
    2166821732    coin_subdirs="$coin_subdirs CoinUtils"
    2166921733    echo "$as_me:$LINENO: result: yes" >&5
     
    2172821792  coin_has_clp=installed
    2172921793fi;
     21794
     21795
     21796
     21797
     21798
    2173021799fi
    2173121800
     
    2178021849if test "$coin_has_clp" = notGiven; then
    2178121850  if test -d $srcdir//Clp; then
     21851    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21852    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21853    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    2178221854     coin_have_project_dir=yes
    2178321855
    2178421856    if test $coin_have_project_dir = yes; then
    21785       coin_has_clp=/Clp
     21857      coin_has_clp=Clp
    2178621858    fi
    2178721859  fi
     
    2179521867if test "$coin_have_project_dir" = yes ; then
    2179621868
    21797   if test -r $srcdir//Clp/configure; then
     21869  if test -r $srcdir/Clp/configure; then
    2179821870    coin_subdirs="$coin_subdirs Clp"
    2179921871    echo "$as_me:$LINENO: result: yes" >&5
Note: See TracChangeset for help on using the changeset viewer.