[GNUnet-SVN] r27558 - in gnunet: . src

[gnunet]

Author: grothoff
Date: 2013-06-25 12:06:56 +0200 (Tue, 25 Jun 2013)
New Revision: 27558

Modified:
   gnunet/README
   gnunet/configure.ac
   gnunet/src/Makefile.am
Log:
fix #2901: fail hard if libidn or header are not found

Modified: gnunet/README
===================================================================
--- gnunet/README       2013-06-25 10:00:42 UTC (rev 27557)
+++ gnunet/README       2013-06-25 10:06:56 UTC (rev 27558)
@@ -45,6 +45,7 @@
 - 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)

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-06-25 10:00:42 UTC (rev 27557)
+++ gnunet/configure.ac 2013-06-25 10:06:56 UTC (rev 27558)
@@ -384,15 +384,13 @@
      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
 

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-06-25 10:00:42 UTC (rev 27557)
+++ gnunet/src/Makefile.am      2013-06-25 10:06:56 UTC (rev 27558)
@@ -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