Changeset 1554


Ignore:
Timestamp:
Dec 19, 2010 1:49:10 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1552 also in base directory

Location:
stable/2.6
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • stable/2.6/AUTHORS

  • stable/2.6/INSTALL

  • stable/2.6/LICENSE

  • stable/2.6/Makefile.am

  • stable/2.6/Makefile.in

  • stable/2.6/README

  • stable/2.6/config.guess

  • stable/2.6/config.sub

  • stable/2.6/configure

    r1538 r1554  
    474474#endif"
    475475
     476ac_subdirs_all="$ac_subdirs_all ThirdParty/ASL"
    476477ac_subdirs_all="$ac_subdirs_all ThirdParty/Blas"
    477478ac_subdirs_all="$ac_subdirs_all ThirdParty/Lapack"
     479ac_subdirs_all="$ac_subdirs_all ThirdParty/Glpk"
    478480ac_subdirs_all="$ac_subdirs_all Data/Sample"
    479481ac_subdirs_all="$ac_subdirs_all Data/Netlib"
     
    11411143  --with-coin-instdir     prefix of installation directory for precompiled
    11421144                          COIN packages
     1145  --with-asl-lib linker flags for using project ASL
     1146  --with-asl-incdir directory with header files for using project ASL
     1147  --with-asl-datadir directory with data files for using project ASL
    11431148  --with-blas-lib linker flags for using project Blas
    11441149  --with-blas-incdir directory with header files for using project Blas
     
    11491154  --with-lapack-datadir directory with data files for using project Lapack
    11501155  --with-lapack           specify LAPACK library (or BUILD for compilation)
     1156  --with-glpk-lib linker flags for using project Glpk
     1157  --with-glpk-incdir directory with header files for using project Glpk
     1158  --with-glpk-datadir directory with data files for using project Glpk
    11511159  --with-sample-lib linker flags for using project Sample
    11521160  --with-sample-incdir directory with header files for using project Sample
     
    42204228
    42214229# Provide some information about the compiler.
    4222 echo "$as_me:4222:" \
     4230echo "$as_me:4230:" \
    42234231     "checking for Fortran 77 compiler version" >&5
    42244232ac_compiler=`set X $ac_compile; echo $2`
     
    64796487*-*-irix6*)
    64806488  # Find out which ABI we are using.
    6481   echo '#line 6481 "configure"' > conftest.$ac_ext
     6489  echo '#line 6489 "configure"' > conftest.$ac_ext
    64826490  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64836491  (eval $ac_compile) 2>&5
     
    84438451   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84448452   -e 's:$: $lt_compiler_flag:'`
    8445    (eval echo "\"\$as_me:8445: $lt_compile\"" >&5)
     8453   (eval echo "\"\$as_me:8453: $lt_compile\"" >&5)
    84468454   (eval "$lt_compile" 2>conftest.err)
    84478455   ac_status=$?
    84488456   cat conftest.err >&5
    8449    echo "$as_me:8449: \$? = $ac_status" >&5
     8457   echo "$as_me:8457: \$? = $ac_status" >&5
    84508458   if (exit $ac_status) && test -s "$ac_outfile"; then
    84518459     # The compiler can only warn and ignore the option if not recognized
     
    87118719   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87128720   -e 's:$: $lt_compiler_flag:'`
    8713    (eval echo "\"\$as_me:8713: $lt_compile\"" >&5)
     8721   (eval echo "\"\$as_me:8721: $lt_compile\"" >&5)
    87148722   (eval "$lt_compile" 2>conftest.err)
    87158723   ac_status=$?
    87168724   cat conftest.err >&5
    8717    echo "$as_me:8717: \$? = $ac_status" >&5
     8725   echo "$as_me:8725: \$? = $ac_status" >&5
    87188726   if (exit $ac_status) && test -s "$ac_outfile"; then
    87198727     # The compiler can only warn and ignore the option if not recognized
     
    88158823   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    88168824   -e 's:$: $lt_compiler_flag:'`
    8817    (eval echo "\"\$as_me:8817: $lt_compile\"" >&5)
     8825   (eval echo "\"\$as_me:8825: $lt_compile\"" >&5)
    88188826   (eval "$lt_compile" 2>out/conftest.err)
    88198827   ac_status=$?
    88208828   cat out/conftest.err >&5
    8821    echo "$as_me:8821: \$? = $ac_status" >&5
     8829   echo "$as_me:8829: \$? = $ac_status" >&5
    88228830   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    88238831   then
     
    1116011168  lt_status=$lt_dlunknown
    1116111169  cat > conftest.$ac_ext <<EOF
    11162 #line 11162 "configure"
     11170#line 11170 "configure"
    1116311171#include "confdefs.h"
    1116411172
     
    1126011268  lt_status=$lt_dlunknown
    1126111269  cat > conftest.$ac_ext <<EOF
    11262 #line 11262 "configure"
     11270#line 11270 "configure"
    1126311271#include "confdefs.h"
    1126411272
     
    1360413612   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1360513613   -e 's:$: $lt_compiler_flag:'`
    13606    (eval echo "\"\$as_me:13606: $lt_compile\"" >&5)
     13614   (eval echo "\"\$as_me:13614: $lt_compile\"" >&5)
    1360713615   (eval "$lt_compile" 2>conftest.err)
    1360813616   ac_status=$?
    1360913617   cat conftest.err >&5
    13610    echo "$as_me:13610: \$? = $ac_status" >&5
     13618   echo "$as_me:13618: \$? = $ac_status" >&5
    1361113619   if (exit $ac_status) && test -s "$ac_outfile"; then
    1361213620     # The compiler can only warn and ignore the option if not recognized
     
    1370813716   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1370913717   -e 's:$: $lt_compiler_flag:'`
    13710    (eval echo "\"\$as_me:13710: $lt_compile\"" >&5)
     13718   (eval echo "\"\$as_me:13718: $lt_compile\"" >&5)
    1371113719   (eval "$lt_compile" 2>out/conftest.err)
    1371213720   ac_status=$?
    1371313721   cat out/conftest.err >&5
    13714    echo "$as_me:13714: \$? = $ac_status" >&5
     13722   echo "$as_me:13722: \$? = $ac_status" >&5
    1371513723   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1371613724   then
     
    1527815286   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1527915287   -e 's:$: $lt_compiler_flag:'`
    15280    (eval echo "\"\$as_me:15280: $lt_compile\"" >&5)
     15288   (eval echo "\"\$as_me:15288: $lt_compile\"" >&5)
    1528115289   (eval "$lt_compile" 2>conftest.err)
    1528215290   ac_status=$?
    1528315291   cat conftest.err >&5
    15284    echo "$as_me:15284: \$? = $ac_status" >&5
     15292   echo "$as_me:15292: \$? = $ac_status" >&5
    1528515293   if (exit $ac_status) && test -s "$ac_outfile"; then
    1528615294     # The compiler can only warn and ignore the option if not recognized
     
    1538215390   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1538315391   -e 's:$: $lt_compiler_flag:'`
    15384    (eval echo "\"\$as_me:15384: $lt_compile\"" >&5)
     15392   (eval echo "\"\$as_me:15392: $lt_compile\"" >&5)
    1538515393   (eval "$lt_compile" 2>out/conftest.err)
    1538615394   ac_status=$?
    1538715395   cat out/conftest.err >&5
    15388    echo "$as_me:15388: \$? = $ac_status" >&5
     15396   echo "$as_me:15396: \$? = $ac_status" >&5
    1538915397   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1539015398   then
     
    1758917597   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759017598   -e 's:$: $lt_compiler_flag:'`
    17591    (eval echo "\"\$as_me:17591: $lt_compile\"" >&5)
     17599   (eval echo "\"\$as_me:17599: $lt_compile\"" >&5)
    1759217600   (eval "$lt_compile" 2>conftest.err)
    1759317601   ac_status=$?
    1759417602   cat conftest.err >&5
    17595    echo "$as_me:17595: \$? = $ac_status" >&5
     17603   echo "$as_me:17603: \$? = $ac_status" >&5
    1759617604   if (exit $ac_status) && test -s "$ac_outfile"; then
    1759717605     # The compiler can only warn and ignore the option if not recognized
     
    1785717865   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1785817866   -e 's:$: $lt_compiler_flag:'`
    17859    (eval echo "\"\$as_me:17859: $lt_compile\"" >&5)
     17867   (eval echo "\"\$as_me:17867: $lt_compile\"" >&5)
    1786017868   (eval "$lt_compile" 2>conftest.err)
    1786117869   ac_status=$?
    1786217870   cat conftest.err >&5
    17863    echo "$as_me:17863: \$? = $ac_status" >&5
     17871   echo "$as_me:17871: \$? = $ac_status" >&5
    1786417872   if (exit $ac_status) && test -s "$ac_outfile"; then
    1786517873     # The compiler can only warn and ignore the option if not recognized
     
    1796117969   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1796217970   -e 's:$: $lt_compiler_flag:'`
    17963    (eval echo "\"\$as_me:17963: $lt_compile\"" >&5)
     17971   (eval echo "\"\$as_me:17971: $lt_compile\"" >&5)
    1796417972   (eval "$lt_compile" 2>out/conftest.err)
    1796517973   ac_status=$?
    1796617974   cat out/conftest.err >&5
    17967    echo "$as_me:17967: \$? = $ac_status" >&5
     17975   echo "$as_me:17975: \$? = $ac_status" >&5
    1796817976   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1796917977   then
     
    2105921067
    2106021068
     21069echo "$as_me:$LINENO: checking whether project ASL is available" >&5
     21070echo $ECHO_N "checking whether project ASL is available... $ECHO_C" >&6
     21071
     21072coin_has_asl=notGiven
     21073coin_have_project_dir=no
     21074
     21075# check if user wants to skip project in any case
     21076
     21077if test x"$COIN_SKIP_PROJECTS" != x; then
     21078  for dir in $COIN_SKIP_PROJECTS; do
     21079    if test $dir = "ASL"; then
     21080      coin_has_asl=skipping
     21081    fi
     21082    if test $dir = "ThirdParty/ASL"; then
     21083      coin_has_asl=skipping
     21084    fi
     21085  done
     21086fi
     21087
     21088if test $coin_has_asl != skipping; then
     21089  if test $PACKAGE_TARNAME = asl; then
     21090    coin_has_asl=.
     21091    coin_have_project_dir=yes
     21092  fi
     21093
     21094
     21095# Check whether --with-m4_tolower(ASL)-lib or --without-m4_tolower(ASL)-lib was given.
     21096if test "${with_asl_lib+set}" = set; then
     21097  withval="$with_asl_lib"
     21098  coin_has_asl=installed
     21099fi;
     21100
     21101
     21102# Check whether --with-m4_tolower(ASL)-incdir or --without-m4_tolower(ASL)-incdir was given.
     21103if test "${with_asl_incdir+set}" = set; then
     21104  withval="$with_asl_incdir"
     21105  coin_has_asl=installed
     21106fi;
     21107
     21108
     21109# Check whether --with-m4_tolower(ASL)-datadir or --without-m4_tolower(ASL)-datadir was given.
     21110if test "${with_asl_datadir+set}" = set; then
     21111  withval="$with_asl_datadir"
     21112  coin_has_asl=installed
     21113fi;
     21114
     21115
     21116
     21117
     21118
     21119fi
     21120
     21121# check if project is available in present directory
     21122if test "$coin_has_asl" = notGiven; then
     21123  if test -d $srcdir/ThirdParty/ASL; then
     21124    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21125    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21126    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
     21127    for i in $srcdir/ThirdParty/ASL/solvers/asl.h; do
     21128         if test -r $i; then
     21129           coin_have_project_dir=yes
     21130         fi
     21131       done
     21132
     21133    if test $coin_have_project_dir = yes; then
     21134      coin_has_asl=ThirdParty/ASL
     21135    fi
     21136  fi
     21137fi
     21138
     21139# check for project by using pkg-config, if pkg-config is available
     21140if test $coin_has_asl = notGiven; then
     21141  #we are only interested in installed packages here, so we do not search in $COIN_PKG_CONFIG_PATH_UNINSTALLED
     21142  if test -n "$PKG_CONFIG" ; then
     21143    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     21144    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" ; export PKG_CONFIG_PATH
     21145
     21146if test -n "$PKG_CONFIG" ; then
     21147  if $PKG_CONFIG --exists "coinasl"; then
     21148    COINASL_VERSION=`$PKG_CONFIG --modversion "coinasl" 2>/dev/null`
     21149    coin_has_asl="$COINASL_VERSION"
     21150  else
     21151    COINASL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinasl"`
     21152
     21153  fi
     21154else
     21155  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coinasl without pkg-config\"" >&5
     21156echo "$as_me: error: \"Cannot check for existance of module coinasl without pkg-config\"" >&2;}
     21157   { (exit 1); exit 1; }; }
     21158fi
     21159
     21160    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21161    export PKG_CONFIG_PATH
     21162  fi
     21163fi
     21164
     21165echo "$as_me:$LINENO: result: $coin_has_asl" >&5
     21166echo "${ECHO_T}$coin_has_asl" >&6
     21167
     21168echo "$as_me:$LINENO: checking whether project ASL needs to be configured" >&5
     21169echo $ECHO_N "checking whether project ASL needs to be configured... $ECHO_C" >&6
     21170if test "$coin_have_project_dir" = yes ; then
     21171
     21172  if test -r $srcdir/ThirdParty/ASL/configure; then
     21173    coin_subdirs="$coin_subdirs ThirdParty/ASL"
     21174    echo "$as_me:$LINENO: result: yes" >&5
     21175echo "${ECHO_T}yes" >&6
     21176
     21177
     21178subdirs="$subdirs ThirdParty/ASL"
     21179
     21180  else
     21181    echo "$as_me:$LINENO: result: no" >&5
     21182echo "${ECHO_T}no" >&6
     21183  fi
     21184else
     21185  echo "$as_me:$LINENO: result: no" >&5
     21186echo "${ECHO_T}no" >&6
     21187fi
     21188
     21189
    2106121190echo "$as_me:$LINENO: checking whether project Blas is available" >&5
    2106221191echo $ECHO_N "checking whether project Blas is available... $ECHO_C" >&6
     
    2131221441
    2131321442subdirs="$subdirs ThirdParty/Lapack"
     21443
     21444  else
     21445    echo "$as_me:$LINENO: result: no" >&5
     21446echo "${ECHO_T}no" >&6
     21447  fi
     21448else
     21449  echo "$as_me:$LINENO: result: no" >&5
     21450echo "${ECHO_T}no" >&6
     21451fi
     21452
     21453
     21454echo "$as_me:$LINENO: checking whether project Glpk is available" >&5
     21455echo $ECHO_N "checking whether project Glpk is available... $ECHO_C" >&6
     21456
     21457coin_has_glpk=notGiven
     21458coin_have_project_dir=no
     21459
     21460# check if user wants to skip project in any case
     21461
     21462if test x"$COIN_SKIP_PROJECTS" != x; then
     21463  for dir in $COIN_SKIP_PROJECTS; do
     21464    if test $dir = "Glpk"; then
     21465      coin_has_glpk=skipping
     21466    fi
     21467    if test $dir = "ThirdParty/Glpk"; then
     21468      coin_has_glpk=skipping
     21469    fi
     21470  done
     21471fi
     21472
     21473if test $coin_has_glpk != skipping; then
     21474  if test $PACKAGE_TARNAME = glpk; then
     21475    coin_has_glpk=.
     21476    coin_have_project_dir=yes
     21477  fi
     21478
     21479
     21480# Check whether --with-m4_tolower(Glpk)-lib or --without-m4_tolower(Glpk)-lib was given.
     21481if test "${with_glpk_lib+set}" = set; then
     21482  withval="$with_glpk_lib"
     21483  coin_has_glpk=installed
     21484fi;
     21485
     21486
     21487# Check whether --with-m4_tolower(Glpk)-incdir or --without-m4_tolower(Glpk)-incdir was given.
     21488if test "${with_glpk_incdir+set}" = set; then
     21489  withval="$with_glpk_incdir"
     21490  coin_has_glpk=installed
     21491fi;
     21492
     21493
     21494# Check whether --with-m4_tolower(Glpk)-datadir or --without-m4_tolower(Glpk)-datadir was given.
     21495if test "${with_glpk_datadir+set}" = set; then
     21496  withval="$with_glpk_datadir"
     21497  coin_has_glpk=installed
     21498fi;
     21499
     21500
     21501
     21502
     21503
     21504fi
     21505
     21506# check if project is available in present directory
     21507if test "$coin_has_glpk" = notGiven; then
     21508  if test -d $srcdir/ThirdParty/Glpk; then
     21509    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21510    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21511    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
     21512    for i in $srcdir/ThirdParty/Glpk/glpk/include/glpk.h; do
     21513         if test -r $i; then
     21514           coin_have_project_dir=yes
     21515         fi
     21516       done
     21517
     21518    if test $coin_have_project_dir = yes; then
     21519      coin_has_glpk=ThirdParty/Glpk
     21520    fi
     21521  fi
     21522fi
     21523
     21524# check for project by using pkg-config, if pkg-config is available
     21525if test $coin_has_glpk = notGiven; then
     21526  #we are only interested in installed packages here, so we do not search in $COIN_PKG_CONFIG_PATH_UNINSTALLED
     21527  if test -n "$PKG_CONFIG" ; then
     21528    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     21529    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" ; export PKG_CONFIG_PATH
     21530
     21531if test -n "$PKG_CONFIG" ; then
     21532  if $PKG_CONFIG --exists "coinglpk"; then
     21533    COINGLPK_VERSION=`$PKG_CONFIG --modversion "coinglpk" 2>/dev/null`
     21534    coin_has_glpk="$COINGLPK_VERSION"
     21535  else
     21536    COINGLPK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinglpk"`
     21537
     21538  fi
     21539else
     21540  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coinglpk without pkg-config\"" >&5
     21541echo "$as_me: error: \"Cannot check for existance of module coinglpk without pkg-config\"" >&2;}
     21542   { (exit 1); exit 1; }; }
     21543fi
     21544
     21545    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21546    export PKG_CONFIG_PATH
     21547  fi
     21548fi
     21549
     21550echo "$as_me:$LINENO: result: $coin_has_glpk" >&5
     21551echo "${ECHO_T}$coin_has_glpk" >&6
     21552
     21553echo "$as_me:$LINENO: checking whether project Glpk needs to be configured" >&5
     21554echo $ECHO_N "checking whether project Glpk needs to be configured... $ECHO_C" >&6
     21555if test "$coin_have_project_dir" = yes ; then
     21556
     21557  if test -r $srcdir/ThirdParty/Glpk/configure; then
     21558    coin_subdirs="$coin_subdirs ThirdParty/Glpk"
     21559    echo "$as_me:$LINENO: result: yes" >&5
     21560echo "${ECHO_T}yes" >&6
     21561
     21562
     21563subdirs="$subdirs ThirdParty/Glpk"
    2131421564
    2131521565  else
  • stable/2.6/configure.ac

    r1537 r1554  
    4343#############################################################################
    4444
     45AC_COIN_MAIN_PACKAGEDIR(ASL,ThirdParty,[solvers/asl.h],coinasl)
    4546AC_COIN_MAIN_PACKAGEDIR(Blas,ThirdParty,daxpy.f,coinblas)
    4647AC_COIN_MAIN_PACKAGEDIR(Lapack,ThirdParty,[LAPACK/SRC/dlarf.f],coinlapack)
     48AC_COIN_MAIN_PACKAGEDIR(Glpk,ThirdParty,[glpk/include/glpk.h],coinglpk)
    4749AC_COIN_MAIN_PACKAGEDIR(Sample,Data,,coindatasample)
    4850AC_COIN_MAIN_PACKAGEDIR(Netlib,Data,,coindatanetlib)
  • stable/2.6/depcomp

  • stable/2.6/install-sh

  • stable/2.6/ltmain.sh

  • stable/2.6/missing

Note: See TracChangeset for help on using the changeset viewer.