configure.in | 13 +++++++++++++
1 file changed, 13 insertions(+)
New commits:
commit bbbe092e29ed1d44bc782d07522db1c5d646f6c5
Author: Rene Engelhard <r...@debian.org>
Date: Mon Apr 16 14:07:24 2012 +0200
configure.in: fix Qt detection in Debian/Ubuntu multiarch
Signed-off-by: Petr Mladek <pmla...@suse.cz>
diff --git a/configure.in b/configure.in
index 825edda..ea9dee1 100644
--- a/configure.in
+++ b/configure.in
@@ -7784,6 +7784,7 @@ dnl
===================================================================
KDE4_CFLAGS=""
KDE4_LIBS=""
+QMAKE4="qmake"
MOC4="moc"
KDE_GLIB_CFLAGS=""
KDE_GLIB_LIBS=""
@@ -7853,6 +7854,18 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE"
; then
AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your
Qt4 installation by exporting QT4DIR before running "configure".])
fi
+ dnl Check for qmake
+ AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+ QMAKE4="$QMAKEQT4"
+ if test "$QMAKE4" = "no" ; then
+ AC_PATH_PROG( QMAKE4, qmake, no, [`dirname
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+ if test "$QMAKE4" = "no" ; then
+ AC_MSG_ERROR([Qmake not found. Please specify
+the root of your Qt installation by exporting QT4DIR before running
"configure".])
+ fi
+ fi
+
+ qt_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs"
AC_MSG_CHECKING([for Qt4 libraries])
qt_lib_dir="no"
for lib_dir in $qt_libdirs ; do
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
