X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=69cc7d60c84ca17495b2f28c5ab5f6c9694656e5;hb=d2b0f1d3b4133ee2b90e820203c05988004d2ff7;hp=e6e465435eecf1c39395743f4e10893e829df900;hpb=fceec98e767bce7ad2c24dde73cdcf8837e04013;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index e6e465435..69cc7d60c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,12 +79,14 @@ case "$host_os" in
      DEFAULT_INTERFACE="\"en0\""
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      ;;
 linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
      build_target="linux"
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      AC_PATH_XTRA
      ;;
 freebsd*)
@@ -94,6 +96,7 @@ freebsd*)
      build_target="freebsd"
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      ;;
 openbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -102,12 +105,14 @@ openbsd*)
      build_target="openbsd"
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      ;;
 netbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      ;;
 *solaris*)
      AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
@@ -117,6 +122,7 @@ netbsd*)
      build_target="solaris"
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      ;;
 *arm-linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
@@ -124,6 +130,7 @@ netbsd*)
      build_target="linux"
      LIBPREFIX=
      DLLDIR=lib
+     UNIXONLY="#"
      ;;
 *cygwin*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
@@ -135,6 +142,7 @@ netbsd*)
      LIBPREFIX=lib
      DLLDIR=bin
      AC_PROG_CXX
+     UNIXONLY=""
      ;;
 *mingw*)
      AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
@@ -149,15 +157,21 @@ netbsd*)
      AC_PROG_CXX
      LIBPREFIX=lib
      DLLDIR=bin
+     UNIXONLY=""
      ;;
 *)
      AC_MSG_RESULT(Unrecognised OS $host_os)
      AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
+     UNIXONLY=""
 ;;
 esac
 AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface])
 AC_SUBST(DEFAULT_INTERFACE)
 
+# Disable TCP-based IPC on systems that support UNIX domain
+# sockets in default configuratin:
+AC_SUBST(UNIXONLY)
+
 AC_MSG_CHECKING([for build target])
 AM_CONDITIONAL(DARWIN,  test "$build_target" = "darwin")
 AM_CONDITIONAL(CYGWIN,  test "$build_target" = "cygwin")
@@ -369,37 +383,13 @@ fi
 LIBS=$SAVE_LIBS
 
 # test for libunistring
-unistring=0
-AC_MSG_CHECKING(for libunistring)
-AC_ARG_WITH(unistring,
-   [  --with-unistring=PFX    base of libunistring installation],
-   [AC_MSG_RESULT([$with_unistring])
-    case $with_unistring in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS(unistr.h,
-          AC_CHECK_LIB([unistring], [u8_check],
-            unistring=1))
-        ;;
-      *)
-        LDFLAGS="-L$with_unistring/lib $LDFLAGS"
-        CPPFLAGS="-I$with_unistring/include $CPPFLAGS"
-        AC_CHECK_HEADERS(unistr.h,
-          AC_CHECK_LIB([unistring], [u8_check],
-            EXT_LIB_PATH="-L$with_unistring/lib $EXT_LIB_PATH"
-            unistring=1))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-unistring not specified])
-    AC_CHECK_HEADERS(unistr.h,
-     AC_CHECK_LIB([unistring], [u8_check],
-      unistring=1))])
-if test "$unistring" != 1
-then
+gl_LIBUNISTRING
+if test $HAVE_LIBUNISTRING != yes; then
  AC_MSG_ERROR([GNUnet requires libunistring])
 fi
+if test $gl_libunistring_hexversion -le 2305; then
+ AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
+fi
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -761,6 +751,28 @@ AC_ARG_WITH(sudo,
 AC_SUBST(SUDO_BINARY)
 
 
+# test for gnunetdns group name
+GNUNETDNS_GROUP=gnunetdns
+AC_MSG_CHECKING(for gnunetdns group name)
+AC_ARG_WITH(gnunetdns,
+  [  --with-gnunetdns=GRPNAME       name for gnunetdns group],
+  [AC_MSG_RESULT("$with_gnunetdns")
+   case $with_gnunetdns in
+   no)
+     GNUNETDNS_GROUP=gnunet
+     ;;
+   yes)
+     GNUNETDNS_GROUP=gnunetdns
+     ;;
+   *)
+     GNUNETDNS_GROUP=$with_gnunetdns
+    ;;
+   esac
+  ],
+  [AC_MSG_RESULT([gnunetdns])])
+AC_SUBST(GNUNETDNS_GROUP)
+
+
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE([testruns],
@@ -838,32 +850,53 @@ m4/Makefile
 po/Makefile.in 
 src/Makefile
 src/arm/Makefile
+src/arm/arm.conf
 src/ats/Makefile
+src/ats/ats.conf
 src/block/Makefile
+src/chat/Makefile
+src/chat/chat.conf
 src/core/Makefile
+src/core/core.conf
 src/datacache/Makefile
 src/datastore/Makefile
+src/datastore/datastore.conf
 src/dht/Makefile
+src/dht/dht.conf
+src/dns/Makefile
+src/dns/dns.conf
 src/dv/Makefile
+src/dv/dv.conf
+src/exit/Makefile
 src/fragmentation/Makefile
 src/fs/Makefile
+src/fs/fs.conf
 src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/mesh/Makefile
+src/mesh/mesh.conf
 src/nat/Makefile
 src/nse/Makefile
+src/nse/nse.conf
 src/peerinfo/Makefile
+src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
+src/pt/Makefile
 src/statistics/Makefile
+src/statistics/statistics.conf
+src/stream/Makefile
 src/template/Makefile
 src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
+src/transport/transport.conf
+src/tun/Makefile
 src/util/Makefile
+src/util/resolver.conf
 src/vpn/Makefile
-src/chat/Makefile
+src/vpn/vpn.conf
 src/integration-tests/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc