X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=42884d05bb19b9222d5a01e448d4392b84a42ab3;hb=cb023645f02e119debf6124da07b90554b8542aa;hp=b32f927404031753f8c7aeea64ac60f34d0a94a1;hpb=0e8da1a7c0b18a69b10e3ee5a90f35de412db24d;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index b32f92740..42884d05b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2012 Christian Grothoff (and other contributing authors)
+# (C) 2001--2013 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -22,13 +22,13 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.9.3],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.5a],[bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([gnunet], [0.9.3])
+AM_INIT_AUTOMAKE([gnunet], [0.9.5a])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -413,6 +413,34 @@ 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
+
+#libgtop
+PKG_CHECK_MODULES(LIBGTOP,libgtop-2.0,  [gtop=true] , [gtop=false] )
+if test x$gtop = xfalse
+then
+	AM_CONDITIONAL(HAVE_LIBGTOP, false)
+	AC_MSG_WARN([GNUnet requires libgtop])
+else
+	AM_CONDITIONAL(HAVE_LIBGTOP, true)
+	AC_DEFINE([HAVE_LIBGTOP],[1],[Have libgtop])
+	LIBS="$LIBS $LIBGTOP_LIBS"
+	CFLAGS="$CFLAGS $LIBGTOP_CFLAGS"
+fi
+
+
 
 
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
@@ -602,6 +630,8 @@ AC_ARG_WITH(mysql,
     MYSQL_LIBDIR="/usr/lib64/mysql"
    elif test -d "/usr/lib/mysql"; then
     MYSQL_LIBDIR="/usr/lib/mysql"
+   else
+    MYSQL_LIBDIR="/usr/lib"
    fi
    LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS"
    AC_CHECK_LIB(mysqlclient, mysql_init,
@@ -764,7 +794,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage])
+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])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -934,6 +964,37 @@ AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls])
 
 
+# Test if we are building for superMUC
+llapi=0
+AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC)
+AC_ARG_WITH([ll],
+    [AS_HELP_STRING([--with-ll=PFX],
+       [use IBM LoadLeveler (installed at PFX) for running testbed on SuperMUC]. Default is no)],
+    [AC_MSG_RESULT([$with_ll])
+     case $with_ll in
+       no)
+         ;;
+       yes)
+         AC_CHECK_HEADERS([llapi.h],
+     	    AC_CHECK_LIB([llapi], [llsubmit],
+     	        llapi=true,
+		AC_MSG_ERROR(libllapi not found but --with-llapi given)),
+	    AC_MSG_ERROR(llapi.h not found but --with-llapi given))
+     	;;
+       *)
+         LDFLAGS="-L$with_ll/lib $LDFLAGS"
+         CPPFLAGS="-I$with_ll/include $CPPFLAGS"
+	 AC_CHECK_HEADERS([llapi.h],
+     	    AC_CHECK_LIB([llapi], [llsubmit],
+     	        llapi=true,
+		AC_MSG_ERROR(libllapi not found but --with-llapi given)),
+	    AC_MSG_ERROR(llapi.h not found but --with-llapi given))
+        ;;
+     esac
+    ],
+    [AC_MSG_RESULT(--with-ll not specified)])
+AM_CONDITIONAL([WITH_LL], [test "x$llapi" = "xtrue"])
+AC_DEFINE_UNQUOTED(WITH_LL, $llapi, [Do we have to use IBM LoadLeveler])
 
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
@@ -1135,6 +1196,27 @@ AC_MSG_RESULT($use_gcov)
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 
+# version info
+AC_PATH_PROG(svnversioncommand, svnversion)
+AC_PATH_PROG(gitcommand, git)
+if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported"
+then
+  if test "X$gitcommand" = "X"
+  then
+    AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
+  else
+    gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/')
+    if "X$gitver" = "X"
+    then
+      AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
+    else
+      AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version])
+    fi
+  fi
+else
+  AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version])
+fi
+
 AC_CONFIG_FILES([ 
 Makefile
 contrib/Makefile
@@ -1153,6 +1235,8 @@ src/chat/Makefile
 src/chat/chat.conf
 src/core/Makefile
 src/core/core.conf
+src/consensus/Makefile
+src/consensus/consensus.conf
 src/datacache/Makefile
 src/datastore/Makefile
 src/datastore/datastore.conf
@@ -1192,11 +1276,12 @@ src/regex/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/stream/Makefile
+src/sysmon/Makefile
+src/sysmon/sysmon.conf
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
 src/testing/Makefile
-src/testing_old/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf
@@ -1207,25 +1292,37 @@ src/vpn/Makefile
 src/vpn/vpn.conf
 src/integration-tests/Makefile
 pkgconfig/Makefile
+pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetblock.pc
 pkgconfig/gnunetcore.pc
 pkgconfig/gnunetdatacache.pc
 pkgconfig/gnunetdatastore.pc
 pkgconfig/gnunetdht.pc
-pkgconfig/gnunetdhtlog.pc
+pkgconfig/gnunetdns.pc
+pkgconfig/gnunetdnsparser.pc
 pkgconfig/gnunetdv.pc
 pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
+pkgconfig/gnunetgns.pc
 pkgconfig/gnunethello.pc
+pkgconfig/gnunetlockmanager.pc
+pkgconfig/gnunetmesh.pc
+pkgconfig/gnunetmysql.pc
+pkgconfig/gnunetnamestore.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpostgres.pc
 pkgconfig/gnunetregex.pc
 pkgconfig/gnunetstatistics.pc
+pkgconfig/gnunetstream.pc
+pkgconfig/gnunettestbed.pc
 pkgconfig/gnunettesting.pc
 pkgconfig/gnunettransport.pc
+pkgconfig/gnunettun.pc
 pkgconfig/gnunetutil.pc
+pkgconfig/gnunetvpn.pc
 ])
 AC_OUTPUT