X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=c9de6ae8bd5cbd1767183d35661f791b654f09ab;hb=75caf1cfade7e6b6e43079c79b771532007d1002;hp=2eca925570c7afa4ed27e608b99b1dbec4a682dc;hpb=788c921143004a2fdbf3abcba1a59f1693e2e07d;p=catta diff --git a/configure.ac b/configure.ac index 2eca925..c9de6ae 100644 --- a/configure.ac +++ b/configure.ac @@ -21,13 +21,20 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.2],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.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(LIBAVAHI_COMMON_VERSION_INFO, [1:0:1]) +AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [0:1:0]) +AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:0:0]) +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]) + if type -p stow > /dev/null && test -d /usr/local/stow ; then AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" @@ -59,14 +66,14 @@ 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]) + 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) + debian|gentoo|archlinux|none) ;; *) - AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)]) + 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 @@ -133,13 +140,21 @@ 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]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday putenv strncasecmp]) AC_FUNC_CHOWN AC_FUNC_STAT AC_TYPE_MODE_T AC_TYPE_PID_T +# 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) + +if test x"$have_pkg_config" == xno; then + AC_MSG_ERROR(pkg-config is required to install this program) +fi + PKG_PROG_PKG_CONFIG # @@ -161,6 +176,56 @@ if test "x$HAVE_GLIB" = "xyes" ; then fi AM_CONDITIONAL(HAVE_GLIB, test "x$HAVE_GLIB" = "xyes") +# +# Check for Qt 3 +# +AC_ARG_ENABLE(qt3, + AS_HELP_STRING([--disable-qt3],[Disable building of Qt3 mainloop integration]), + [case "${enableval}" in + yes) HAVE_QT3=yes ;; + no) HAVE_QT3=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt3) ;; + esac], + [HAVE_QT3=yes]) + +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" + MOC_QT3="no" + AC_CHECK_FILE( "$QT3_PREFIX/moc-qt3", [ MOC_QT3=$QT3_PREFIX/moc-qt3 ], [ + AC_CHECK_FILE("$QT3_PREFIX/moc", [ MOC_QT3=$QT3_PREFIX/moc ], [ + AC_MSG_ERROR([Couldn't find QT3 moc])])]) + AC_SUBST(MOC_QT3) +fi +AM_CONDITIONAL(HAVE_QT3, test "x$HAVE_QT3" = "xyes") + +# +# Check for Qt 4 +# +AC_ARG_ENABLE(qt4, + AS_HELP_STRING([--disable-qt4],[Disable building of Qt4Core mainloop integration]), + [case "${enableval}" in + yes) HAVE_QT4=yes ;; + no) HAVE_QT4=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt4) ;; + esac], + [HAVE_QT4=yes]) + +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" + MOC_QT4="no" + AC_CHECK_FILE( "$QT4_PREFIX/moc-qt4", [ MOC_QT4=$QT4_PREFIX/moc-qt4 ], [ + AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc ], [ + AC_MSG_ERROR([Couldn't find QT4 moc])])]) + AC_SUBST(MOC_QT4) +fi +AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes") + # # Check for GTK+ # @@ -184,8 +249,8 @@ if test "x$HAVE_GTK" = "xyes" ; then AC_SUBST(GLADE20_CFLAGS) AC_SUBST(GLADE20_LIBS) - interfacesdir="${datadir}/${PACKAGE}/interfaces/" - AC_SUBST(interfacesdir) + interfacesdir="${datadir}/${PACKAGE}/interfaces/" + AC_SUBST(interfacesdir) fi AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") @@ -202,21 +267,31 @@ AC_ARG_ENABLE(dbus, [HAVE_DBUS=yes]) AC_ARG_WITH(dbus-sys, AS_HELP_STRING([--with-dbus-sys=