changed confs

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 16bf23b7e25a76bc15c5aa4b8347e5ce9905b504..ab55d0b8b0573cf7462a74019eb0a24df978e933 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,20 +21,20 @@
 #
 #
 AC_PREREQ(2.61)
+# Checks for programs.
 AC_INIT([gnunet], [0.9.0pre2],[bug-gnunet@gnu.org])
+
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
+
 AM_INIT_AUTOMAKE([gnunet], [0.9.0pre2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
-
 AH_TOP([#define _GNU_SOURCE  1])
 
-# Checks for programs.
-AC_CANONICAL_TARGET
-AC_CANONICAL_SYSTEM
 AC_PROG_AWK
 AC_PROG_CC
-gl_EARLY
-gl_INIT
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_OBJC
@@ -42,7 +42,6 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
-AC_CANONICAL_HOST
 LT_INIT([disable-static dlopen win32-dll])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
@@ -262,7 +261,7 @@ AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
 AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
 # GLPK must support atm MLP presolving, version >= 4.32
 AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
-if test $gplk = false
+if test x$gplk = xfalse
 then
        AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
        AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])