diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/util/Makefile.am | 12 | ||||
-rw-r--r-- | src/util/dnsparser.c | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index b0f45b1da..165d41d01 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -122,12 +122,22 @@ libgnunetutil_la_SOURCES = \ | |||
122 | tun.c \ | 122 | tun.c \ |
123 | speedup.c speedup.h | 123 | speedup.c speedup.h |
124 | 124 | ||
125 | if HAVE_LIBIDN | ||
126 | LIBIDN= -lidn | ||
127 | else | ||
128 | LIBIDN= | ||
129 | |||
130 | if HAVE_LIBIDN2 | ||
131 | LIBIDN2= -lidn2 | ||
132 | else | ||
133 | LIBIDN2= | ||
134 | |||
125 | libgnunetutil_la_LIBADD = \ | 135 | libgnunetutil_la_LIBADD = \ |
126 | $(GCLIBADD) $(WINLIB) \ | 136 | $(GCLIBADD) $(WINLIB) \ |
127 | $(LIBGCRYPT_LIBS) \ | 137 | $(LIBGCRYPT_LIBS) \ |
128 | $(LTLIBICONV) \ | 138 | $(LTLIBICONV) \ |
129 | $(LTLIBINTL) \ | 139 | $(LTLIBINTL) \ |
130 | -lltdl -lidn $(Z_LIBS) -lunistring $(XLIB) $(PTHREAD) | 140 | -lltdl $(LIBIDN) $(LIBIDN2) $(Z_LIBS) -lunistring $(XLIB) $(PTHREAD) |
131 | 141 | ||
132 | libgnunetutil_la_LDFLAGS = \ | 142 | libgnunetutil_la_LDFLAGS = \ |
133 | $(GN_LIB_LDFLAGS) \ | 143 | $(GN_LIB_LDFLAGS) \ |
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c index 24f1b18cf..79d723f12 100644 --- a/src/util/dnsparser.c +++ b/src/util/dnsparser.c | |||
@@ -17,13 +17,17 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | /** | 19 | /** |
20 | * @file dns/dnsparser.c | 20 | * @file util/dnsparser.c |
21 | * @brief helper library to parse DNS packets. | 21 | * @brief helper library to parse DNS packets. |
22 | * @author Philipp Toelke | 22 | * @author Philipp Toelke |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include "platform.h" | 25 | #include "platform.h" |
26 | #if defined(HAVE_LIBIDN2) | ||
27 | #include <idn2.h> | ||
28 | #elif defined(HAVE_LIBIDN) | ||
26 | #include <idna.h> | 29 | #include <idna.h> |
30 | #endif | ||
27 | #if WINDOWS | 31 | #if WINDOWS |
28 | #include <idn-free.h> | 32 | #include <idn-free.h> |
29 | #endif | 33 | #endif |