Mercurial > octave-nkf
comparison configure.in @ 6804:4d3fa8841006
[project @ 2007-07-26 18:44:06 by jwe]
author | jwe |
---|---|
date | Thu, 26 Jul 2007 18:44:07 +0000 |
parents | 5e4ae36ffdb2 |
children | afa9123c5faa |
comparison
equal
deleted
inserted
replaced
6803:fe19c6cb5bc6 | 6804:4d3fa8841006 |
---|---|
27 | 27 |
28 EXTERN_CFLAGS="$CFLAGS" | 28 EXTERN_CFLAGS="$CFLAGS" |
29 EXTERN_CXXFLAGS="$CXXFLAGS" | 29 EXTERN_CXXFLAGS="$CXXFLAGS" |
30 | 30 |
31 AC_INIT | 31 AC_INIT |
32 AC_REVISION($Revision: 1.568 $) | 32 AC_REVISION($Revision: 1.569 $) |
33 AC_PREREQ(2.57) | 33 AC_PREREQ(2.57) |
34 AC_CONFIG_SRCDIR([src/octave.cc]) | 34 AC_CONFIG_SRCDIR([src/octave.cc]) |
35 AC_CONFIG_HEADER(config.h) | 35 AC_CONFIG_HEADER(config.h) |
36 | 36 |
37 OCTAVE_HOST_TYPE | 37 OCTAVE_HOST_TYPE |
580 AC_ARG_WITH(glpk, | 580 AC_ARG_WITH(glpk, |
581 [AS_HELP_STRING([--without-glpk], [don't use GLPK])], | 581 [AS_HELP_STRING([--without-glpk], [don't use GLPK])], |
582 with_glpk=$withval, with_glpk=yes) | 582 with_glpk=$withval, with_glpk=yes) |
583 | 583 |
584 glpk_lib= | 584 glpk_lib= |
585 glpk_missing=no | |
585 if test "$with_glpk" = yes; then | 586 if test "$with_glpk" = yes; then |
586 glpk_lib="glpk" | 587 glpk_lib="glpk" |
587 elif test "$with_glpk" != no; then | 588 elif test "$with_glpk" != no; then |
588 glpk_lib="$with_glpk" | 589 glpk_lib="$with_glpk" |
589 else | 590 else |
595 AC_CHECK_LIB($glpk_lib, glp_lpx_simplex, [ | 596 AC_CHECK_LIB($glpk_lib, glp_lpx_simplex, [ |
596 GLPK_LIBS="-l$glpk_lib" | 597 GLPK_LIBS="-l$glpk_lib" |
597 AC_DEFINE(GLPK_PRE_4_14, 1, [Define if GLPK version is less than 4.14.])], [ | 598 AC_DEFINE(GLPK_PRE_4_14, 1, [Define if GLPK version is less than 4.14.])], [ |
598 AC_CHECK_LIB($glpk_lib, _glp_lpx_simplex, [GLPK_LIBS="-l$glpk_lib"], [])]) | 599 AC_CHECK_LIB($glpk_lib, _glp_lpx_simplex, [GLPK_LIBS="-l$glpk_lib"], [])]) |
599 if test -n "$GLPK_LIBS"; then | 600 if test -n "$GLPK_LIBS"; then |
600 AC_CHECK_HEADERS(glpk.h, [ | 601 AC_CHECK_HEADERS([glpk/glpk.h glpk.h], [ |
602 glpk_missing=no | |
601 GLPK_LIBS="-l$glpk_lib" | 603 GLPK_LIBS="-l$glpk_lib" |
602 AC_DEFINE(HAVE_GLPK, 1, [Define if GLPK is available.])], [ | 604 AC_DEFINE(HAVE_GLPK, 1, [Define if GLPK is available.])], [ |
603 GLPK_LIBS= | 605 GLPK_LIBS= |
604 glpk_missing=yes]) | 606 glpk_missing=yes]) |
605 fi | 607 fi |