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) | |
download | gnunet-b64879a11e2062b78e984b8e5c22dc26ba224668.tar.gz gnunet-b64879a11e2062b78e984b8e5c22dc26ba224668.zip |
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]) | |||
907 | # Check for LIBIDNs | 907 | # Check for LIBIDNs |
908 | there_can_only_be_one=1 | 908 | there_can_only_be_one=1 |
909 | 909 | ||
910 | working_libidn1=0 | ||
910 | working_libidn2=0 | 911 | working_libidn2=0 |
911 | if test $my_with_libidn2 = 1 | 912 | if test $my_with_libidn2 = 1 |
912 | then | 913 | then |
@@ -915,12 +916,13 @@ then | |||
915 | [idn2_to_unicode_8z8z], | 916 | [idn2_to_unicode_8z8z], |
916 | [working_libidn2=1 | 917 | [working_libidn2=1 |
917 | LIBS="-lidn2 $LIBS" | 918 | LIBS="-lidn2 $LIBS" |
918 | AC_DEFINE_UNQUOTED([HAVE_LIBIDN2], | 919 | AC_DEFINE_UNQUOTED([HAVE_LIBIDN2], |
919 | [1], | 920 | [1], |
920 | [Define to 1 if you have 'libidn2' (-lidn).])], | 921 | [Define to 1 if you have 'libidn2' (-lidn).])], |
921 | [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" | 922 | [MISSING_DEPS="${MISSING_DEPS}${MISSING_SEP}libidn2" |
922 | MISSING_SEP=", "]) | 923 | MISSING_SEP=", "]) |
923 | fi | 924 | fi |
925 | AM_CONDITIONAL(HAVE_LIBIDN2, test x$working_libidn2 = x1) | ||
924 | if test $working_libidn2 = 0 | 926 | if test $working_libidn2 = 0 |
925 | then | 927 | then |
926 | if test $my_with_libidn = 1 | 928 | if test $my_with_libidn = 1 |
@@ -928,7 +930,8 @@ then | |||
928 | AC_MSG_NOTICE([Checking for libidn]) | 930 | AC_MSG_NOTICE([Checking for libidn]) |
929 | AC_CHECK_LIB([idn], | 931 | AC_CHECK_LIB([idn], |
930 | [idna_to_ascii_8z], | 932 | [idna_to_ascii_8z], |
931 | [LIBS="-lidn $LIBS" | 933 | [working_libidn1=1 |
934 | LIBS="-lidn $LIBS" | ||
932 | AC_DEFINE_UNQUOTED([HAVE_LIBIDN], | 935 | AC_DEFINE_UNQUOTED([HAVE_LIBIDN], |
933 | [1], | 936 | [1], |
934 | [Define to 1 if you have 'libidn' (-lidn).])], | 937 | [Define to 1 if you have 'libidn' (-lidn).])], |
@@ -947,6 +950,7 @@ then | |||
947 | fi | 950 | fi |
948 | fi | 951 | fi |
949 | fi | 952 | fi |
953 | AM_CONDITIONAL(HAVE_LIBIDN, test x$working_libidn1 = x1) | ||
950 | 954 | ||
951 | if test $there_can_only_be_one = 0 | 955 | if test $there_can_only_be_one = 0 |
952 | then | 956 | 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 | |||
524 | src/include/gnunet_common.h | 524 | src/include/gnunet_common.h |
525 | src/include/gnunet_mq_lib.h | 525 | src/include/gnunet_mq_lib.h |
526 | src/include/gnunet_time_lib.h | 526 | src/include/gnunet_time_lib.h |
527 | src/rps/rps-test_util.h | ||
528 | src/scalarproduct/scalarproduct.h | 527 | src/scalarproduct/scalarproduct.h |
529 | src/testbed/testbed_api.h | 528 | src/testbed/testbed_api.h |
530 | src/testbed/testbed_api_operations.h | 529 | 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 | |||
126 | LIBIDN= -lidn | 126 | LIBIDN= -lidn |
127 | else | 127 | else |
128 | LIBIDN= | 128 | LIBIDN= |
129 | endif | ||
129 | 130 | ||
130 | if HAVE_LIBIDN2 | 131 | if HAVE_LIBIDN2 |
131 | LIBIDN2= -lidn2 | 132 | LIBIDN2= -lidn2 |
132 | else | 133 | else |
133 | LIBIDN2= | 134 | LIBIDN2= |
135 | endif | ||
134 | 136 | ||
135 | libgnunetutil_la_LIBADD = \ | 137 | libgnunetutil_la_LIBADD = \ |
136 | $(GCLIBADD) $(WINLIB) \ | 138 | $(GCLIBADD) $(WINLIB) \ |
137 | $(LIBGCRYPT_LIBS) \ | 139 | $(LIBGCRYPT_LIBS) \ |
138 | $(LTLIBICONV) \ | 140 | $(LTLIBICONV) \ |
139 | $(LTLIBINTL) \ | 141 | $(LTLIBINTL) \ |
140 | -lltdl $(LIBIDN) $(LIBIDN2) $(Z_LIBS) -lunistring $(XLIB) $(PTHREAD) | 142 | -lltdl \ |
143 | $(LIBIDN) $(LIBIDN2) \ | ||
144 | $(Z_LIBS) \ | ||
145 | -lunistring \ | ||
146 | $(XLIB) \ | ||
147 | $(PTHREAD) | ||
141 | 148 | ||
142 | libgnunetutil_la_LDFLAGS = \ | 149 | libgnunetutil_la_LDFLAGS = \ |
143 | $(GN_LIB_LDFLAGS) \ | 150 | $(GN_LIB_LDFLAGS) \ |