nix package definition for development

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 11e9cbf3ca87a8e159743165bacd8b0c92b5873f..bd230860d46c8de04925b3032e1dbb2cacad8cae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -727,6 +727,8 @@ fi
 if test $gl_libunistring_hexversion -le 2305; then
  AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
 fi
+AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
+
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -796,6 +798,7 @@ AC_SUBST(SQLITE_LDFLAGS)
 postgres=false
 AX_LIB_POSTGRESQL([])
 if test "$found_postgresql" = "yes"; then
+  CFLAGS="$CFLAGS $POSTGRESQL_CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
   AC_CHECK_HEADERS([libpq-fe.h],
     postgres=true)
@@ -824,11 +827,17 @@ SAVE_CPPFLAGS=$CPPFLAGS
 AC_MSG_CHECKING(for mysql)
 AC_ARG_WITH(mysql,
   [  --with-mysql=PFX        base of MySQL installation],
-  [AC_MSG_RESULT("$with_mysql")
-   if test "$with_mysql" != "no"
-   then
-    if test "$with_mysql" != "yes"
-    then
+  [AC_MSG_RESULT([$with_mysql])
+   case $with_mysql in
+   no)
+      ;;
+   yes|"")
+      AC_CHECK_HEADERS(mysql/mysql.h,
+       AC_CHECK_LIB(mysqlclient, mysql_init,
+
+       mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+      ;;
+   *)
       LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
       CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
       AC_CHECK_HEADERS(mysql/mysql.h,
@@ -837,8 +846,8 @@ AC_ARG_WITH(mysql,
         MYSQL_CPPFLAGS="-I$with_mysql/include"
 
         mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
-    fi
-   fi
+      ;;
+   esac
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
    if test -d "/usr/lib64/mysql"; then
@@ -904,7 +913,7 @@ AC_ARG_WITH(microhttpd,
     case $with_microhttpd in
       no)
         ;;
-      yes)
+      yes|"")
         AC_CHECK_HEADERS([microhttpd.h],
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
@@ -1601,6 +1610,8 @@ src/statistics/statistics.conf
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
+src/testbed-logger/Makefile
+src/testbed-logger/testbed-logger.conf
 src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile