Ignore:
Timestamp:
Mar 8, 2014 1:54:11 PM (6 years ago)
Author:
stefan
Message:

get it compiling with buildtools/trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/configure.ac

    r3059 r3193  
    1616Copyright 2007-2010 Stefan Vigerske and others.
    1717All Rights Reserved.
    18 This file is part of the open source package Coin which is distributed
     18This file is part of the open source package ThirdParty/Glpk which is distributed
    1919under the Eclipse Public License.])
    2020
     
    2929AC_PREFIX_DEFAULT([`pwd`])
    3030
    31 AC_COIN_PROJECTDIR_INIT(Glpk)
     31AC_COIN_INITIALIZE(Glpk)
    3232
    3333#############################################################################
     
    4040#turn off warnings and pedantic mode since it seem to make trouble on solaris platform
    4141#and we couldn't fix it anyway
    42 coin_skip_warn_cflags=yes
     42#coin_skip_warn_cflags=yes
    4343
    4444# Check if user wants to produce debugging code
    45 AC_COIN_DEBUG_COMPILE(Glpk)
     45#AC_COIN_DEBUG_COMPILE(Glpk)
    4646
    4747# Get the name of the C compiler
    48 AC_COIN_PROG_CC
     48#AC_COIN_PROG_CC
     49AC_PROG_CC
    4950
    5051# Check if pkg-config is available (to setup addlibs file)
    51 AC_COIN_HAS_PKGCONFIG
     52#AC_COIN_HAS_PKGCONFIG
    5253
    5354# Initialize automake
    54 AC_COIN_INIT_AUTO_TOOLS
     55#AC_COIN_INIT_AUTO_TOOLS
     56AM_INIT_AUTOMAKE
     57AM_MAINTAINER_MODE
     58
     59AC_PROG_LIBTOOL
    5560
    5661###########################################################################
     
    7479AC_LANG_PUSH(C)
    7580
    76 AC_COIN_CHECK_GMP(Glpk)
    77 if test $coin_has_gmp = yes; then
    78   AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
    79 fi
     81#AC_COIN_CHECK_GMP(Glpk)
     82#if test $coin_has_gmp = yes; then
     83#  AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
     84#fi
    8085
    8186AC_CHECK_FUNC([vsnprintf])
     
    8388AC_LANG_POP(C)
    8489
    85 AC_COIN_CHECK_LIBM(Glpk)
     90#AC_COIN_CHECK_LIBM(Glpk)
    8691
    8792###########################################################################
     
    9499AC_LANG_PUSH(C)
    95100
    96 AC_COIN_CHECK_HEADER([dlfcn.h],[enable_dl=yes])
     101AC_CHECK_HEADER([dlfcn.h],[enable_dl=yes])
    97102if test "$enable_dl" = "yes"; then
    98103  #if dlfcn.h is there, check also if libdl is there; if so, set corresponding define for GLPK
     
    105110
    106111if test "$enable_dl" = "no"; then
    107   AC_COIN_CHECK_HEADER([ltdl.h],[enable_dl=yes])
     112  AC_CHECK_HEADER([ltdl.h],[enable_dl=yes])
    108113  if test "$enable_dl" = "yes"; then
    109114    #if ltdl.h is there, check also if libltdl is there; if so, set corresponding define for GLPK
     
    117122
    118123if test "$enable_dl" = "no"; then
    119   AC_COIN_CHECK_HEADER([windows.h],[enable_dl=yes])
     124  AC_CHECK_HEADER([windows.h],[enable_dl=yes])
    120125  if test "$enable_dl" = "yes"; then
    121126    AC_DEFINE([__WOE__],[1],[Define to 1 if windows dll support is available])
     
    127132  [case $enableval in
    128133     yes | unix)
    129        AC_COIN_CHECK_HEADER([sql.h],,[AC_MSG_ERROR(["need sql.h to enable ODBC support"])])
     134       AC_CHECK_HEADER([sql.h],,[AC_MSG_ERROR(["need sql.h to enable ODBC support"])])
    130135       enable_odbc="$enableval"
    131136     ;;
     
    137142     ;;
    138143   esac],
    139   [AC_COIN_CHECK_HEADER([sql.h],[enable_odbc=yes],[enable_odbc=no])]
     144  [AC_CHECK_HEADER([sql.h],[enable_odbc=yes],[enable_odbc=no])]
    140145)
    141146
     
    144149  [case $enableval in
    145150     yes)
    146        AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],,[AC_MSG_ERROR(["need mysql.h to enable MySQL support"])])
     151       AC_CHECK_HEADER([mysql.h mysql/mysql.h],,[AC_MSG_ERROR(["need mysql.h to enable MySQL support"])])
    147152       enable_mysql="$enableval"
    148153     ;;
     
    154159     ;;
    155160   esac],
    156   [AC_COIN_CHECK_HEADER([mysql.h mysql/mysql.h],[enable_mysql=yes],[enable_mysql=no])]
     161  [AC_CHECK_HEADER([mysql.h mysql/mysql.h],[enable_mysql=yes],[enable_mysql=no])]
    157162)
    158163
     
    241246AC_SUBST(GLPKDIR)
    242247
    243 AC_CONFIG_FILES([Makefile coinglpk.pc coinglpk-uninstalled.pc])
     248AC_CONFIG_FILES([Makefile coinglpk.pc])
    244249AC_CONFIG_HEADER([config_glpk.h])
    245250
    246 AC_SUBST(GLPK_PCLIBS)
     251#AC_SUBST(GLPK_PCLIBS)
    247252
    248253AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.