clean up and changes

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7938ff1d87185a9c5a3032ff6a27faed26415daf..b5b95721282c61313b54ace00ae36326b730bae4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AH_TOP([#define _GNU_SOURCE  1])
 AC_CANONICAL_HOST
 AC_PROG_AWK
 AC_PROG_CC
+gl_EARLY
+gl_INIT
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_OBJC
@@ -245,6 +247,23 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# glpk
+#AC_CHECK_HEADERS(glpk.h, glpk=true)
+#AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
+#AC_CHECK_LIB([glpk],[glp_create_prob])
+
+a=true
+AC_CHECK_HEADERS(glpk.h, ,[a=false])
+AC_CHECK_LIB([glpk],[glp_create_prob], , [a=false])
+if test $a == false
+then
+       AM_CONDITIONAL(HAVE_GLPK, [test x$a = xtrue])
+       AM_CONDITIONAL(HAVE_LIBGLPK, [test x$a != x$a])
+else
+       AM_CONDITIONAL(HAVE_GLPK, [test x$a = xtrue])
+       AM_CONDITIONAL(HAVE_LIBGLPK, [test x$a = x$a])
+fi
+
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -620,6 +639,8 @@ AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+
+
 # check for gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])