diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-10-25 12:00:16 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-10-25 12:01:28 +0200 |
| commit | b64879a11e2062b78e984b8e5c22dc26ba224668 (patch) | |
| tree | 4aa89ec773918de3dca484b107c5822396298d89 | |
| parent | 0a97ba60f4f09558b0c2a4b8d2c09e6ff7bfd112 (diff) | |
fix -lidn(2) linkage by adding missing AM_CONDITIONAL and missing endif statements
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/util/Makefile.am | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e36d0b2d3..f0ab98390 100644 --- a/configure.ac +++ b/configure.ac @@ -907,6 +907,7 @@ AC_MSG_CHECKING([if libidn can be used]) # Check for LIBIDNs there_can_only_be_one=1 +working_libidn1=0 working_libidn2=0 if test $my_with_libidn2 = 1 then @@ -915,12 +916,13 @@ then [idn2_to_unicode_8z8z], [working_libidn2=1 LIBS="-lidn2 $LIBS" - AC_DEFINE_UNQUOTED([HAVE_LIBIDN2], + AC_DEFINE_UNQUOTED([HAVE_LIBIDN2], [1], [Define to 1 if you have 'libidn2' (-lidn).])], [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" MISSING_SEP=", "]) fi +AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) if test $working_libidn2 = 0 then if test $my_with_libidn = 1 @@ -928,7 +930,8 @@ then AC_MSG_NOTICE([Checking for libidn]) AC_CHECK_LIB([idn], [idna_to_ascii_8z], - [LIBS="-lidn $LIBS" + [working_libidn1=1 + LIBS="-lidn $LIBS" AC_DEFINE_UNQUOTED([HAVE_LIBIDN], [1], [Define to 1 if you have 'libidn' (-lidn).])], @@ -947,6 +950,7 @@ then fi fi fi +AM_CONDITIONAL(HAVE_LIBIDN, test x$working_libidn1 = x1) if test $there_can_only_be_one = 0 then diff --git a/po/POTFILES.in b/po/POTFILES.in index 36cc7cdff..bb785afd9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -524,7 +524,6 @@ src/fs/fs_api.h src/include/gnunet_common.h src/include/gnunet_mq_lib.h src/include/gnunet_time_lib.h -src/rps/rps-test_util.h src/scalarproduct/scalarproduct.h src/testbed/testbed_api.h src/testbed/testbed_api_operations.h diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 165d41d01..fc5a4648c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -126,18 +126,25 @@ if HAVE_LIBIDN LIBIDN= -lidn else LIBIDN= +endif if HAVE_LIBIDN2 LIBIDN2= -lidn2 else LIBIDN2= +endif libgnunetutil_la_LIBADD = \ $(GCLIBADD) $(WINLIB) \ $(LIBGCRYPT_LIBS) \ $(LTLIBICONV) \ $(LTLIBINTL) \ - -lltdl $(LIBIDN) $(LIBIDN2) $(Z_LIBS) -lunistring $(XLIB) $(PTHREAD) + -lltdl \ + $(LIBIDN) $(LIBIDN2) \ + $(Z_LIBS) \ + -lunistring \ + $(XLIB) \ + $(PTHREAD) libgnunetutil_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ |