[GNUnet-SVN] r20134 - monkey/branches/MonkeyBacktracking/monkey

[gnunet]

Author: grothoff
Date: 2012-02-29 09:59:09 +0100 (Wed, 29 Feb 2012)
New Revision: 20134

Modified:
   monkey/branches/MonkeyBacktracking/monkey/configure.ac
Log:
simplify configure

Modified: monkey/branches/MonkeyBacktracking/monkey/configure.ac
===================================================================
--- monkey/branches/MonkeyBacktracking/monkey/configure.ac      2012-02-29 
08:44:35 UTC (rev 20133)
+++ monkey/branches/MonkeyBacktracking/monkey/configure.ac      2012-02-29 
08:59:09 UTC (rev 20134)
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001-2011 Christian Grothoff (and other contributing authors)
+# (C) 2001-2012 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
@@ -116,140 +116,6 @@
 
 AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h 
langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h 
stdarg.h])
 
-# test for GNUnet core
-gnunet=0
-AC_MSG_CHECKING(for GNUnet core)
-AC_ARG_WITH(gnunet,
-   [  --with-gnunet=PFX       Base of GNUnet installation],
-   [AC_MSG_RESULT([$with_gnunet])
-    case $with_gnunet in
-      no)
-        ;;
-      yes)
-        LDFLAGS="-L/usr/lib $LDFLAGS"
-        CPPFLAGS="-I/usr/include $CPPFLAGS"
-        AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-          AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-            gnunet=1))
-        ;;
-      *)
-        LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
-        CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
-        AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-          AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-            EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
-            gnunet=1))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-gnunet not specified])
-    LDFLAGS="-L/usr/lib $LDFLAGS"
-    CPPFLAGS="-I/usr/include $CPPFLAGS"
-    AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-     AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-      gnunet=1))])
-
-# if GNUnet was not found, try in /usr/local
-if test "$gnunet" != 1
-then
-AC_MSG_CHECKING(for GNUnet core in /usr/local)
-with_gnunet=/usr/local
-  LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
-  CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
-  AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-  AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-  EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
-  gnunet=1))
-fi
-
-if test "$gnunet" != 1
-then
- AC_MSG_ERROR([monkey requires GNUnet])
-fi
-AC_CHECK_HEADERS([gnunet/gnunet_core_service.h],,
-                 AC_MSG_ERROR([compiling monkey requires GNUnet core headers]))
-
-SAVELIBS=$LIBS
-       AC_CHECK_LIB(gnunetutil,GNUNET_log_setup,,
-             AC_MSG_ERROR([monkey requires libgnunetutil]))
-AC_CHECK_LIB(gnunetcore,GNUNET_CORE_connect,,
-             AC_MSG_ERROR([monkey requires libgnunetcore]))
-LIBS=$SAVELIBS
-
-# libgcrypt
-gcrypt=0
-AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
-AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
-
-if test $gcrypt = 0
-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])
-AC_LANG_PUSH(C)
-LIBS="$LIBS $LIBGCRYPT_LIBS"
-CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
-AC_RUN_IFELSE(
-  [AC_LANG_PROGRAM([#include <gcrypt.h>], [[
-        gcry_md_hd_t mac;
-      
-        unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 
0x93, 0xa7, 0x72,
-            0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 
0xbe,
-            0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde };
-        unsigned char key[] = { 0xfc, 0x62, 0x76, 0x35 };
-        unsigned char result[] = {0xa2, 0xb, 0x1, 0xd9, 0xc0, 0x8b, 0x5a, 
0x12, 0x80,
-            0xd5, 0x50, 0x12, 0x8e, 0xd0, 0x5b, 0xb6, 0x5c, 0x87, 0x24, 0xe2, 
0xd0,
-            0xd2, 0xaf, 0x63, 0xae, 0xd1, 0xd6, 0x64, 0x14, 0xe3, 0x6e, 0x61, 
0x5b,
-            0xd, 0xba, 0x17, 0x7d, 0xd3, 0x10, 0xb1, 0x37, 0x41, 0x91, 0x7d, 
0xeb,
-            0x1, 0x4d, 0x71, 0xe8, 0x59, 0x71, 0x42, 0x8e, 0xd6, 0xf3, 0x29, 
0x3b,
-            0x90, 0xf2, 0xd1, 0xaf, 0x65, 0x1e, 0xb3};
-      
-        if (!gcry_check_version (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)
-          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)
-          return 3;
-  
-        gcry_md_close (mac);
-  
-        return 0;
-    ]])],
-  [AC_MSG_RESULT([yes])],
-  [
-   if test $? = 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
-     AC_MSG_FAILURE([HMAC test failed])
-   fi
-  ])
-AC_LANG_POP(C)
-fi     # $build = $target
-
-
-
 # openssl
 openssl=0
 AC_MSG_CHECKING([for openssl])
@@ -328,9 +194,6 @@
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 
-
-
-
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -342,8 +205,6 @@
 
 
 
-AC_SUBST(GNUNETEXT_CFLAGS)
-AC_SUBST(GNUNETEXT_LIBS)
 AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing 
read-only architecture-independent data])
 
 # Set PACKAGE_SOURCE_DIR in gnunet_gtk_config.h.