fix #2901: fail hard if libidn or header are not found

diff --git a/README b/README
index cf3562f124ce778049d0311fb43fe3d814e10b8b..ee0af1dcc25d8c971d5dac891b4b917e4d1c8a78 100644 (file)
--- a/README
+++ b/README
@@ -45,6 +45,7 @@ These are the direct dependencies for running GNUnet:
 - libcurl       >= 7.21.3
 - libunistring  >= 0.9.2
 - gnutls        >= 2.12.0
+- libidn        >= 1.0
 - libltdl       >= 2.2 (part of GNU libtool)
 - sqlite        >= 3.0 (default database)
 - mysql         >= 5.1 (alternative to sqLite)

diff --git a/configure.ac b/configure.ac
index 0f6602f2127914755fd18040ca2a5e9e31f45ad6..db01a1460a5d2cb03a9b5a48fd94e1915b450cc7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -384,15 +384,13 @@ if test "$libidn" != "no"; then
      CPPFLAGS="${CPPFLAGS} -I$libidn/include"
   fi
   AC_CHECK_HEADER(idna.h,
-  AC_CHECK_LIB(idn, stringprep_check_version,
-    [libidn=yes LIBS="${LIBS} -lidn"], libidn=no),
-     libidn=no)
+    AC_CHECK_LIB(idn, stringprep_check_version,
+      [libidn=yes LIBS="${LIBS} -lidn"], 
+      AC_MSG_FAILURE([GNUnet requires libidn])),
+    AC_MSG_FAILURE([GNUnet requires libidn]))
 fi
-AM_CONDITIONAL([HAVE_LIBIDN], [test "$libidn" != "no"]) 
 AC_MSG_RESULT($libidn)
 
-
-
 # restore LIBS
 LIBS=$SAVE_LIBS
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 62a08cb5aa9c357a832236baa04ffe82c964a912..22b24b9bf7c8541b8732a61dcdb9ffa3ed94e1ab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,24 +2,16 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-if HAVE_LIBIDN
- EXIT = exit
- PT = pt
-else
- 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 = $(EXIT) vpn $(PT)
+# All of these currently only work on GNU/Linux or W32
+ LINUX_DIR = exit vpn pt
 endif
 if MINGW
- MINGW_DIR = vpn $(EXIT)
+ MINGW_DIR = vpn exit pt
 endif
 
 if HAVE_MYSQL