X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=93795211755457da7c97d86ad37e8e8d5117350e;hb=173a142f9b7acd4a788f41dd23ca349cd4b901e9;hp=cd159115ebad74ab48786777a4b1d4fb4175920e;hpb=7ec0be46fc1365527c57d4781f420b34eeb01b97;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index cd159115e..937952117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,6 @@ linux*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_CHECK_LIB(intl, gettext)
-     LDFLAGS="$LDFLAGS -no-undefined"
      CFLAGS="-mms-bitfields $CFLAGS"
      build_target="cygwin"
      LIBPREFIX=lib
@@ -151,7 +150,7 @@ linux*)
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system])
      AC_CHECK_LIB(intl, gettext)
-     LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
+     LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32"
      CFLAGS="-mms-bitfields $CFLAGS"
      CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
@@ -408,6 +407,20 @@ then
   AC_DEFINE([HAVE_OPUS],[1],[Have libopus library])
 fi
 
+# libogg
+AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
+        [AC_CHECK_HEADERS([ogg/ogg.h],
+          AM_CONDITIONAL(HAVE_OGG, true)
+          ogg=1
+          AC_DEFINE(HAVE_OGG,1,[Have ogg]),
+          AM_CONDITIONAL(HAVE_OGG, false)
+          ogg=0
+          AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
+        AM_CONDITIONAL(HAVE_OGG, false)
+        ogg=0)
+
+
+
 gst=0
 PKG_CHECK_MODULES(
   [GST],
@@ -421,9 +434,9 @@ PKG_CHECK_MODULES(
   ])
 
 # Pulse Audio
-if test "x$pulse" != "x1" -o "x$opus" != "x1"
+if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"
 then
- if test "x$gst" != "x1" -o "x$opus" != "x1"
+ if test "x$gst" != "x1"
  then
   conversation_backend=none
   AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
@@ -460,11 +473,14 @@ if test "$libidn" != "no"; then
      LDFLAGS="${LDFLAGS} -L$libidn/lib"
      CPPFLAGS="${CPPFLAGS} -I$libidn/include"
   fi
-  AC_CHECK_HEADER(idna.h,
-    AC_CHECK_LIB(idn, stringprep_check_version,
-      [libidn=yes LIBS="${LIBS} -lidn"],
-      AC_MSG_FAILURE([GNUnet requires libidn])),
-    AC_MSG_FAILURE([GNUnet requires libidn]))
+fi
+libidn=no
+AC_CHECK_HEADER(idna.h,
+  AC_CHECK_LIB(idn, stringprep_check_version,
+    [libidn=yes LIBS="${LIBS} -lidn"], []), [])
+if test "$libidn" != "yes"; then
+  AC_MSG_FAILURE([GNUnet requires libidn.
+libidn-1.13 should be sufficient, newer versions work too.])
 fi
 AC_MSG_RESULT($libidn)
 
@@ -1020,6 +1036,7 @@ AC_SUBST(GNUNETDNS_GROUP)
 
 # gnutls
 gnutls=0
+gnutls_dane=0
 AC_MSG_CHECKING(for gnutls)
 AC_ARG_WITH(gnutls,
    [  --with-gnutls=PFX   base of gnutls installation],
@@ -1031,6 +1048,9 @@ AC_ARG_WITH(gnutls,
         AC_CHECK_HEADERS([gnutls/abstract.h],
             AC_CHECK_LIB([gnutls], [gnutls_priority_set],
 	     gnutls=true))
+        AC_CHECK_HEADERS([gnutls/dane.h],
+            AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+	      gnutls_dane=1))
         ;;
       *)
         LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
@@ -1039,20 +1059,23 @@ AC_ARG_WITH(gnutls,
             AC_CHECK_LIB([gnutls], [gnutls_priority_set],
               EXT_LIB_PATH="-L$with_gnutls/lib $EXT_LIB_PATH"
               gnutls=true))
+        AC_CHECK_HEADERS([gnutls/dane.h],
+            AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+	      gnutls_dane=1))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-gnutls not specified])
     AC_CHECK_HEADERS([gnutls/abstract.h],
         AC_CHECK_LIB([gnutls], [gnutls_priority_set],
-          gnutls=true))])
+          gnutls=true))
+    AC_CHECK_HEADERS([gnutls/dane.h],
+    AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+ 	     gnutls_dane=1))
+   ])
 AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS])
 
-gnutls_dane=0
-AC_CHECK_HEADERS([gnutls/dane.h],
-   AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
-	     gnutls_dane=1))
 AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support])
 
@@ -1516,6 +1539,7 @@ fi
 if test "x$gnurl" = "x0"
 then
   AC_MSG_NOTICE([NOTICE: libgnurl not found.  http client support will not be compiled.])
+  AC_MSG_WARN([libgnurl not found.  hostlist daemon will not be compiled, and you probably WANT hostlist daemon])
 fi
 
 # bluetooth
@@ -1529,7 +1553,7 @@ if test x$gnutls != xtrue
 then
   AC_MSG_NOTICE([NOTICE: GnuTLS not found, gnunet-gns-proxy will not be built])
 else
-if test x$gnutls_dane != xtrue
+if test "x$gnutls_dane" != "x1"
 then
   AC_MSG_NOTICE([NOTICE: GnuTLS has no DANE support, DANE validation will not be possible])
 fi
@@ -1594,9 +1618,9 @@ to install everything.
 
 Each GNUnet user should be added to the 'gnunet' group (may
 require fresh login to come into effect):
-        adduser $USERNAME gnunet
+        adduser USERNAME gnunet
 (run the above command as root once for each of your users, replacing
-"$USERNAME" with the respective login names).  If you have a global IP
+"USERNAME" with the respective login names).  If you have a global IP
 address, no further configuration is required.
 
 Optionally, download and compile gnunet-gtk to get a GUI for