X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=148c827bc93596f0520accde0dd9e6cb3fa975f3;hb=db37bac931cb7b6d7c687c4c9bcec48e35e6080c;hp=d212979694f37f338d17706c040564cf52351ac4;hpb=3d016df6e9f16a224637ae1f525acdcbbce9fbed;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index d21297969..148c827bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2010 Christian Grothoff (and other contributing authors)
+# (C) 2001--2011 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.0pre3],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.0pre4],[bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([gnunet], [0.9.0pre3])
+AM_INIT_AUTOMAKE([gnunet], [0.9.0pre4])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
@@ -193,6 +193,16 @@ then
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+extra_logging=GNUNET_NO
+AC_ARG_ENABLE([logging],
+   AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),
+   [AS_IF([test "x$enableval" = "xyes"], [],
+          [test "x$enableval" = "xno"], [AC_DEFINE([GNUNET_CULL_LOGGING],[],[Define to cull all logging calls])],
+          [test "x$enableval" = "xverbose"], [extra_logging=GNUNET_YES]
+          [test "x$enableval" = "xveryverbose"], [extra_logging=\(GNUNET_YES+1\)])
+   ], [])
+AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise])
+
 if test $build = $target
 then
 AC_MSG_CHECKING([for working HMAC])
@@ -200,7 +210,8 @@ AC_LANG_PUSH(C)
 LIBS="$LIBS $LIBGCRYPT_LIBS"
 CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
 AC_RUN_IFELSE(
-  [AC_LANG_PROGRAM([#include <gcrypt.h>], [[
+  [AC_LANG_PROGRAM([#include <gcrypt.h> 
+  	#include <stdio.h>], [[
         gcry_md_hd_t mac;
       
         unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72,
@@ -215,19 +226,28 @@ AC_RUN_IFELSE(
             0x90, 0xf2, 0xd1, 0xaf, 0x65, 0x1e, 0xb3};
       
         if (!gcry_check_version (GCRYPT_VERSION))
+        {
+          fprintf (stderr, "Version mismatch %s <-> %s \n", gcry_check_version (NULL), GCRYPT_VERSION);
           return 1;
+        }
   
         gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
         gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
   
         if (gcry_md_open(&mac, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR)
+        {
+          fprintf (stderr, "gcry_md_open error\n");
           return 2;
+        }
   
         gcry_md_setkey (mac, key, sizeof (key));
         gcry_md_write (mac, data, sizeof (data));
   
         if (memcmp(gcry_md_read (mac, 0), result, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))) != 0)
+        {
+          fprintf (stderr, "memcmp error\n");
           return 3;
+        }
   
         gcry_md_close (mac);
   
@@ -235,12 +255,19 @@ AC_RUN_IFELSE(
     ]])],
   [AC_MSG_RESULT([yes])],
   [
-   if test $? = 3
+   RESULT=$?
+   if test $RESULT = 3
    then
      AC_MSG_FAILURE([HMAC test vector does not match. This is a known problem with libgcrypt 1.2.2 on Windows and fixed in 1.4.6.])
-   else
+   fi
+   if test $RESULT = 2
+   then
      AC_MSG_FAILURE([HMAC test failed])
    fi
+   if test $RESULT = 1
+   then
+     AC_MSG_FAILURE([libgcrypt header version does not match library version])
+   fi
   ])
 AC_LANG_POP(C)
 fi	# $build = $target
@@ -649,6 +676,27 @@ AC_SUBST(DLLDIR)
 AC_SUBST(EXT_LIB_PATH)
 
 
+# test for sudo
+AC_MSG_CHECKING(for sudo)
+AC_ARG_WITH(sudo,
+  [  --with-sudo=PATH       path to sudo binary (or just yes)],
+  [AC_MSG_RESULT("$with_sudo")
+   case $with_sudo in
+   no)
+     SUDO_BINARY=
+     ;;
+   yes)
+     SUDO_BINARY=sudo
+     ;;
+   *)
+     SUDO_BINARY=$with_sudo
+    ;;
+   esac
+  ],
+  [AC_MSG_RESULT([no])])
+AC_SUBST(SUDO_BINARY)
+
+
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -685,21 +733,6 @@ AC_ARG_ENABLE([experimental],
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
-# should malicious code be compiled (code used for testing with malicious peers)
-AC_MSG_CHECKING(whether to compile malicious code)
-AC_ARG_ENABLE([malicious],
-   [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code (only for developers for testing)])],
-   [enable_malicious=${enableval}],
-   [enable_malicious=no])
-AC_MSG_RESULT($enable_malicious)
-AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "xyes"])
-if test "$enable_malicious" = "yes"
-then
- AC_DEFINE([HAVE_MALICIOUS],[1],[include malicious code])
-else
- AC_DEFINE([HAVE_MALICIOUS],[0],[disable malicious code])
-fi
-
 # should code be enabled that works around missing OS functionality on Windows?
 # used for test cases
 if test $build_target = "mingw"
@@ -840,6 +873,5 @@ configuration file:
 	touch $HOME/.gnunet/gnunet.conf
 	
 Optionally, download and compile:
-- gnunet-gtk to get a GUI for file-sharing.
-- gnunet-setup to get a GUI for configuration.
+- gnunet-gtk to get a GUI for file-sharing and configuration.
 ********************************************])