Ignore:
Timestamp:
Sep 13, 2009 2:24:20 PM (12 years ago)
Author:
stefan
Message:

revert my recent changes related to BSPsplit after copying them into branches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/configure.ac

    r1396 r1411  
    2121# List one file in the package so that the configure script can test
    2222# whether the package is actually there
    23 AC_CONFIG_SRCDIR(glpk/include/glpk.h)
     23AC_CONFIG_SRCDIR(Makefile.am)
    2424
    2525# Where should everything be installed by default?  Here, we want it
     
    5454#                            COIN_HAS_GLPK                                #
    5555###########################################################################
    56 
    57 AC_COIN_HAS_PROJECT(Glpk)
    5856
    5957# This macro checks for a library containing the GLPK library.  It
     
    6765
    6866## Check if GLPK is already provided by user
    69 #AC_COIN_HAS_GLPK(Glpk)
    70 
    71 #rm -f $MAKEOKFILE
    72 #if test x"$use_thirdpartyglpk" = xbuild ; then
    73 #  touch $MAKEOKFILE
     67AC_COIN_HAS_GLPK(Glpk)
     68
     69rm -f $MAKEOKFILE
     70if test x"$use_thirdpartyglpk" = xbuild ; then
     71  touch $MAKEOKFILE
    7472  AC_MSG_CHECKING([GLPK version])
    75   glpkmajorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    76   glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    77   AC_MSG_RESULT([${glpkmajorver}.${glpkminorver}])
    78   if test x$glpkmajorver != x4 || test x$glpkminorver != x39 ; then
     73  majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
     74  minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
     75  AC_MSG_RESULT([${majorver}.${minorver}])
     76  if test x$majorver != x4 || test x$minorver != x39 ; then
    7977    AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.39. Please update by rerunning get.GLPK"])
    8078  fi
    81   AC_SUBST(glpkmajorver)
    82   AC_SUBST(glpkminorver)
    83 #else
    84 #  if test x$coin_has_glpk = xtrue ; then
    85 #    AC_MSG_NOTICE([The Glpk sources don't need to be compiled])
    86 #  else
    87 #    AC_MSG_WARN([Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?])
    88 #  fi
    89 #  MAKEOKFILE=
    90 #fi
    91 #AC_SUBST(MAKEOKFILE)
     79else
     80  if test x$coin_has_glpk = xtrue ; then
     81    AC_MSG_NOTICE([The Glpk sources don't need to be compiled])
     82  else
     83    AC_MSG_WARN([Glpk source is available but will not be built. No valid external library is detected. Are you sure this is what you want?])
     84  fi
     85  MAKEOKFILE=
     86fi
     87AC_SUBST(MAKEOKFILE)
    9288
    9389###########################################################################
     
    136132
    137133if test "$enable_dl" = "no"; then
    138   AC_COIN_CHECK_HEADER([ltdl.h],[enable_dl=yes])
     134AC_COIN_CHECK_HEADER([ltdl.h],[enable_dl=yes])
    139135  if test "$enable_dl" = "yes"; then
    140136    #if ltdl.h is there, check also if libltdl is there; if so, set corresponding define for GLPK
     
    154150
    155151AC_ARG_ENABLE(odbc,
    156   AC_HELP_STRING([--enable-odbc],[enable MathProg ODBC support [[default=auto]]]),
    157   [case $enableval in
    158      yes | unix)
     152        AC_HELP_STRING([--enable-odbc],[enable MathProg ODBC support [[default=auto]]]),
     153        [case $enableval in
     154           yes | unix)
    159155       AC_COIN_CHECK_HEADER([sql.h],,[AC_MSG_ERROR(["need sql.h to enable ODBC support"])])
    160156       enable_odbc="$enableval"
     
    163159       enable_odbc="no"
    164160     ;;
    165      *)
    166        AC_MSG_ERROR([invalid value '$enableval' for --enable-odbc])
    167      ;;
     161           *)
     162             AC_MSG_ERROR([invalid value '$enableval' for --enable-odbc])
     163           ;;
    168164   esac],
    169   [AC_COIN_CHECK_HEADER([sql.h],[enable_odbc=yes],[enable_odbc=no])]
     165        [AC_COIN_CHECK_HEADER([sql.h],[enable_odbc=yes],[enable_odbc=no])]
    170166)
    171167
    172168AC_ARG_ENABLE(mysql,
    173   AC_HELP_STRING([--enable-mysql],[enable MathProg MySQL support [[default=auto]]]),
    174   [case $enableval in
    175      yes)
     169        AC_HELP_STRING([--enable-mysql],[enable MathProg MySQL support [[default=auto]]]),
     170        [case $enableval in
     171           yes)
    176172       AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],,[AC_MSG_ERROR(["need mysql.h to enable MySQL support"])])
    177173       enable_mysql="$enableval"
     
    180176       enable_mysql="no"
    181177     ;;
    182      *)
    183        AC_MSG_ERROR([invalid value '$enableval' for --enable-mysql])
    184      ;;
     178           *)
     179             AC_MSG_ERROR([invalid value '$enableval' for --enable-mysql])
     180           ;;
    185181   esac],
    186   [AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],[enable_mysql=yes],[enable_mysql=no])]
     182        [AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],[enable_mysql=yes],[enable_mysql=no])]
    187183)
    188184
    189185AC_LANG_POP(C)
    190 
     186       
    191187if test "$enable_dl" = "yes" && ( test "$enable_odbc" = "yes" || test "$enable_odbc" = "unix"); then
    192188  AC_MSG_CHECKING([checking name of ODBC library])
     
    271267AC_SUBST(GLPKDIR)
    272268
    273 AC_CONFIG_FILES([Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc])
     269AC_CONFIG_FILES([Makefile glpk_addlibs.txt])
    274270AC_CONFIG_HEADER([config_glpk.h])
    275271
Note: See TracChangeset for help on using the changeset viewer.