X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=563e7fec6b67675139e30c3c7fe85fc50c21249c;hb=41700b6cb0345080513d82bdbe2dbe33c8654491;hp=1176ff5fb937978ab4d17efc12dbdf5038992dee;hpb=37ac1b7c9e9e05f93d4100cfb53450ec2d370989;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 1176ff5fb..563e7fec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,18 @@
 #
 #
 AC_PREREQ(2.61)
-AC_INIT([gnunet], [0.9.0pre1],[bug-gnunet@gnu.org])
-AM_INIT_AUTOMAKE([gnunet], [0.9.0pre1])
-AC_CONFIG_HEADERS([gnunet_config.h])
+# Checks for programs.
+AC_INIT([gnunet], [0.9.0pre2],[bug-gnunet@gnu.org])
+
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
+AM_INIT_AUTOMAKE([gnunet], [0.9.0pre2])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
 
-# Checks for programs.
-AC_CANONICAL_HOST
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
@@ -38,7 +42,6 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
-AC_CANONICAL_HOST
 LT_INIT([disable-static dlopen win32-dll])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
@@ -141,6 +144,7 @@ netbsd*)
      LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc"
      CFLAGS="-mms-bitfields $CFLAGS"
+     CPPFLAGS="-D_WIN32_WINNT=0x0501 $CPPFLAGS"
      build_target="mingw"
      AC_PROG_CXX
      LIBPREFIX=lib
@@ -189,6 +193,8 @@ then
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+if test $build = $target
+then
 AC_MSG_CHECKING([for working HMAC])
 AC_LANG_PUSH(C)
 LIBS="$LIBS $LIBGCRYPT_LIBS"
@@ -243,6 +249,28 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+fi	# $build = $target
+
+# glpk
+#AC_CHECK_HEADERS(glpk.h, glpk=true)
+#AM_CONDITIONAL(HAVE_GLPK, test x$glpk = xtrue)
+#AC_CHECK_LIB([glpk],[glp_create_prob])
+
+glpk=true
+AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
+AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
+# GLPK must support atm MLP presolving, version >= 4.32
+AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
+if test $gplk = false
+then
+	AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
+	AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
+	AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
+else
+	AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
+	AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
+fi
+
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -291,7 +319,7 @@ AC_HEADER_STDC
 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]))
 
 # 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([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 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])
+AC_CHECK_HEADERS([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 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])
 
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
@@ -618,6 +646,8 @@ AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+
+
 # check for gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])
@@ -662,7 +692,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol atoll dup2 fdatasync ftruncate gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate stat64 sbrk mmap mremap setrlimit sysconf gethostbyaddr initgroups getifaddrs freeifaddrs getnameinfo getaddrinfo inet_ntoa localtime_r nl_langinfo putenv realpath strndup gethostbyname2 gethostbyname])
+AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol atoll dup2 fdatasync ftruncate gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage rand uname setlocale getcwd mktime gmtime_r gmtime strlcpy strlcat ftruncate stat64 sbrk mmap mremap setrlimit sysconf gethostbyaddr initgroups getifaddrs freeifaddrs getnameinfo getaddrinfo inet_ntoa localtime_r nl_langinfo putenv realpath strndup gethostbyname2 gethostbyname getpeerucred getpeereid])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -753,6 +783,23 @@ AC_MSG_RESULT($enable_malicious)
 AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"])
 AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code])
 
+# should code be enabled that works around missing OS functionality on Windows?
+# used for test cases
+AC_ARG_ENABLE(windows_workarounds, [AS_HELP_STRING([--enable-windows_workarounds],
+               [enable workarounds used on Windows (only useful for test cases)])])
+if test $build_target = "mingw"
+then
+	workarounds=1
+else
+	if test x$enable_windows_workarounds = "xyes"
+	then
+		workarounds=1
+	else
+		workarounds=0
+	fi
+fi
+AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workarounds used on Windows (only useful for test cases)])
+
 # gcov compilation
 use_gcov=no
 AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage],
@@ -779,6 +826,7 @@ src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/hostlist/Makefile
+src/mesh/Makefile
 src/monkey/Makefile
 src/nat/Makefile
 src/peerinfo/Makefile
@@ -790,6 +838,7 @@ src/topology/Makefile
 src/transport/Makefile
 src/util/Makefile
 src/vpn/Makefile
+src/chat/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetblock.pc
@@ -863,8 +912,8 @@ You also need to create an configuration file that should
 specify the path where GNUnet should store data.  For example,
 you could store in "/etc/gnunet.conf" the following lines:
 
-[PATHS]
-SERVICEHOME = /opt/gnunet/
+[[PATHS]]
+SERVICEHOME = /var/lib/gnunet
 DEFAULTCONFIG = /etc/gnunet.conf
 
 Now, in order to start your peer, run as the 'gnunet' user