X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=b6fabfb98f80f0cfb6af5d20edc68f62d736cbd7;hb=8bfdc03f068c79186402a73471f94563a8346757;hp=ecc112081b674a75025648ed5e23e584aadde154;hpb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;p=catta diff --git a/configure.ac b/configure.ac index ecc1120..b6fabfb 100644 --- a/configure.ac +++ b/configure.ac @@ -28,12 +28,12 @@ AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi]) -AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [2:0:2]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [2:0:1]) -AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [2:0:1]) -AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0]) -AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0]) -AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0]) +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_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_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]) @@ -115,34 +115,41 @@ 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 Linux distribution to target: One of debian, gentoo, archlinux or none])) +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])) 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") + if test "z$with_distro" = "z"; then + with_distro=`uname -s` + fi fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` -if test "z$with_distro" = "z"; then - AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported.]) - exit 1 -else case $with_distro in - debian|gentoo|archlinux|suse|fedora|none) + debian|gentoo|archlinux|suse|fedora|darwin|none) + ;; + netbsd|freebsd) + AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)]) + ;; + linux) + AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported.]) ;; *) AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check]) ;; esac -fi AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) 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_DARWIN, test x"$with_distro" = xdarwin) +AM_CONDITIONAL(TARGET_NETBSD, test x"$with_distro" = xnetbsd) +AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd) test_gcc_flag() { AC_LANG_CONFTEST([int main() {}]) @@ -155,26 +162,30 @@ test_gcc_flag() { # If using GCC specify some additional parameters if test "x$GCC" = "xyes" ; then - DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wlarger-than-4000 -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter" - - # Test whether rtnetlink.h can be included when compiled with -std=c99 - # some distributions (e.g. archlinux) have broken headers that dont - # define __u64 with -std=c99 - AC_MSG_CHECKING([checking whether rtnetlink.h can be included with -std=c99]) - OLDCFLAGS="$CFLAGS" - CFLAGS="-std=c99" - AC_TRY_COMPILE([#include ], [], - use_stdc99=yes, use_stdc99=no) + DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline" + + if test "x$HAVE_NETLINK" = "xyes" ; then + # Test whether rtnetlink.h can be included when compiled with -std=c99 + # some distributions (e.g. archlinux) have broken headers that dont + # define __u64 with -std=c99 + AC_MSG_CHECKING([checking whether rtnetlink.h can be included with -std=c99]) + OLDCFLAGS="$CFLAGS" + CFLAGS="-std=c99" + AC_TRY_COMPILE([#include ], [], + use_stdc99=yes, use_stdc99=no) + + if test x"$use_stdc99" = xyes; then + DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi - if test x"$use_stdc99" = xyes; then - DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS" - AC_MSG_RESULT([yes]) + CFLAGS="$OLDCFLAGS" else - AC_MSG_RESULT([no]) + DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS" fi - CFLAGS="$OLDCFLAGS" - for flag in $DESIRED_FLAGS ; do AC_MSG_CHECKING([whether $CC accepts $flag]) if test_gcc_flag $flag ; then @@ -202,7 +213,7 @@ AC_FUNC_MEMCMP AC_FUNC_SELECT_ARGTYPES AC_FUNC_MALLOC AC_FUNC_REALLOC -AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid setresgid setregid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname seteuid setegid setproctitle getprogname]) AC_FUNC_CHOWN AC_FUNC_STAT @@ -211,6 +222,17 @@ AC_TYPE_PID_T AC_CHECK_DECLS(environ) +enable_chroot=yes +AC_CHECK_HEADERS([sys/capability.h],,enable_chroot=no) +AC_CHECK_HEADERS([sys/prctl.h],,enable_chroot=no) +AC_CHECK_FUNCS([chroot],,enable_chroot=no) + +AM_CONDITIONAL(ENABLE_CHROOT, test "x$enable_chroot" = "xyes") + +if test "x$enable_chroot" = "xyes" ; then + AC_DEFINE([ENABLE_CHROOT], 1, [Enable chroot() usage]) +fi + # 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) @@ -355,7 +377,7 @@ if test "x$HAVE_DBUS" = "xyes" ; then # to /var/run/dbus DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=/var/run/dbus/system_bus_socket" - TRY_SOCKETS="/var/lib/dbus/system_bus_socket /var/run/dbus/system_bus_socket" + TRY_SOCKETS="/var/lib/dbus/system_bus_socket /var/run/dbus/system_bus_socket ${localstatedir}/run/dbus/system_bus_socket ${prefix}/var/run/dbus/system_bus_socket" for sock in $TRY_SOCKETS; do if test -S $sock; then DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$sock" @@ -388,6 +410,28 @@ if test "x$HAVE_EXPAT" = "xyes" ; then fi AM_CONDITIONAL(HAVE_EXPAT, test "x$HAVE_EXPAT" = "xyes") +# +# GDBM +# +AC_ARG_ENABLE(gdbm, + AS_HELP_STRING([--disable-gdbm],[Disable use of GDBM]), + [case "${enableval}" in + yes) HAVE_GDBM=yes ;; + no) HAVE_GDBM=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gdbm) ;; + esac], + [HAVE_GDBM=yes]) + +if test "x$HAVE_GDBM" = "xyes" ; then + AC_CHECK_LIB(gdbm, gdbm_open, [ AC_CHECK_HEADERS(gdbm.h, have_gdbm=true, have_gdbm=false) ], have_gdbm=false) + + if ! $have_gdbm ; then + AC_MSG_ERROR([*** libgdbm not found ***]) + fi + AC_DEFINE([HAVE_GDBM],[],[Support for GDBM]) +fi +AM_CONDITIONAL(HAVE_GDBM, test "x$HAVE_GDBM" = "xyes") + # # libdaemon # @@ -660,9 +704,11 @@ initscript/gentoo/Makefile initscript/archlinux/Makefile initscript/suse/Makefile initscript/fedora/Makefile +initscript/darwin/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile -avahi-utils/avahi/Makefile +avahi-python/Makefile +avahi-python/avahi/Makefile examples/Makefile common/Makefile man/Makefile @@ -692,6 +738,7 @@ echo " Enable GTK: ${HAVE_GTK} Enable D-BUS: ${HAVE_DBUS} Enable Expat: ${HAVE_EXPAT} + Enable GDBM: ${HAVE_GDBM} Enable libdaemon: ${HAVE_LIBDAEMON} Enable Python: ${HAVE_PYTHON} Enable pygtk: ${HAVE_PYGTK} @@ -699,9 +746,10 @@ echo " Enable QT3: ${HAVE_QT3} Enable QT4: ${HAVE_QT4} Enable Mono: ${HAVE_MONO} - Linux Distro: ${with_distro} + Distribution/OS: ${with_distro} User for Avahi: ${AVAHI_USER} Group for Avahi: ${AVAHI_GROUP} + Enable chroot(): ${enable_chroot} " BUILD_DAEMON="no (!)"