diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-12-05 12:59:32 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-12-05 12:59:32 +0100 |
| commit | 489f6665155d9db9982c3285fe61e818214f18da (patch) | |
| tree | b4448f532a4847c85db976c40bd7b62acda3df23 /configure.ac | |
| parent | 09e5b8f57295e763e9e90812dd94c3bb44bf31f0 (diff) | |
adapt to latest changes in GNUnet build system
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 053897eb..9b2c1deb 100644 --- a/configure.ac +++ b/configure.ac @@ -79,11 +79,8 @@ AS_CASE([$with_gnunet], [no], [AC_MSG_ERROR([--with-gnunet is required])], [LDFLAGS="-L$with_gnunet/lib $LDFLAGS" CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"]) -AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h], - [AC_CHECK_LIB([gnunetutil], [GNUNET_SCHEDULER_run], libgnunetutil=1)], - [], [#ifdef HAVE_GNUNET_PLATFORM_H - #include <gnunet/platform.h> - #endif]) +AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h], + [AC_CHECK_LIB([gnunetutil], [GNUNET_SCHEDULER_run], libgnunetutil=1)]) AS_IF([test $libgnunetutil != 1], [AC_MSG_ERROR([[ *** @@ -123,10 +120,7 @@ AS_CASE([$with_exchange], CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" AC_CHECK_HEADERS([gnunet/gnunet_pq_lib.h], - [AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_connect_with_cfg], libgnunetpq=1)], - [], [#ifdef HAVE_GNUNET_PLATFORM_H - #include <gnunet/platform.h> - #endif]) + [AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_connect_with_cfg], libgnunetpq=1)]) AM_CONDITIONAL(HAVE_GNUNETPQ, test x$libgnunetpq = x1) # check for libmicrohttpd @@ -222,10 +216,7 @@ AS_CASE([$with_exchange], CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" AC_CHECK_HEADERS([taler/taler_fakebank_lib.h], - [AC_CHECK_LIB([talerfakebank], [TALER_FAKEBANK_start], libtalerfakebank=1)], - [], [#ifdef HAVE_GNUNET_PLATFORM_H - #include <gnunet/platform.h> - #endif]) + [AC_CHECK_LIB([talerfakebank], [TALER_FAKEBANK_start], libtalerfakebank=1)]) AM_CONDITIONAL(HAVE_TALERFAKEBANK, test x$libtalerfakebank = x1) @@ -243,12 +234,7 @@ AS_CASE([$with_twister], [LDFLAGS="-L$with_twister/lib $LDFLAGS" CPPFLAGS="-I$with_twister/include $CPPFLAGS"]) AC_CHECK_LIB(talertwistertesting,TALER_TWISTER_run_twister, - [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1],, - [#ifdef HAVE_GNUNET_PLATFORM_H - #include <gnunet/platform.h> - #endif - ])]) - + [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1])]) AM_CONDITIONAL(HAVE_TWISTER, test x$twistertesting = x1) |