X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=9b5334adab0d094075762e2fa77f2c33001f5e91;hb=97484d04c2ae1deb5e95c4472977b2333ce55b60;hp=cd159115ebad74ab48786777a4b1d4fb4175920e;hpb=7ec0be46fc1365527c57d4781f420b34eeb01b97;p=oweals%2Fgnunet.git diff --git a/configure.ac b/configure.ac index cd159115e..9b5334ada 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" @@ -323,7 +322,7 @@ AC_RUN_IFELSE( if (!gcry_check_version (GCRYPT_VERSION)) { fprintf (stderr, "Version mismatch %s <-> %s \n", gcry_check_version (NULL), GCRYPT_VERSION); - return 1; + return 1; } gcry_control (GCRYCTL_DISABLE_SECMEM, 0); @@ -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) @@ -1516,6 +1529,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