Репозитории ALT
S: | 1.14.10-alt1 |
5.1: | 1.2.16-alt2 |
4.1: | 1.2.12-alt1.M41.1 |
+updates: | 1.2.4-alt0.M41.1 |
4.0: | 1.0.3-alt1.M40.2 |
3.0: | 0.36.2-alt1 |
Другие репозитории
Upstream: | 1.1.20 |
Группа :: Система/Серверы
Пакет: dbus
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: dbus-0.23-alt-ac_qt_check.patch
Скачать
Скачать
diff -urN dbus-0.23.orig/configure.in dbus-0.23/configure.in
--- dbus-0.23.orig/configure.in 2005-01-17 19:45:51 +0600
+++ dbus-0.23/configure.in 2005-01-17 19:54:06 +0600
@@ -814,34 +814,9 @@
AC_PATH_PROG(QT_MOC, moc, no, [$PATH:$QTDIR/bin])
have_qt=no
-AC_MSG_CHECKING([for qglobal.h])
-if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
- have_qt=yes
- DBUS_QT_CXXFLAGS="-I$QTDIR/include"
-else
- for dir in "${prefix}/include/qt" "/usr/include/qt-3.1" "/usr/include/qt3" "/usr/include/qt" "/usr/lib/qt/include" "/usr/lib/qt-3.1/include"; do
- if test -f "$dir/qglobal.h"; then
- have_qt=yes
- DBUS_QT_CXXFLAGS="-I$dir"
- fi
- done
-fi
-if test x"$have_qt" = x"yes"; then
- AC_MSG_RESULT([found])
-else
- AC_MSG_RESULT([not found])
-fi
-
-dnl linking to kdecore will give us a bit of help from libtool
-if (! kde-config >& /dev/null); then
- have_qt=no
-else
- kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
- if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
- have_qt=no
- else
- DBUS_QT_LIBS="$kdelibs/libkdecore.la"
- fi
+PKG_CHECK_MODULES(DBUS_QT, qt > 3.1, have_qt=yes, [:])
+if test "$have_qt" = no; then
+ PKG_CHECK_MODULES(DBUS_QT, qt-mt > 3.1, have_qt=yes, [:])
fi
if test x$have_qt = xno ; then
@@ -858,7 +833,10 @@
have_qt=no;
fi
-AM_CONDITIONAL(HAVE_QT, test x$have_qt = xyes)
+# Rename flags variable
+DBUS_QT_CXXFLAGS=$DBUS_QT_CFLAGS
+
+AM_CONDITIONAL(HAVE_QT, test "$have_qt" = yes)
dnl Qt flags
AC_SUBST(DBUS_QT_CXXFLAGS)