Attachment 14854 Details for Bug 14583 – proper lib64 Qt detection

[patch] proper lib64 Qt detection

poppler-0.7.1-qt_lib64.patch (text/plain), 3.53 KB, created by Moritz Barsnick on 2008-03-05 02:12:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Moritz Barsnick

Created: 2008-03-05 02:12:04 UTC

Size: 3.53 KB

patch

obsolete

>diff -ur poppler-0.7.1/configure poppler-0.7.1-qt_lib64/configure
>--- poppler-0.7.1/configure	2008-02-27 19:40:11.000000000 +0100
>+++ poppler-0.7.1-qt_lib64/configure	2008-03-05 10:58:50.075518874 +0100
>@@ -26165,11 +26165,20 @@
> 
> if test x$enable_poppler_qt = xyes; 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"
>+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 $x_includes"
>+    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 $x_libraries"
>+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 $x_includes"
>+    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 $x_libraries"
>+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
> 
> qt_test_include="qstyle.h"
>@@ -26347,11 +26356,20 @@
> 
> elif test x$enable_poppler_qt = xtry; 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"
>+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 $x_includes"
>+    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 $x_libraries"
>+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 $x_includes"
>+    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 $x_libraries"
>+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
> 
> qt_test_include="qstyle.h"

Actions: View | Splinter Review

Attachments on bug 14583: 14854

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.