sync

commit 9c60576121f28fb613cafc743dd66626d877c6a3
parent db9150e9cb07e4b3f94b10a2a347a39722c0f0eb
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 10 Nov 2024 17:21:25 +0100

clean up build system

Diffstat:
M
configure.ac
 | 
32
+++++++-------------------------

1 file changed, 7 insertions(+), 25 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -166,35 +166,18 @@ PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3],
 ***]])])
 
 # libcurl-gnutls
-LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
-AS_IF([test "x$curl" = xtrue],
-      [LDFLAGS="-L$with_libcurl/lib $LDFLAGS"
-       CPPFLAGS="-I$with_libcurl/include $CPPFLAGS"])
-
+AC_CHECK_LIB([curl],
+             [curl_easy_getinfo],
+             [LIBCURL="-lcurl"
+              curl_gnutls=1],
+             [curl_gnutls=0])
+LIBCURL_CHECK_CONFIG([],[7.34.0],[curl=true],[curl=false])
 # Check for curl/curl.h
 AC_CHECK_HEADERS([curl/curl.h],,
   curl=false)
 
 AS_IF([test x$curl = xfalse],
-      [AC_MSG_ERROR([GNU Taler requires libcurl-gnutls  >= 7.34])])
-
-# check for libtalertwistertesting
-twistertesting=0
-AC_MSG_CHECKING([for talertwistertesting])
-AC_ARG_WITH([twister],
-            [AS_HELP_STRING([--with-twister=PFX], [base of libtalertwistertesting])],
-            [AC_MSG_RESULT([given as $with_twister])],
-            [AC_MSG_RESULT([not given])
-             with_twister=yes])
-AS_CASE([$with_twister],
-        [yes], [],
-        [no], [AC_MSG_WARN([no twister-testing will be compiled])],
-        [LDFLAGS="-L$with_twister/lib $LDFLAGS"
-         CPPFLAGS="-I$with_twister/include $CPPFLAGS"])
-
-AC_CHECK_HEADERS([taler/taler_twister_testing_lib.h],
- [AC_CHECK_LIB([talertwistertesting], [TALER_TESTING_run_twister], twistertesting=1,, [-ltalerexchange -ltalerbank])])
-AM_CONDITIONAL(HAVE_TWISTER, test x$twistertesting = x1)
+      [AC_MSG_ERROR([sync requires libcurl-gnutls  >= 7.34])])
 
 # gcov compilation
 AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
@@ -273,7 +256,6 @@ AM_CONDITIONAL([HAVE_GNUNETPQ], [false])
 AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
 AM_CONDITIONAL([USE_COVERAGE], [false])
 AM_CONDITIONAL([ENABLE_DOC], [true])
-AM_CONDITIONAL([HAVE_TWISTER], [true])
 
 
 # end of 'doc_only'