Changeset 1537 for stable/2.6/configure


Ignore:
Timestamp:
Nov 25, 2010 12:31:39 PM (9 years ago)
Author:
lou
Message:

Merge trunk r1536 (miblib3 -> miplib3)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.6/configure

    r1527 r1537  
    478478ac_subdirs_all="$ac_subdirs_all Data/Sample"
    479479ac_subdirs_all="$ac_subdirs_all Data/Netlib"
    480 ac_subdirs_all="$ac_subdirs_all Data/miblib3"
     480ac_subdirs_all="$ac_subdirs_all Data/miplib3"
    481481ac_subdirs_all="$ac_subdirs_all CoinUtils"
    482482ac_subdirs_all="$ac_subdirs_all Osi"
     
    11551155  --with-netlib-incdir directory with header files for using project Netlib
    11561156  --with-netlib-datadir directory with data files for using project Netlib
    1157   --with-miblib3-lib linker flags for using project miblib3
    1158   --with-miblib3-incdir directory with header files for using project miblib3
    1159   --with-miblib3-datadir directory with data files for using project miblib3
     1157  --with-miplib3-lib linker flags for using project miplib3
     1158  --with-miplib3-incdir directory with header files for using project miplib3
     1159  --with-miplib3-datadir directory with data files for using project miplib3
    11601160  --with-coinutils-lib linker flags for using project CoinUtils
    11611161  --with-coinutils-incdir directory with header files for using project
     
    2155721557
    2155821558
    21559 echo "$as_me:$LINENO: checking whether project miblib3 is available" >&5
    21560 echo $ECHO_N "checking whether project miblib3 is available... $ECHO_C" >&6
    21561 
    21562 coin_has_miblib3=notGiven
     21559echo "$as_me:$LINENO: checking whether project miplib3 is available" >&5
     21560echo $ECHO_N "checking whether project miplib3 is available... $ECHO_C" >&6
     21561
     21562coin_has_miplib3=notGiven
    2156321563coin_have_project_dir=no
    2156421564
     
    2156721567if test x"$COIN_SKIP_PROJECTS" != x; then
    2156821568  for dir in $COIN_SKIP_PROJECTS; do
    21569     if test $dir = "miblib3"; then
    21570       coin_has_miblib3=skipping
     21569    if test $dir = "miplib3"; then
     21570      coin_has_miplib3=skipping
    2157121571    fi
    21572     if test $dir = "Data/miblib3"; then
    21573       coin_has_miblib3=skipping
     21572    if test $dir = "Data/miplib3"; then
     21573      coin_has_miplib3=skipping
    2157421574    fi
    2157521575  done
    2157621576fi
    2157721577
    21578 if test $coin_has_miblib3 != skipping; then
    21579   if test $PACKAGE_TARNAME = miblib3; then
    21580     coin_has_miblib3=.
     21578if test $coin_has_miplib3 != skipping; then
     21579  if test $PACKAGE_TARNAME = miplib3; then
     21580    coin_has_miplib3=.
    2158121581    coin_have_project_dir=yes
    2158221582  fi
    2158321583
    2158421584
    21585 # Check whether --with-m4_tolower(miblib3)-lib or --without-m4_tolower(miblib3)-lib was given.
    21586 if test "${with_miblib3_lib+set}" = set; then
    21587   withval="$with_miblib3_lib"
    21588   coin_has_miblib3=installed
     21585# Check whether --with-m4_tolower(miplib3)-lib or --without-m4_tolower(miplib3)-lib was given.
     21586if test "${with_miplib3_lib+set}" = set; then
     21587  withval="$with_miplib3_lib"
     21588  coin_has_miplib3=installed
    2158921589fi;
    2159021590
    2159121591
    21592 # Check whether --with-m4_tolower(miblib3)-incdir or --without-m4_tolower(miblib3)-incdir was given.
    21593 if test "${with_miblib3_incdir+set}" = set; then
    21594   withval="$with_miblib3_incdir"
    21595   coin_has_miblib3=installed
     21592# Check whether --with-m4_tolower(miplib3)-incdir or --without-m4_tolower(miplib3)-incdir was given.
     21593if test "${with_miplib3_incdir+set}" = set; then
     21594  withval="$with_miplib3_incdir"
     21595  coin_has_miplib3=installed
    2159621596fi;
    2159721597
    2159821598
    21599 # Check whether --with-m4_tolower(miblib3)-datadir or --without-m4_tolower(miblib3)-datadir was given.
    21600 if test "${with_miblib3_datadir+set}" = set; then
    21601   withval="$with_miblib3_datadir"
    21602   coin_has_miblib3=installed
     21599# Check whether --with-m4_tolower(miplib3)-datadir or --without-m4_tolower(miplib3)-datadir was given.
     21600if test "${with_miplib3_datadir+set}" = set; then
     21601  withval="$with_miplib3_datadir"
     21602  coin_has_miplib3=installed
    2160321603fi;
    2160421604
     
    2160921609fi
    2161021610
    21611 if test $coin_has_miblib3 = notGiven; then
     21611# check if project is available in present directory
     21612if test "$coin_has_miplib3" = notGiven; then
     21613  if test -d $srcdir/Data/miplib3; then
     21614    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     21615    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     21616    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
     21617     coin_have_project_dir=yes
     21618
     21619    if test $coin_have_project_dir = yes; then
     21620      coin_has_miplib3=Data/miplib3
     21621    fi
     21622  fi
     21623fi
     21624
     21625# check for project by using pkg-config, if pkg-config is available
     21626if test $coin_has_miplib3 = notGiven; then
    2161221627  #check for project by using pkg-config, if pkg-config is available
    2161321628  #we are only interested in installed packages here, so we do not search in $COIN_PKG_CONFIG_PATH_UNINSTALLED
     
    2161921634  if $PKG_CONFIG --exists "coindatamiplib3"; then
    2162021635    COINDATAMIPLIB3_VERSION=`$PKG_CONFIG --modversion "coindatamiplib3" 2>/dev/null`
    21621     coin_has_miblib3="$COINDATAMIPLIB3_VERSION"
     21636    coin_has_miplib3="$COINDATAMIPLIB3_VERSION"
    2162221637  else
    2162321638    COINDATAMIPLIB3_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatamiplib3"`
     
    2163521650fi
    2163621651
    21637 # if not found yet, check if project is available in present directory
    21638 if test "$coin_has_miblib3" = notGiven; then
    21639   if test -d $srcdir/Data/miblib3; then
    21640     # If a third argument is given, then we have to check if one one the files given in that third argument is present.
    21641     # If none of the files in the third argument is available, then we consider the project directory as non-existing.
    21642     # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    21643      coin_have_project_dir=yes
    21644 
    21645     if test $coin_have_project_dir = yes; then
    21646       coin_has_miblib3=Data/miblib3
    21647     fi
    21648   fi
    21649 fi
    21650 
    21651 echo "$as_me:$LINENO: result: $coin_has_miblib3" >&5
    21652 echo "${ECHO_T}$coin_has_miblib3" >&6
    21653 
    21654 echo "$as_me:$LINENO: checking whether project miblib3 need to be configured" >&5
    21655 echo $ECHO_N "checking whether project miblib3 need to be configured... $ECHO_C" >&6
     21652echo "$as_me:$LINENO: result: $coin_has_miplib3" >&5
     21653echo "${ECHO_T}$coin_has_miplib3" >&6
     21654
     21655echo "$as_me:$LINENO: checking whether project miplib3 needs to be configured" >&5
     21656echo $ECHO_N "checking whether project miplib3 needs to be configured... $ECHO_C" >&6
    2165621657if test "$coin_have_project_dir" = yes ; then
    2165721658
    21658   if test -r $srcdir/Data/miblib3/configure; then
    21659     coin_subdirs="$coin_subdirs Data/miblib3"
     21659  if test -r $srcdir/Data/miplib3/configure; then
     21660    coin_subdirs="$coin_subdirs Data/miplib3"
    2166021661    echo "$as_me:$LINENO: result: yes" >&5
    2166121662echo "${ECHO_T}yes" >&6
    2166221663
    2166321664
    21664 subdirs="$subdirs Data/miblib3"
     21665subdirs="$subdirs Data/miplib3"
    2166521666
    2166621667  else
Note: See TracChangeset for help on using the changeset viewer.