-fixing bad replacement earlier

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c2857c5ed2e1b6777277758118cdc2925185d258..42de9bde4a7fe228c6f9a5604addd288e8693674 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 LT_INIT([disable-static dlopen win32-dll])
+LT_CONFIG_LTDL_DIR([libltdl])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
@@ -361,6 +362,18 @@ AC_RUN_IFELSE(
 AC_LANG_POP(C)
 fi     # $build = $target
 
+# check for bluetooth library
+bluetooth=0
+AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, bluetooth=0) 
+if test "$bluetooth" = 1
+then
+  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
+else
+  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
+fi
+
+
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
 if test "$curl" = 1
@@ -383,15 +396,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
 
@@ -799,7 +810,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -1068,6 +1079,15 @@ AC_ARG_ENABLE([benchmarks],
 AC_MSG_RESULT($enable_benchmarks)
 AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
 
+# should gnunet-testing be compiled
+AC_MSG_CHECKING(wether to compile gnunet-testing)
+AC_ARG_ENABLE([testing],
+   [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])],
+   [enable_testing=${enableval}],
+   [enable_testing=yes])
+AC_MSG_RESULT($enable_testing)
+AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = "xyes"])
+
 # should experimental code be compiled (code that may not yet compile)?
 AC_MSG_CHECKING(whether to compile experimental code)
 AC_ARG_ENABLE([experimental],
@@ -1234,6 +1254,7 @@ Makefile
 contrib/Makefile
 doc/Makefile
 doc/man/Makefile
+doc/doxygen/Makefile
 m4/Makefile
 po/Makefile.in 
 src/Makefile
@@ -1268,6 +1289,8 @@ src/gns/nss/Makefile
 src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
+src/identity/Makefile
+src/identity/identity.conf
 src/hostlist/Makefile
 src/lockmanager/Makefile
 src/lockmanager/lockmanager.conf
@@ -1290,7 +1313,6 @@ src/set/Makefile
 src/set/set.conf
 src/statistics/Makefile
 src/statistics/statistics.conf
-src/stream/Makefile
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
@@ -1359,6 +1381,12 @@ then
   AC_MSG_NOTICE([NOTICE: libcurl not found.  http client support will not be compiled.])
 fi
 
+# bluetooth
+if test "x$bluetooth" = "x0"
+then
+  AC_MSG_NOTICE([NOTICE: bluetooth library not found.  bluetooth support will not be compiled.])
+fi
+
 #gnutls
 if test x$gnutls != xtrue
 then