X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=c369df46e7d55e2bd5cf26efe82c00fa08ba361f;hb=14e31e958eb9d280cfe544bc3379d19255badd21;hp=e3be4f766216d8e72255e175e8e37088232399de;hpb=94b5fd5aa2d69318629babf78ef687d1b8d4a8d1;p=catta

diff --git a/configure.ac b/configure.ac
index e3be4f7..c369df4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,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+
 #
@@ -292,8 +342,40 @@ AC_ARG_ENABLE(python,
 
 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
+
+    AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes")
+
+    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_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes")
+
+    AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+    AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
+    AM_CHECK_PYMOD(anydbm,,,[AC_MSG_ERROR(Could not find Python module anydbm)])
 fi
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ])
 
@@ -372,6 +454,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 +490,9 @@ echo "
     Enable D-BUS:           ${HAVE_DBUS}
     Enable Expat:           ${HAVE_EXPAT}
     Enable libdaemon:       ${HAVE_LIBDAEMON}
-    Have Python:            ${HAVE_PYTHON}
+    Enable Python:          ${HAVE_PYTHON}
+    Enable QT3:             ${HAVE_QT3}
+    Enable QT4:             ${HAVE_QT4}
     Linux Distro:           ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}
@@ -421,7 +506,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_PYTHON_GTK"; then
     BUILD_UTILS=yes
 fi
 
@@ -431,7 +516,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 +524,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}
 "