adding --enable-foo=auto , only for qt3 / qt4 for review

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1190 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/bootstrap.sh b/bootstrap.sh
index d0b62569dfe22357b38d16ba37bdca17269b0522..807a5a1ed8645acdc96752e902af50d2b8b2643a 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -55,7 +55,7 @@ case "$USER" in
     FLAGS="$FLAGS --disable-qt4"
     ;;
     sebest)
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --sysconfdir=/etc --localstatedir=/var --prefix=/usr  --disable-manpages --disable-xmltoman"
+    FLAGS="$FLAGS --disable-monodoc --disable-mono --enable-qt3=auto --enable-qt4=auto  --sysconfdir=/etc --localstatedir=/var --prefix=/usr  --disable-manpages --disable-xmltoman"
     ;;
 esac
 

diff --git a/configure.ac b/configure.ac
index a7d2c65645ca348ce6193cca7a010b790bbf6368..c93b1912b599811d9004425a22f4c762fab11953 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -280,12 +280,19 @@ AC_ARG_ENABLE(qt3,
         [case "${enableval}" in
                 yes) HAVE_QT3=yes ;;
                 no)  HAVE_QT3=no ;;
+                auto)  HAVE_QT3=auto ;;
                 *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt3) ;;
         esac],
         [HAVE_QT3=yes])
 
-if test "x$HAVE_QT3" = "xyes" ; then
+if test "x$HAVE_QT3" = "xauto" ; then
+        PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ], [ HAVE_QT3="yes"], [ HAVE_QT3="no" && AC_MSG_RESULT([no]) ])
+else if test "x$HAVE_QT3" = "xyes" ; then
         PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ])
+     fi
+fi
+
+if test "x$HAVE_QT3" = "xyes" ; then
         AC_SUBST(QT3_CFLAGS)
         AC_SUBST(QT3_LIBS)
            QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
@@ -305,12 +312,19 @@ AC_ARG_ENABLE(qt4,
         [case "${enableval}" in
                 yes) HAVE_QT4=yes ;;
                 no)  HAVE_QT4=no ;;
+                auto)  HAVE_QT4=auto ;;
                 *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt4) ;;
         esac],
         [HAVE_QT4=yes])
 
-if test "x$HAVE_QT4" = "xyes" ; then
+if test "x$HAVE_QT4" = "xauto" ; then
+        PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ], [ HAVE_QT4="yes"], [ HAVE_QT4="no" && AC_MSG_RESULT([no]) ])
+else if test "x$HAVE_QT4" = "xyes" ; then
         PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ])
+     fi
+fi
+
+if test "x$HAVE_QT4" = "xyes" ; then
         AC_SUBST(QT4_CFLAGS)
         AC_SUBST(QT4_LIBS)
            QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"