diff options
| author | Albert Astals Cid <aacid@kde.org> | 2008-03-09 00:57:08 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2008-03-09 00:57:08 +0100 |
| commit | 32637db19dd80a9b8452f86eb677b10e77290627 (patch) | |
| tree | d12574a06143cc8ac32cbf55d12dafab54781ab5 /m4 | |
| parent | 65a88a95a5c54c890048e8a986df361585d601dd (diff) | |
proper lib64 Qt detection
Fixes bug 14583
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/qt.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -7,11 +7,20 @@ AC_DEFUN([POPPLER_FIND_QT], [ dnl Search paths for Qt -qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include" -qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib" +if test "$build_cpu" != "x86_64" ; then + qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include" + qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib" +else + qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include" + qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib" +fi if test -n "$QTDIR" ; then qt_incdirs="$QTDIR/include $qt_incdirs" - qt_libdirs="$QTDIR/lib $qt_libdirs" + if test "$build_cpu" != "x86_64" ; then + qt_libdirs="$QTDIR/lib $qt_libdirs" + else + qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs" + fi fi dnl What to test |