X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=2e0bda700d8abf27327131affc38d5fcf80cc255;hb=c05d67a561ec151762ac7a6b8c17b5123d1ac504;hp=79e64ca5e244d8b98d8bbeb55992d4046ee870ff;hpb=5b82f1062147ef5da89971d515d93fd4df8cd40d;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 79e64ca5e..2e0bda700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,7 +375,7 @@ fi
 
 # check for libpulse(audio) library
 pulse=0
-AC_CHECK_LIB(pulse,pa_stream_peak,
+AC_CHECK_LIB(pulse,pa_stream_peek,
   [AC_CHECK_HEADER([pulse/simple.h],pulse=1)])
 if test "$pulse" = 1
 then
@@ -1036,22 +1036,21 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls])
 
 
 # Test if we are building for superMUC
-AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC)
-AC_ARG_ENABLE([ll],
-    [AS_HELP_STRING([--enable-ll],
-       [build GNUnet testbed for use with IBM LoadLeveler for running testbed on
-              SuperMUC (default is NO)])],
-    [if test "x$enable_ll" = "xno"
+AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC)
+AC_ARG_ENABLE([supermuc],
+    [AS_HELP_STRING([--enable-supermuc],
+       [build GNUnet with support to run on the SuperMUC (default is NO)])],
+    [if test "x$enable_supermuc" = "xno"
      then
-       ll=0
+       supermuc=0
      else
-       ll=1
+       supermuc=1
      fi],
-    [ll=0
-     enable_ll=no])
-AC_MSG_RESULT($enable_ll)
-AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
-AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
+    [supermuc=0
+     enable_supermuc=no])
+AC_MSG_RESULT($enable_SUPERMUC)
+AM_CONDITIONAL([ENABLE_SUPERMUC], [test "x$supermuc" = "x1"])
+AC_DEFINE_UNQUOTED([ENABLE_SUPERMUC], [$supermuc], [Build with support for SuperMUC])
 
 # Check if NSE has to send timestamp information to testbed logger for
 # generating histogram of messages received
@@ -1352,8 +1351,6 @@ src/include/Makefile
 src/include/gnunet_directories.h
 src/integration-tests/Makefile
 src/hostlist/Makefile
-src/lockmanager/Makefile
-src/lockmanager/lockmanager.conf
 src/mesh/Makefile
 src/mesh/mesh.conf
 src/multicast/Makefile
@@ -1396,31 +1393,42 @@ src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
 pkgconfig/Makefile
-pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc
+pkgconfig/gnunetats.pc
 pkgconfig/gnunetblock.pc
+pkgconfig/gnunetconsensus.pc
+pkgconfig/gnunetconversation.pc
 pkgconfig/gnunetcore.pc
 pkgconfig/gnunetdatacache.pc
 pkgconfig/gnunetdatastore.pc
 pkgconfig/gnunetdht.pc
 pkgconfig/gnunetdns.pc
 pkgconfig/gnunetdnsparser.pc
+pkgconfig/gnunetdnsstub.pc
 pkgconfig/gnunetdv.pc
+pkgconfig/gnunetenv.pc
 pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
 pkgconfig/gnunetgns.pc
 pkgconfig/gnunethello.pc
-pkgconfig/gnunetlockmanager.pc
+pkgconfig/gnunetidentity.pc
 pkgconfig/gnunetmesh.pc
+pkgconfig/gnunetmicrophone.pc
+pkgconfig/gnunetmulticast.pc
 pkgconfig/gnunetmysql.pc
 pkgconfig/gnunetnamestore.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
 pkgconfig/gnunetpostgres.pc
+pkgconfig/gnunetpsyc.pc
+pkgconfig/gnunetpsycstore.pc
 pkgconfig/gnunetregex.pc
+pkgconfig/gnunetrevocation.pc
+pkgconfig/gnunetscalarproduct.pc
+pkgconfig/gnunetset.pc
+pkgconfig/gnunetspeaker.pc
 pkgconfig/gnunetstatistics.pc
-pkgconfig/gnunetstream.pc
 pkgconfig/gnunettestbed.pc
 pkgconfig/gnunettesting.pc
 pkgconfig/gnunettransport.pc