From 46a0ca6aef6fd2321e7dbc8fd67aa1c9449095ca Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Sun, 23 Apr 2006 15:41:50 +0000 Subject: 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 --- configure.ac | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a7d2c65..c93b191 100644 --- 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" -- cgit