Merge branch 'configure_libidn' into 'master'

Configure libidn

configure.ac

@@ -292,20 +292,21 @@ AC_EGREP_CPP(openssl_version_ok,
   ],[],[AC_MSG_ERROR([OpenSSL library version >= 1.0.0 is required.])]
 )
 
-AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
-    [Support IDN (needs GNU Libidn)]),
-    libidn=$withval, libidn=yes)
-if test "$libidn" != "no"; then
-    if test "$libidn" != "yes"; then
-        LDFLAGS="${LDFLAGS} -L$libidn/lib"
-        CPPFLAGS="${CPPFLAGS} -I$libidn/include"
+dnl Check for libidn.
+AC_ARG_WITH(libidn,
+    AC_HELP_STRING([--with-libidn=[DIR]], [Support IDN (needs GNU Libidn)]),
+    with_libidn=$withval,
+    with_libidn=yes
+)
+if test "$with_libidn" != "no" ; then
+    PKG_CHECK_MODULES([libidn], [libidn >= 0.0.0], [with_libidn=yes], [with_libidn=no])
+    if test "$with_libidn" != "yes" ; then
+        with_libidn=no
+        AC_MSG_WARN([Libidn not found])
+    else
+        with_libidn=yes
+        AC_DEFINE([LIBIDN], [1], [Define to 1 to enable IDN support])
     fi
-    AC_CHECK_HEADER(idna.h, AC_CHECK_LIB(idn, stringprep_check_version,
-                                 [libidn=yes LIBS="${LIBS} -lidn"], libidn=no),
-                    libidn=no)
-fi
-if test "$libidn" != "no" ; then
-    AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.])
 fi
 
 dnl Check for dnstap.
@@ -407,7 +408,7 @@ AC_MSG_RESULT([
     Config dir:  ${config_dir}
 
     Fast zone parser:      ${enable_fastparser}
-    Utilities with IDN:    ${libidn}
+    Utilities with IDN:    ${with_libidn}
     Systemd notifications: ${enable_systemd}
     Dnstap support:        ${opt_dnstap}
     Code coverage:         ${enable_code_coverage}

src/Makefile.am

@@ -11,7 +11,8 @@ AM_CPPFLAGS = \
 	-include $(top_builddir)/src/config.h \
 	-DCONFIG_DIR='"${config_dir}"' \
 	-DSTORAGE_DIR='"${storage_dir}"' \
-	-DRUN_DIR='"${run_dir}"'
+	-DRUN_DIR='"${run_dir}"' \
+	$(libidn_CFLAGS)
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 AM_YFLAGS = -d
@@ -313,6 +314,7 @@ libknotd_la_SOURCES =				\
 # libraries
 libknot_la_LIBADD  = libknots.la zscanner/libzscanner.la
 libknotd_la_LIBADD = libknots.la libknot.la
+libknotus_la_LDFLAGS = $(libidn_LIBS)
 
 # sbin programs
 knotd_LDADD = libknot.la libknotd.la
@@ -322,8 +324,8 @@ knotd_LDFLAGS = $(AM_LDFLAGS) ${systemd_daemon_LIBS}
 knotc_LDADD = libknot.la libknotd.la
 
 # bin programs
-kdig_LDADD       = libknotus.la libknots.la libknot.la
-khost_LDADD      = libknotus.la libknots.la libknot.la
+kdig_LDADD       = libknotus.la libknots.la libknot.la $(libidn_LIBS)
+khost_LDADD      = libknotus.la libknots.la libknot.la $(libidn_LIBS)
 knsupdate_LDADD  = libknotus.la libknots.la libknot.la zscanner/libzscanner.la
 knsec3hash_LDADD = libknotus.la libknots.la libknot.la