# USA.
AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.1],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.4],[avahi (at) lists (dot) freedesktop (dot) org])
AC_CONFIG_SRCDIR([avahi-core/server.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
-AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
+AC_SUBST(PACKAGE_URL, [http://avahi.org/])
-AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [3:0:0])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [3:0:0])
-AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [3:0:0])
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [5:0:2])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [3:3:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [3:2:0])
AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:0:0])
AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:0:0])
AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:0:0])
DBUS_SYS_DIR="Disabled"
DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="Disabled"
if test "x$HAVE_DBUS" = "xyes" ; then
+ PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ])
+
AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-BUS or not])
DBUS_VERSION=`$PKG_CONFIG dbus-1 --modversion`
- PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ])
+ DBUS_VERSION_MAJOR=`echo $DBUS_VERSION | awk -F. '{print $1}'`
+ DBUS_VERSION_MINOR=`echo $DBUS_VERSION | awk -F. '{print $2}'`
+ DBUS_VERSION_MICRO=`echo $DBUS_VERSION | awk -F. '{print $3}'`
+ if test "z$DBUS_VERSION_MAJOR" = "z"; then
+ DBUS_VERSION_MAJOR="0"
+ fi
+ if test "z$DBUS_VERSION_MINOR" = "z"; then
+ DBUS_VERSION_MINOR="0"
+ fi
+ if test "z$DBUS_VERSION_MICRO" = "z"; then
+ DBUS_VERSION_MICRO="0"
+ fi
+
+ if test "z$DBUS_VERSION_MAJOR" = "z0" -a "z$DBUS_VERSION_MINOR" = "z0" -a "z$DBUS_VERSION_MICRO" = "z0"; then
+ echo "Error: Couldn't determine the version of your DBUS package."
+ echo " This is probably an error in this script, please report it"
+ echo " along with the following information:"
+ echo " Base DBUS version ='$DBUS_VERSION'"
+ echo " DBUS_VERSION_MAJOR='$DBUS_VERSION_MAJOR'"
+ echo " DBUS_VERSION_MINOR='$DBUS_VERSION_MINOR'"
+ echo " DBUS_VERSION_MICRO='$DBUS_VERSION_MICRO'"
+ exit 1
+ else
+ echo "Your dbus version is $DBUS_VERSION_MAJOR,$DBUS_VERSION_MINOR,$DBUS_VERSION_MICRO."
+ DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR"
+ DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR"
+ DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO"
+ fi
+
DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
esac],
[HAVE_MONODOC=yes])
-if test "x$HAVE_MONODOC" = "xyes" ; then
+if test "x$HAVE_MONO" = "xyes" && test "x$HAVE_MONODOC" = "xyes" ; then
PKG_CHECK_MODULES(MONODOC, [monodoc >= 1.1.8])
MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc`