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

[gnunet]

Author: amatus
Date: 2013-06-12 05:25:32 +0200 (Wed, 12 Jun 2013)
New Revision: 27419

Modified:
   gnunet/configure.ac
   gnunet/src/Makefile.am
Log:
Make libidn optional.


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-06-12 01:56:48 UTC (rev 27418)
+++ gnunet/configure.ac 2013-06-12 03:25:32 UTC (rev 27419)
@@ -387,11 +387,7 @@
     [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)
 
 

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-06-12 01:56:48 UTC (rev 27418)
+++ gnunet/src/Makefile.am      2013-06-12 03:25:32 UTC (rev 27419)
@@ -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