X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=c9de6ae8bd5cbd1767183d35661f791b654f09ab;hb=75caf1cfade7e6b6e43079c79b771532007d1002;hp=e3be4f766216d8e72255e175e8e37088232399de;hpb=94b5fd5aa2d69318629babf78ef687d1b8d4a8d1;p=catta diff --git a/configure.ac b/configure.ac index e3be4f7..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}" @@ -169,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+ # @@ -215,7 +272,7 @@ AC_ARG_WITH(dbus-system-socket, AS_HELP_STRING([--with-dbus-system-address== 0.30 ]) + PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ]) DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE" AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -290,12 +347,45 @@ AC_ARG_ENABLE(python, *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;; esac],[HAVE_PYTHON=yes]) +HAVE_PYTHON_DBUS=no +HAVE_PYGTK=no + if test "x$HAVE_PYTHON" = "xyes" ; then AM_PATH_PYTHON([2.4]) - AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module pygtk)]) - AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) + + AC_ARG_ENABLE(pygtk, + AS_HELP_STRING([--disable-pygtk],[Disable use of GTK in Python]), + [case "${enableval}" in + yes) HAVE_PYGTK=yes ;; + no) HAVE_PYGTK=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-pygtk) ;; + esac], + [HAVE_PYGTK=yes]) + + if test "x$HAVE_PYGTK" = "xyes" ; then + AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)]) + fi + + + AC_ARG_ENABLE(python-dbus, + AS_HELP_STRING([--disable-python-dbus],[Disable use of D-BUS in Python]), + [case "${enableval}" in + yes) HAVE_PYTHON_DBUS=yes ;; + no) HAVE_PYTHON_DBUS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-python-dbus) ;; + esac], + [HAVE_PYTHON_DBUS=yes]) + + if test "x$HAVE_PYTHON_DBUS" = "xyes"; then + AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) + 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)]) fi AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ]) +AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes") +AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes") # # Defining Avahi User and Group. @@ -372,6 +462,7 @@ Makefile avahi-common/Makefile avahi-core/Makefile avahi-glib/Makefile +avahi-qt/Makefile avahi-daemon/Makefile avahi-daemon/avahi-dbus.conf avahi-discover-standalone/Makefile @@ -407,7 +498,11 @@ echo " Enable D-BUS: ${HAVE_DBUS} Enable Expat: ${HAVE_EXPAT} Enable libdaemon: ${HAVE_LIBDAEMON} - Have Python: ${HAVE_PYTHON} + Enable Python: ${HAVE_PYTHON} + Enable pygtk: ${HAVE_PYGTK} + Enable python-dbus: ${HAVE_PYTHON_DBUS} + Enable QT3: ${HAVE_QT3} + Enable QT4: ${HAVE_QT4} Linux Distro: ${with_distro} User for Avahi: ${AVAHI_USER} Group for Avahi: ${AVAHI_GROUP} @@ -421,7 +516,7 @@ fi BUILD_UTILS="no (!)" -if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" ; then +if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" -a "x$HAVE_PYTHON_DBUS" = "xyes" -a "x$HAVE_PYGTK" = "xyes" ; then BUILD_UTILS=yes fi @@ -431,7 +526,6 @@ if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then BUILD_CLIENT=yes fi - echo " Building libavahi-core yes Building avahi-daemon: ${BUILD_DAEMON} @@ -440,4 +534,6 @@ echo " Building libavahi-glib: ${HAVE_GLIB} Building libavahi-client: ${BUILD_CLIENT} Building avahi-discover-standalone: ${HAVE_GTK} + Building libavahi-qt3: ${HAVE_QT3} + Building libavahi-qt4: ${HAVE_QT4} "