X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=9be00cb4c3005156706c30dd5f9afe0c3b21bd98;hb=b200e9bab1ec8a398e07d4e3dc7698aa8b84bc6a;hp=dc1c9720ba07ef58c8209cd81ff8b9e49315bf51;hpb=920f7683e43247699251569168704c70898d923d;p=catta diff --git a/configure.ac b/configure.ac index dc1c972..9be00cb 100644 --- a/configure.ac +++ b/configure.ac @@ -21,19 +21,19 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.6.1],[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://www.freedesktop.org/Software/Avahi]) +AC_SUBST(PACKAGE_URL, [http://avahi.org/]) -AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [4:0:1]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [3:1:0]) -AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [3:1:0]) +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:0:0]) -AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:0:0]) +AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0]) +AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0]) AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0]) AC_SUBST(LIBAVAHI_COMPAT_HOWL_VERSION_INFO, [0:0:0]) AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8]) @@ -84,6 +84,30 @@ AC_DEFINE([HAVE_PF_ROUTE],[],[Support for PF_ROUTE]) 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 +#include +]) + +AM_CONDITIONAL(HAVE_SYS_SYSCTL_H, [ test x"$HAVE_SYS_SYSCTL_H" = xyes ]) + # # Check for struct ip_mreqn # @@ -115,13 +139,15 @@ AC_TRY_COMPILE([#include ], [ # # Detecting the linux distribution for specific things like init scripts. # -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of debian, gentoo, archlinux, fedora, darwin, netbsd, freebsd or none])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of debian, gentoo, archlinux, fedora, mandriva, darwin, netbsd, freebsd, slackware or none])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux") AC_CHECK_FILE(/etc/debian_version,with_distro="debian") AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora") + AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva") + AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") if test "z$with_distro" = "z"; then with_distro=`uname -s` fi @@ -129,7 +155,7 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` case $with_distro in - debian|gentoo|archlinux|suse|fedora|darwin|freebsd|none) + debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none) ;; netbsd) AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)]) @@ -147,9 +173,11 @@ AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux) AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) +AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) AM_CONDITIONAL(TARGET_DARWIN, test x"$with_distro" = xdarwin) AM_CONDITIONAL(TARGET_NETBSD, test x"$with_distro" = xnetbsd) AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd) +AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) test_gcc_flag() { AC_LANG_CONFTEST([int main() {}]) @@ -233,6 +261,12 @@ if test "x$enable_chroot" = "xyes" ; then AC_DEFINE([ENABLE_CHROOT], 1, [Enable chroot() usage]) fi +AC_CHECK_LIB(dl, dlopen, [ AC_CHECK_HEADERS(dlfcn.h, HAVE_DLOPEN=yes, HAVE_DLOPEN=no) ], HAVE_DLOPEN=no) +if test "x$HAVE_DLOPEN" = "xyes" ; then + AC_DEFINE([HAVE_DLOPEN],1,[Have dlopen()]) +fi +AM_CONDITIONAL(HAVE_DLOPEN, test "x$HAVE_DLOPEN" = "xyes") + # Check for pkg-config manually first, as if its not installed the # PKG_PROG_PKG_CONFIG macro won't be defined. AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) @@ -356,10 +390,40 @@ DBUS_VERSION="Disabled" 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) @@ -501,7 +565,9 @@ if test "x$HAVE_PYTHON" = "xyes" ; then 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" ]) @@ -525,7 +591,7 @@ if test "x$HAVE_DBUS" = "xyes" ; then if test "x$HAVE_MONO" = "xyes" ; then AC_PATH_PROG(MCS, mcs) if test "x$MCS" = "x" ; then - AC_MSG_ERROR([Can not find "mcs" in your PATH]) + AC_MSG_ERROR([Can not find "mcs" - The Mono C-Sharp Compiler) in your PATH]) fi AC_PATH_PROG(GACUTIL, gacutil) @@ -552,7 +618,7 @@ AC_ARG_ENABLE(monodoc, 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` @@ -714,8 +780,10 @@ initscript/gentoo/Makefile initscript/archlinux/Makefile initscript/suse/Makefile initscript/fedora/Makefile +initscript/mandriva/Makefile initscript/darwin/Makefile initscript/freebsd/Makefile +initscript/slackware/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile