diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-04-23 17:03:52 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-04-23 17:03:52 +0000 |
| commit | 4b444b30ed9b975cd9a0ec294df60619be66deb0 (patch) | |
| tree | c6af68fbc1e5f3f777c714ffa848f5b9a014ae66 | |
| parent | 46a0ca6aef6fd2321e7dbc8fd67aa1c9449095ca (diff) | |
revert to 1189
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1191 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rwxr-xr-x | bootstrap.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 3 insertions, 17 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 807a5a1..d0f85cc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -55,7 +55,7 @@ case "$USER" in FLAGS="$FLAGS --disable-qt4" ;; sebest) - FLAGS="$FLAGS --disable-monodoc --disable-mono --enable-qt3=auto --enable-qt4=auto --sysconfdir=/etc --localstatedir=/var --prefix=/usr --disable-manpages --disable-xmltoman" + FLAGS="$FLAGS --enable-monodoc=auto --enable-dbus=auto --enable-mono=auto --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 c93b191..a7d2c65 100644 --- a/configure.ac +++ b/configure.ac @@ -280,19 +280,12 @@ 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" = "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 + 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" @@ -312,19 +305,12 @@ 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" = "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 + PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ]) AC_SUBST(QT4_CFLAGS) AC_SUBST(QT4_LIBS) QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin" |