Make libidn optional.

diff --git a/configure.ac b/configure.ac
index 52bc8967d02ea2c03dae6afc41fbdcc2bdf9aa2c..bb02ab89353108eae8ef2a29d1f31b137001ce12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -387,11 +387,7 @@ if test "$libidn" != "no"; then
     [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.])
-  else
-  AC_MSG_FAILURE([Libidn not found])
-fi
+AM_CONDITIONAL([HAVE_LIBIDN], [test "$libidn" != "no"]) 
 AC_MSG_RESULT($libidn)
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f4397dbeff823ccdc39c1578b9bf059fdb31d1d..bc80696148cfc8e86c345f739765f68edcfcc952 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,16 +2,26 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
+if HAVE_LIBIDN
+ DNS = dns
+ EXIT = exit
+ PT = pt
+else
+ DNS =
+ EXIT =
+ PT =
+endif
+
 if HAVE_EXPERIMENTAL
  EXP_DIR = gns set dv consensus experimentation
 endif
 
 if LINUX
 # All of these currently only work on GNU/Linux
- LINUX_DIR = dns exit vpn pt
+ LINUX_DIR = $(DNS) $(EXIT) vpn $(PT)
 endif
 if MINGW
- MINGW_DIR = dns vpn exit
+ MINGW_DIR = $(DNS) vpn $(EXIT)
 endif
 
 if HAVE_MYSQL