# USA.
AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.9],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.11],[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://avahi.org/])
-AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [6:0:3])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [4:1:0])
-AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [4:1:1])
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [7:1:4])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [4:3:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [4:2:1])
AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:0:0])
AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0])
AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0])
AM_CONDITIONAL(HAVE_PF_ROUTE, [ test x"$HAVE_PF_ROUTE" = xyes ])
+#
+# Check for sys/filio.h; needed for FIONREAD on Solaris
+#
+AC_CHECK_HEADER(sys/filio.h,
+HAVE_SYS_FILIO_H=yes
+AC_DEFINE([HAVE_SYS_FILIO_H],[],[Support for sys/filio.h])
+, [], [
+])
+
+AM_CONDITIONAL(HAVE_SYS_FILIO_H, [ test x"$HAVE_SYS_FILIO_H" = xyes ])
+
+#
+# Check for sys/sysctl.h; not present on Solaris
+#
+AC_CHECK_HEADER(sys/sysctl.h,
+HAVE_SYS_SYSCTL=yes
+AC_DEFINE([HAVE_SYS_SYSCTL_H],[],[Support for sys/sysctl.h])
+, [], [
+#include <sys/types.h>
+#include <sys/socket.h>
+])
+
+AM_CONDITIONAL(HAVE_SYS_SYSCTL_H, [ test x"$HAVE_SYS_SYSCTL_H" = xyes ])
+
#
# Check for struct ip_mreqn
#
[case "${enableval}" in
yes) HAVE_QT3=yes ;;
no) HAVE_QT3=no ;;
- auto) HAVE_QT3=auto ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-qt3) ;;
esac],
[HAVE_QT3=yes])
-if test "x$HAVE_QT3" = "xauto" ; then
- PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ], [ HAVE_QT3="yes"], [ HAVE_QT3="no" && AC_MSG_RESULT([no]) ])
-else if test "x$HAVE_QT3" = "xyes" ; then
- PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ])
- fi
-fi
-
if test "x$HAVE_QT3" = "xyes" ; then
+ PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ])
AC_SUBST(QT3_CFLAGS)
AC_SUBST(QT3_LIBS)
QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
[case "${enableval}" in
yes) HAVE_QT4=yes ;;
no) HAVE_QT4=no ;;
- auto) HAVE_QT4=auto ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-qt4) ;;
esac],
[HAVE_QT4=yes])
-if test "x$HAVE_QT4" = "xauto" ; then
- PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ], [ HAVE_QT4="yes"], [ HAVE_QT4="no" && AC_MSG_RESULT([no]) ])
-else if test "x$HAVE_QT4" = "xyes" ; then
- PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ])
- fi
-fi
-
if test "x$HAVE_QT4" = "xyes" ; then
+ PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ])
AC_SUBST(QT4_CFLAGS)
AC_SUBST(QT4_LIBS)
QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
fi
AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
- AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+ if test "x$HAVE_GDBM" = "xyes"; then
+ AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+ fi
fi
fi
AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ])