fixing #5439

diff --git a/configure.ac b/configure.ac
index d09bd7c30d9139e25b67510b31e029f24a1b0556..82329ef4577644aee29f9a482b04b2291c04ea8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -607,8 +607,8 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0],
 pbc=0
 AC_CHECK_HEADER([pbc/pbc.h],pbc=1)
 AC_CHECK_HEADER([gabe.h],abe=1)
-AM_CONDITIONAL(HAVE_PBC, [test "$pbc" = 1])
-AM_CONDITIONAL(HAVE_ABE, [test "$abe" = 1])
+AM_CONDITIONAL(HAVE_PBC, [test "x$pbc" = x1])
+AM_CONDITIONAL(HAVE_ABE, [test "x$abe" = x1])
 if test "x$pbc" = x1
 then
   AC_DEFINE([HAVE_PBC],[1],[Have pbc library])
@@ -623,8 +623,8 @@ else
 fi
 ,
 # glib-2 not found
-  AM_CONDITIONAL(HAVE_PBC, [0])
-  AM_CONDITIONAL(HAVE_ABE, [0])
+  AM_CONDITIONAL(HAVE_PBC, [false])
+  AM_CONDITIONAL(HAVE_ABE, [false])
   AC_DEFINE([HAVE_PBC],[0],[Lacking glib library])
 )
 
@@ -778,14 +778,14 @@ AC_ARG_WITH(extractor,
       no)
         ;;
       yes)
-        AC_CHECK_HEADERS(extractor.h,
+        AC_CHECK_HEADERS([extractor.h],
           AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults],
             extractor=1))
         ;;
       *)
         LDFLAGS="-L$with_extractor/lib $LDFLAGS"
         CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
-        AC_CHECK_HEADERS(extractor.h,
+        AC_CHECK_HEADERS([extractor.h],
           AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults],
             EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH"
             extractor=1))
@@ -793,7 +793,7 @@ AC_ARG_WITH(extractor,
     esac
    ],
    [AC_MSG_RESULT([--with-extractor not specified])
-    AC_CHECK_HEADERS(extractor.h,
+    AC_CHECK_HEADERS([extractor.h],
      AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults],
       extractor=1))])
 # restore LIBS
@@ -1164,7 +1164,7 @@ then
   fi
 fi
 AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue)
-AM_CONDITIONAL(HAVE_MYSQLE, test "0" = "1")
+AM_CONDITIONAL(HAVE_MYSQLE, false)
 # restore LIBS
 LIBS=$SAVE_LIBS
 LDFLAGS=$SAVE_LDFLAGS

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 54357dd1e6a3cd9a449475629555008440f8cda9..c9ff763fdc3868c9988a85d4a9ff0f8ba30fa4a3 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -164,7 +164,6 @@ gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \
   $(GN_LIBINTL)
 
 
-
 gnunet_service_namestore_SOURCES = \
  gnunet-service-namestore.c
 
@@ -180,7 +179,7 @@ gnunet_service_namestore_LDADD = \
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
   $(POSTGRES_PLUGIN) \
-       $(HEAP_PLUGIN)
+  $(HEAP_PLUGIN)