X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=c676164be1e288bb022e93f493cae87edd69d79a;hb=b1ed5b9a472bd56796646a70068eb48da0db3e2f;hp=b1fea6a2eac56b05040a01839195b5731513f548;hpb=ea7eed529e12dcbed6a6775b818d8b93b9505f18;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index b1fea6a2e..c676164be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ linux*)
      LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32"
      CFLAGS="-mms-bitfields $CFLAGS"
-     CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 $CPPFLAGS"
+     CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
      build_target="mingw"
      AC_PROG_CXX
      LIBPREFIX=lib
@@ -362,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
@@ -409,19 +421,7 @@ else
 	AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
-# test for glib
-# Minimum required version for glibtop is 2.6.0
-AM_PATH_GLIB_2_0(2.6.0, [glib2=true] , [glib2=false] ,)
-if test x$glib2 = xfalse
-then
-	AM_CONDITIONAL(HAVE_GLIB2, false)
-	AC_MSG_WARN([GNUnet requires GLIB >= 2.6.0])
-else
-	AM_CONDITIONAL(HAVE_GLIB2, true)
-	AC_DEFINE([HAVE_GLIB2],[1],[Have glib2])
-	LIBS="$LIBS $GLIB_LIBS"
-	CFLAGS="$CFLAGS $GLIB_CFLAGS"
-fi
+
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
 if test x$nss = xfalse
@@ -493,6 +493,10 @@ AC_HEADER_STDC
 # Check for headers that are ALWAYS required
 AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
 
+
+# Check for libltdl header (#2999)
+AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNUnet requires libltdl headers (try installing libltdl-dev)]))
+
 # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
 AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h])
 
@@ -1242,6 +1246,7 @@ Makefile
 contrib/Makefile
 doc/Makefile
 doc/man/Makefile
+doc/doxygen/Makefile
 m4/Makefile
 po/Makefile.in 
 src/Makefile
@@ -1274,8 +1279,12 @@ src/gns/Makefile
 src/gns/gns.conf
 src/gns/nss/Makefile
 src/hello/Makefile
+src/identity/Makefile
+src/identity/identity.conf
+src/psycstore/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
+src/integration-tests/Makefile
 src/hostlist/Makefile
 src/lockmanager/Makefile
 src/lockmanager/lockmanager.conf
@@ -1294,11 +1303,12 @@ src/postgres/Makefile
 src/pt/Makefile
 src/regex/Makefile
 src/regex/regex.conf
+src/scalarproduct/Makefile
+src/scalarproduct/scalarproduct.conf
 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
@@ -1311,7 +1321,6 @@ src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
-src/integration-tests/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc
@@ -1367,6 +1376,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