2007-12-03 02:15:23 +00:00
|
|
|
diff -up poppler-0.6.2/poppler-0.6.2/configure.qt3-check poppler-0.6.2/poppler-0.6.2/configure
|
|
|
|
|
--- poppler-0.6.2/poppler-0.6.2/configure.qt3-check 2007-11-10 07:04:36.000000000 -0500
|
|
|
|
|
+++ poppler-0.6.2/poppler-0.6.2/configure 2007-12-02 21:14:01.000000000 -0500
|
|
|
|
|
@@ -26165,8 +26165,8 @@ fi
|
2007-11-29 22:07:51 +00:00
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
+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 /usr/lib/qt-3.3/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 /usr/lib/qt-3.3/lib"
|
|
|
|
|
if test -n "$QTDIR" ; then
|
|
|
|
|
qt_incdirs="$QTDIR/include $qt_incdirs"
|
|
|
|
|
qt_libdirs="$QTDIR/lib $qt_libdirs"
|
2007-12-03 02:15:23 +00:00
|
|
|
@@ -26192,11 +26192,6 @@ echo "${ECHO_T}$qt_incdir" >&6; }
|
|
|
|
|
echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; }
|
|
|
|
|
qt_libdir="no"
|
|
|
|
|
for qt_check in $qt_libdirs ; do
|
|
|
|
|
- if test -r "$qt_check/$qt_test_la_library" ; then
|
|
|
|
|
- qt_libdir="$qt_check"
|
|
|
|
|
- break
|
|
|
|
|
- fi
|
|
|
|
|
-
|
|
|
|
|
if test -r "$qt_check/$qt_test_library" ; then
|
|
|
|
|
qt_libdir="$qt_check"
|
|
|
|
|
break
|
