[libdmapsharing] Clean up configure.ac
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Clean up configure.ac
- Date: Mon, 6 Jul 2020 01:18:53 +0000 (UTC)
commit bec937254d1692920e2ce2a4cbcd1c15699a4b14
Author: W. Michael Petullo <mike flyn org>
Date: Sun Jul 5 20:05:18 2020 -0500
Clean up configure.ac
autogen.sh | 2 +-
configure.ac | 489 +++++++++++++++++++--------------------------
libdmapsharing/Makefile.am | 1 -
3 files changed, 212 insertions(+), 280 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index c6295a8..f1a72be 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,7 +17,7 @@ automake -a || exit 1
cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode $@ || exit 1
+test -n "$NOCONFIGURE" || "$srcdir/configure" $@ || exit 1
# Now populate ChangeLog.
git log > "$srcdir/ChangeLog"
diff --git a/configure.ac b/configure.ac
index 22ad63e..e963fa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,36 +1,25 @@
-AC_INIT(libdmapsharing, 3.9.9)
+AC_INIT(libdmapsharing, 3.9.9, [https://www.flyn.org/projects/libdmapsharing/])
-dnl when going to/from release please set the nano (fourth number) right !
-dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(libdmapsharing, LIBDMAPSHARING, 3, 9, 9, 0, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
-
-# Enable silent build when available (Automake 1.11)
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-dnl FIXME:
-dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.
-dnl see also Makefile.am, libdmapsharing/Makefile.am and libdmapsharing.pc.in
API_VERSION=4.0
-#AC_DEFINE(API_VERSION, $API_VERSION, [library API version])
AC_SUBST(API_VERSION)
-AM_INIT_AUTOMAKE
-
-LIBDMAPSHARING_MAJORMINOR=$LIBDMAPSHARING_MAJOR_VERSION.$LIBDMAPSHARING_MINOR_VERSION
-AC_SUBST(LIBDMAPSHARING_MAJORMINOR)
-
-SO_VERSION=`expr $LIBDMAPSHARING_MINOR_VERSION +
$LIBDMAPSHARING_MAJOR_VERSION`:$LIBDMAPSHARING_MICRO_VERSION:$LIBDMAPSHARING_MINOR_VERSION
-AC_SUBST(SO_VERSION)
-
AM_CONFIG_HEADER(config.h)
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+
+AC_HEADER_STDC
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_LIBTOOL
+AM_PROG_CC_STDC
-AM_DISABLE_STATIC
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
+GTK_DOC_CHECK(1.0)
-dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
-AM_MAINTAINER_MODE
-dnl make aclocal work in maintainer mode
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+# Have pedansee?
+AC_PATH_PROG(PEDANSEE, pedansee)
+AM_CONDITIONAL(HAVE_PEDANSEE, test -n "$PEDANSEE")
+# Select debugging or measuring code coverage?
AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[enable debugging build])])
AC_ARG_ENABLE(coverage, [AC_HELP_STRING([--enable-coverage],[enable code-coverage build])])
if test "x$enable_debug" = "xyes"; then
@@ -41,27 +30,9 @@ else
CFLAGS="$CFLAGS -O2"
fi
-dnl decide on error flags
-AS_COMPILER_FLAG(-Wall, LIBDMAPSHARING_WALL="yes", LIBDMAPSHARING_WALL="no")
-
-if test "x$LIBDMAPSHARING_WALL" = "xyes"; then
- CFLAGS="$CFLAGS -Wall"
-
- if test "x$LIBDMAPSHARING_CVS" = "xyes"; then
- AS_COMPILER_FLAG(-Werror,CFLAGS="$CFLAGS -Werror",)
- fi
-fi
-
-AC_ARG_ENABLE(more-warnings, [ --enable-more-warnings Maximum compiler warnings],
set_more_warnings="$enableval",[
- if test -d "$srcdir/.git"; then
- set_more_warnings=yes
- else
- set_more_warnings=no
- fi
-])
-AC_MSG_CHECKING(for more warnings, including -Werror)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- AC_MSG_RESULT(yes)
+# Select more compiler warnings?
+AC_ARG_ENABLE(more-warnings, [AC_HELP_STRING([--enable-more-warnings],[maximum compiler warnings])])
+if test "$GCC" = "yes" -a x$enable_more_warnings = "xyes"; then
WARN_CFLAGS="\
-Wcomment -Wformat -Wnonnull -Wimplicit-int -Wimplicit \
-Wmain -Wmissing-braces -Wparentheses -Wsequence-point \
@@ -77,49 +48,19 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
fi
for option in $WARN_CFLAGS; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([whether gcc understands $option])
- AC_TRY_COMPILE([], [], has_option=yes, has_option=no,)
+ AS_COMPILER_FLAG($option, has_option=yes, has_option=no)
if test x$has_option = xyes; then
- LIBDMAPSHARING_CFLAGS="$LIBDMAPSHARING_CFLAGS $option"
+ OK_CFLAGS="$OK_CFLAGS $option"
fi
- AC_MSG_RESULT($has_option)
- CFLAGS="$SAVE_CFLAGS"
unset has_option
- unset SAVE_CFLAGS
done
- unset option
- AC_SUBST(WARN_CFLAGS)
-
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wno-error"
- AC_TRY_COMPILE([], [], WNOERROR_CFLAGS="-Wno-error", WNOERROR_CFLAGS="")
- AC_SUBST(WNOERROR_CFLAGS)
- CFLAGS="$SAVE_CFLAGS"
- unset SAVE_CFLAGS
- unset has_wnoerror
-else
- AC_MSG_RESULT(no)
+
+ WARN_CFLAGS="$OK_CFLAGS"
fi
AC_SUBST(WARN_CFLAGS)
-dnl check for tools
-dnl Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
-CFLAGS="$CFLAGS "
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-AC_PROG_LIBTOOL
-
-GOBJECT_INTROSPECTION_CHECK([1.30.0])
-
-GTK_DOC_CHECK(1.0)
-AC_CONFIG_MACRO_DIR(m4)
-
-dnl Test if --disable-tests given
+# Build test code?
AC_ARG_ENABLE(tests, [AC_HELP_STRING([--disable-tests],[do not build tests])], tests=$enableval, tests=yes)
if test x$tests = xyes; then
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
@@ -136,67 +77,52 @@ else
AM_CONDITIONAL(TESTS_ENABLED, false)
AM_CONDITIONAL(HAVE_CHECK, false)
fi
-
-dnl Now check required packages
-dnl Check for pkgconfig
+# Have libz?
+AC_CHECK_LIB(z, uncompress)
+
+# Have pkg-config?
AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-dnl Give error and exit if we don't have pkgconfig
if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR([Must have pkgconfig installed])
+ AC_MSG_ERROR([Must have pkgconfig installed])
fi
-dnl Check for Glib2.0
+# Have glib?
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.40, HAVE_GLIB=yes,HAVE_GLIB=no)
-
-dnl Give error and exit if we don't have glib
if test "x$HAVE_GLIB" = "xno"; then
- AC_MSG_ERROR([Must have glib-2.0 installed])
+ AC_MSG_ERROR([Must have glib-2.0 installed])
fi
-dnl make GLIB_CFLAGS and GLIB_LIBS available
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_40, [minimum glib version])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40, [maximum glib version])
+
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
-AC_DEFINE(HAVE_GLIB,1,[Defined when glib-2.0 was found])
-
-dnl Check for GThread2.0
-PKG_CHECK_MODULES(GTHREAD,
- gthread-2.0,
- HAVE_GTHREAD=yes, HAVE_GTHREAD=no)
-
-dnl Give error and exit if we don't have gthread
+# Have gthread?
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0, HAVE_GTHREAD=yes, HAVE_GTHREAD=no)
if test "x$HAVE_GTHREAD" = "xno"; then
- AC_MSG_ERROR([Must have gthread-2.0 installed])
+ AC_MSG_ERROR([Must have gthread-2.0 installed])
fi
-dnl make GOBJECT_CFLAGS and GOBJECT_LIBS available
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)
-dnl Check for GObject2.0
-PKG_CHECK_MODULES(GOBJECT,
- gobject-2.0,
- HAVE_GOBJECT=yes, HAVE_GOBJECT=no)
-
-dnl Give error and exit if we don't have gobject
+# Have gobject?
+PKG_CHECK_MODULES(GOBJECT, gobject-2.0, HAVE_GOBJECT=yes, HAVE_GOBJECT=no)
if test "x$HAVE_GOBJECT" = "xno"; then
- AC_MSG_ERROR([Must have gobject-2.0 installed])
+ AC_MSG_ERROR([Must have gobject-2.0 installed])
fi
-dnl make GOBJECT_CFLAGS and GOBJECT_LIBS available
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)
-dnl Check for gdk-pixbuf, needed for DACP Now Playing Artwork
-PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0,
- HAVE_GDKPIXBUF=yes,
- HAVE_GDKPIXBUF=no)
-
+# Have gdkpixbuf?
+PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, HAVE_GDKPIXBUF=yes, HAVE_GDKPIXBUF=no)
if test x"$HAVE_GDKPIXBUF" = "xyes"; then
- AC_DEFINE(HAVE_GDKPIXBUF, 1, [Define if gdk-pixbuf support is enabled])
+ AC_DEFINE(HAVE_GDKPIXBUF, 1, [Define if gdk-pixbuf support is enabled])
else
- AC_MSG_WARN([Gdk-pixbuf library not present; now-playing artwork might be affected])
+ AC_MSG_WARN([Gdk-pixbuf library not present; now-playing artwork might be affected])
fi
AM_CONDITIONAL(USE_GDKPIXBUF, test x"$HAVE_GDKPIXBUF" = "xyes")
@@ -204,141 +130,42 @@ AM_CONDITIONAL(USE_GDKPIXBUF, test x"$HAVE_GDKPIXBUF" = "xyes")
AC_SUBST(GDKPIXBUF_CFLAGS)
AC_SUBST(GDKPIXBUF_LIBS)
-AC_ARG_WITH(mdns,
- AC_HELP_STRING([--with-mdns=auto|avahi|dns_sd],
- [Select the mDNS/DNS-SD implementation to use (default auto)]),
- WITH_MDNS=$withval,
- WITH_MDNS=auto)
-
-HAVE_AVAHI=no
-HAVE_DNS_SD=no # Apple's DNSSD library.
-HAVE_MDNS=no
-USE_AVAHI=no
-USE_DNS_SD=no
-
-PKG_CHECK_MODULES(AVAHI,
- avahi-client >= 0.6
- avahi-glib >= 0.6,
- HAVE_AVAHI_06=yes,
- HAVE_AVAHI_06=no)
-if test x$HAVE_AVAHI_06 != xyes; then
- PKG_CHECK_MODULES(AVAHI,
- avahi-client >= 0.5
- avahi-glib >= 0.5,
- HAVE_AVAHI_05=yes,
- HAVE_AVAHI_05=no)
-fi
-if test x$HAVE_AVAHI_06 = xyes || test x$HAVE_AVAHI_05 = xyes; then
- HAVE_AVAHI=yes
-else
- HAVE_AVAHI=no
-fi
-
-AC_CHECK_HEADERS(dns_sd.h, HAVE_DNS_SD=yes)
-if test x"$HAVE_DNS_SD" = xyes; then
- AC_CHECK_LIB(dns_sd, DNSServiceRegister, DNS_SD_LIBS="-ldns_sd",)
-fi
-
-if test x"$WITH_MDNS" = xauto; then
- if test x"$HAVE_DNS_SD" = xyes; then
- MDNS_CFLAGS=$DNS_SD_CFLAGS
- MDNS_LIBS=$DNS_SD_LIBS
- AC_DEFINE(WITH_DNS_SD, 1, [Define if mDNS/DNS-SD implementation uses Apple's DNSSD])
- USE_DNS_SD=yes
- AC_MSG_NOTICE([Detected Apple's DNSSD; using it for mDNS/DNS-SD])
- HAVE_MDNS=yes
- elif test x"$HAVE_AVAHI" = xyes; then
- MDNS_CFLAGS=$AVAHI_CFLAGS
- MDNS_LIBS=$AVAHI_LIBS
- AC_DEFINE(WITH_AVAHI, 1, [Define if mDNS/DNS-SD implementation uses Avahi])
- USE_AVAHI=yes
- AC_MSG_NOTICE([Detected Avahi; using it for mDNS/DNS-SD])
- if test x$HAVE_AVAHI_06 = xyes; then
- AC_DEFINE(HAVE_AVAHI_0_6, 1, [Define if mDNS/DNS-SD implementation uses Avahi 0.6])
- else
- AC_DEFINE(HAVE_AVAHI_0_5, 1, [Define if mDNS/DNS-SD implementation uses Avahi 0.5])
- fi
-
- HAVE_MDNS=yes
- else
- AC_MSG_ERROR([Must have avahi or dns_sd.h development files installed])
- fi
-fi
-
-if test x"$WITH_MDNS" = xavahi; then
- if test x"$HAVE_AVAHI" = xno; then
- AC_MSG_ERROR([Avahi explicitly requested but not found. Install Avahi, or try --with-mdns=dns_sd])
- fi
-
- MDNS_CFLAGS=$AVAHI_CFLAGS
- MDNS_LIBS=$AVAHI_LIBS
- AC_DEFINE(WITH_AVAHI, 1, [Define if mDNS/DNS-SD implementation uses Avahi])
- USE_AVAHI=yes
- AC_MSG_NOTICE([Using Avahi for mDNS/DNS-SD])
-
- if test x$HAVE_AVAHI_06 = xyes; then
- AC_DEFINE(HAVE_AVAHI_0_6, 1, [Define if mDNS/DNS-SD implementation uses Avahi 0.6])
- else
- AC_DEFINE(HAVE_AVAHI_0_5, 1, [Define if mDNS/DNS-SD implementation uses Avahi 0.5])
- fi
-
- HAVE_MDNS=yes
-fi
-
-if test x"$WITH_MDNS" = xdns_sd; then
- if test x"$HAVE_DNS_SD" = xno; then
- AC_MSG_ERROR([Apple DNSSD explicitly requested but not found. Install Apple DNSSD, or try
--with-mdns=avahi])
- fi
-
- MDNS_CFLAGS=$DNS_SD_CFLAGS
- MDNS_LIBS=$DNS_SD_LIBS
- AC_DEFINE(WITH_DNS_SD, 1, [Define if mDNS/DNS-SD implementation uses Apple's DNSSD])
- USE_DNS_SD=yes
- AC_MSG_NOTICE([Using Apple's DNSSD for mDNS/DNS-SD])
-
- HAVE_MDNS=yes
+# Have libsoup?
+PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.48.0, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+if test x"$HAVE_LIBSOUP" = "xno"; then
+ AC_MSG_ERROR([Must have libsoup installed])
fi
-AM_CONDITIONAL(USE_AVAHI, test "x$USE_AVAHI" = "xyes")
-AM_CONDITIONAL(USE_DNS_SD, test "x$USE_DNS_SD" = "xyes")
-
-AC_SUBST(MDNS_CFLAGS)
-AC_SUBST(MDNS_LIBS)
-
-dnl Check for libsoup, needed for DAAP and audioscrobbler
-dnl 2.48.0 is required so we can use the new SoupServer API.
-PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.48.0,
- HAVE_LIBSOUP=yes,
- HAVE_LIBSOUP=no)
+AC_SUBST(SOUP_CFLAGS)
+AC_SUBST(SOUP_LIBS)
-if test x"$HAVE_LIBSOUP" = "xyes"; then
- AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup support is enabled])
-fi
+# Have GTK3?
+PKG_CHECK_MODULES(GTK, gtk+-3.0, HAVE_GTK=yes, HAVE_GTK=no)
-AM_CONDITIONAL(USE_LIBSOUP, test x"$HAVE_LIBSOUP" = "xyes")
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
-dnl daap support
-if test x"$HAVE_LIBSOUP" = "xno"; then
- AC_MSG_ERROR([Must have libsoup installed])
-fi
+# Have libgee?
+PKG_CHECK_MODULES(GEE, gee-0.8, HAVE_GEE=yes, HAVE_GEE=no)
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
+AC_SUBST(GEE_CFLAGS)
+AC_SUBST(GEE_LIBS)
-dnl Check for GStreamer App, needed for transcoding
-dnl gstreamer-plugins-base >= 0.10.23.2 for GNOME Bugzilla #588205 & #587896.
-PKG_CHECK_MODULES(GSTREAMERAPP,
- gstreamer-app-1.0
- gstreamer-plugins-base-1.0 >= 0.10.23.2,
- HAVE_GSTREAMERAPP=yes,
- HAVE_GSTREAMERAPP=no)
+# Have gstreamer-app?
+PKG_CHECK_MODULES(
+ GSTREAMERAPP,
+ gstreamer-app-1.0
+ gstreamer-plugins-base-1.0 >= 0.10.23.2,
+ HAVE_GSTREAMERAPP=yes,
+ HAVE_GSTREAMERAPP=no
+)
if test x"$HAVE_GSTREAMERAPP" = "xyes"; then
- AC_DEFINE(HAVE_GSTREAMERAPP, 1, [Define if GStreamer App support is enabled])
- GSTLIB="gstreamer-1.0 gstreamer-app-1.0"
- AC_SUBST(GSTLIB) # For libdmapsharing-4.0.pc.in.
+ AC_DEFINE(HAVE_GSTREAMERAPP, 1, [Define if GStreamer App support is enabled])
+ GSTLIB="gstreamer-1.0 gstreamer-app-1.0"
+ AC_SUBST(GSTLIB)
else
- AC_MSG_WARN([GStreamer app element not present; transcoding will not be supported])
+ AC_MSG_WARN([GStreamer app element not present; transcoding will not be supported])
fi
AM_CONDITIONAL(USE_GSTREAMERAPP, test x"$HAVE_GSTREAMERAPP" = "xyes")
@@ -346,30 +173,18 @@ AM_CONDITIONAL(USE_GSTREAMERAPP, test x"$HAVE_GSTREAMERAPP" = "xyes")
AC_SUBST(GSTREAMERAPP_CFLAGS)
AC_SUBST(GSTREAMERAPP_LIBS)
+# Have Vala compiler?
AM_PROG_VALAC([0.11.4])
AM_CONDITIONAL(HAVE_VALAC, test -x "$VALAC")
+# Have vala-gen-introspect?
AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
AC_PATH_PROG(VAPIGEN, vapigen)
-dnl GOBJECT_INTROSPECTION_CHECK sets found_introspection.
AM_CONDITIONAL(BUILD_VAPI, test -n "$VALA_GEN_INTROSPECT" -a -n "$VAPIGEN" -a xyes = x"$found_introspection")
if ! test -n "$VALA_GEN_INTROSPECT" -a -n "$VAPIGEN" -a xyes = x"$found_introspection"; then
AC_MSG_WARN([Will not build vapi])
fi
-AC_PATH_PROG(PEDANSEE, pedansee)
-AM_CONDITIONAL(HAVE_PEDANSEE, test -n "$PEDANSEE")
-
-PKG_CHECK_MODULES(GTK, gtk+-3.0, HAVE_GTK=yes, HAVE_GTK=no)
-
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-PKG_CHECK_MODULES(GEE, gee-0.8, HAVE_GEE=yes, HAVE_GEE=no)
-
-AC_SUBST(GEE_CFLAGS)
-AC_SUBST(GEE_LIBS)
-
AM_CONDITIONAL(BUILD_VALATESTS, test -x "$VALAC" -a "x$HAVE_GEE" = "xyes")
if test -n "$BUILD_VALATESTS" ; then
AC_MSG_WARN([Will not build Vala tests])
@@ -380,33 +195,151 @@ if test -n "$BUILD_DPAPVIEW" ; then
AC_MSG_WARN([Will not build dpapview])
fi
-AC_CHECK_LIB(z, uncompress)
-
-dnl common/m4/dmap-arch.m4
-dnl check for unaligned access
-AS_UNALIGNED_ACCESS
-dnl create a configure variable for libdmapsharing/dmap-config.h
if test x${as_cv_unaligned_access} = xyes ; then
- DMAP_HAVE_UNALIGNED_ACCESS_DEFINE="#define DMAP_HAVE_UNALIGNED_ACCESS 1"
+ DMAP_HAVE_UNALIGNED_ACCESS_DEFINE="#define DMAP_HAVE_UNALIGNED_ACCESS 1"
else
- DMAP_HAVE_UNALIGNED_ACCESS_DEFINE="#define DMAP_HAVE_UNALIGNED_ACCESS 0"
+ DMAP_HAVE_UNALIGNED_ACCESS_DEFINE="#define DMAP_HAVE_UNALIGNED_ACCESS 0"
fi
AC_SUBST(DMAP_HAVE_UNALIGNED_ACCESS_DEFINE)
-dnl Set required and maximum glib API versions.
-AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_40, [minimum glib version])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40, [maximum glib version])
+# Select mDNS library.
+AC_ARG_WITH(
+ mdns,
+ AC_HELP_STRING([--with-mdns=auto|avahi|dns_sd],
+ [Select the mDNS/DNS-SD implementation to use (default auto)]),
+ WITH_MDNS=$withval,
+ WITH_MDNS=auto
+)
+
+HAVE_AVAHI=no
+HAVE_DNS_SD=no # Apple's DNSSD library.
+HAVE_MDNS=no
+USE_AVAHI=no
+USE_DNS_SD=no
+
+PKG_CHECK_MODULES(
+ AVAHI,
+ avahi-client >= 0.6
+ avahi-glib >= 0.6,
+ HAVE_AVAHI_06=yes,
+ HAVE_AVAHI_06=no
+)
+if test x$HAVE_AVAHI_06 != xyes; then
+ PKG_CHECK_MODULES(
+ AVAHI,
+ avahi-client >= 0.5
+ avahi-glib >= 0.5,
+ HAVE_AVAHI_05=yes,
+ HAVE_AVAHI_05=no
+ )
+fi
+if test x$HAVE_AVAHI_06 = xyes || test x$HAVE_AVAHI_05 = xyes; then
+ HAVE_AVAHI=yes
+else
+ HAVE_AVAHI=no
+fi
+
+AC_CHECK_HEADERS(dns_sd.h, HAVE_DNS_SD=yes)
+if test x"$HAVE_DNS_SD" = xyes; then
+ AC_CHECK_LIB(dns_sd, DNSServiceRegister, DNS_SD_LIBS="-ldns_sd",)
+fi
+
+if test x"$WITH_MDNS" = xauto; then
+ if test x"$HAVE_DNS_SD" = xyes; then
+ MDNS_CFLAGS=$DNS_SD_CFLAGS
+ MDNS_LIBS=$DNS_SD_LIBS
+ AC_DEFINE(
+ WITH_DNS_SD,
+ 1,
+ [Define if mDNS/DNS-SD implementation uses Apple's DNSSD]
+ )
+ USE_DNS_SD=yes
+ AC_MSG_NOTICE([Detected Apple's DNSSD; using it for mDNS/DNS-SD])
+ HAVE_MDNS=yes
+ elif test x"$HAVE_AVAHI" = xyes; then
+ MDNS_CFLAGS=$AVAHI_CFLAGS
+ MDNS_LIBS=$AVAHI_LIBS
+ AC_DEFINE(
+ WITH_AVAHI,
+ 1,
+ [Define if mDNS/DNS-SD implementation uses Avahi]
+ )
+ USE_AVAHI=yes
+ AC_MSG_NOTICE([Detected Avahi; using it for mDNS/DNS-SD])
+ if test x$HAVE_AVAHI_06 = xyes; then
+ AC_DEFINE(
+ HAVE_AVAHI_0_6,
+ 1,
+ [Define if mDNS/DNS-SD implementation uses Avahi 0.6]
+ )
+ else
+ AC_DEFINE(
+ HAVE_AVAHI_0_5,
+ 1,
+ [Define if mDNS/DNS-SD implementation uses Avahi 0.5]
+ )
+ fi
+
+ HAVE_MDNS=yes
+ else
+ AC_MSG_ERROR([Must have avahi or dns_sd.h development files installed])
+ fi
+fi
-AC_OUTPUT([
-Makefile
-doc/Makefile
-libdmapsharing-${API_VERSION}-uninstalled.pc
-libdmapsharing-${API_VERSION}.pc
-libdmapsharing/Makefile
-libdmapsharing/dmap-config.h
-tests/Makefile
-m4/Makefile
-media/Makefile
-vala/Makefile
-vala/libdmapsharing-${API_VERSION}-uninstalled.files
+if test x"$WITH_MDNS" = xavahi; then
+ if test x"$HAVE_AVAHI" = xno; then
+ AC_MSG_ERROR([Avahi explicitly requested but not found. Install Avahi, or try
--with-mdns=dns_sd])
+ fi
+
+ MDNS_CFLAGS=$AVAHI_CFLAGS
+ MDNS_LIBS=$AVAHI_LIBS
+ AC_DEFINE(WITH_AVAHI, 1, [Define if mDNS/DNS-SD implementation uses Avahi])
+ USE_AVAHI=yes
+ AC_MSG_NOTICE([Using Avahi for mDNS/DNS-SD])
+
+ if test x$HAVE_AVAHI_06 = xyes; then
+ AC_DEFINE(HAVE_AVAHI_0_6, 1, [Define if mDNS/DNS-SD implementation uses Avahi 0.6])
+ else
+ AC_DEFINE(HAVE_AVAHI_0_5, 1, [Define if mDNS/DNS-SD implementation uses Avahi 0.5])
+ fi
+
+ HAVE_MDNS=yes
+fi
+
+if test x"$WITH_MDNS" = xdns_sd; then
+ if test x"$HAVE_DNS_SD" = xno; then
+ AC_MSG_ERROR([Apple DNSSD explicitly requested but not found. Install Apple DNSSD, or try
--with-mdns=avahi])
+ fi
+
+ MDNS_CFLAGS=$DNS_SD_CFLAGS
+ MDNS_LIBS=$DNS_SD_LIBS
+ AC_DEFINE(WITH_DNS_SD, 1, [Define if mDNS/DNS-SD implementation uses Apple's DNSSD])
+ USE_DNS_SD=yes
+ AC_MSG_NOTICE([Using Apple's DNSSD for mDNS/DNS-SD])
+
+ HAVE_MDNS=yes
+fi
+
+AM_CONDITIONAL(USE_AVAHI, test "x$USE_AVAHI" = "xyes")
+AM_CONDITIONAL(USE_DNS_SD, test "x$USE_DNS_SD" = "xyes")
+
+AC_SUBST(MDNS_CFLAGS)
+AC_SUBST(MDNS_LIBS)
+
+AM_INIT_AUTOMAKE
+
+AC_CONFIG_FILES([
+ Makefile
+ doc/Makefile
+ libdmapsharing-${API_VERSION}-uninstalled.pc
+ libdmapsharing-${API_VERSION}.pc
+ libdmapsharing/Makefile
+ libdmapsharing/dmap-config.h
+ tests/Makefile
+ m4/Makefile
+ media/Makefile
+ vala/Makefile
+ vala/libdmapsharing-${API_VERSION}-uninstalled.files
])
+
+AC_OUTPUT
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index 42ad8e9..763a630 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -69,7 +69,6 @@ libdmapsharing_4_0_la_CFLAGS = \
$(WARN_CFLAGS)
libdmapsharing_4_0_la_LDFLAGS = \
- -version-info @SO_VERSION@ \
$(CHECK_LIBS) \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
