]>
Commit | Line | Data |
---|---|---|
65b9f77c JB |
1 | --- poppler-0.5.2/m4/qt.m4.orig 2006-05-02 06:03:46.000000000 +0200 |
2 | +++ poppler-0.5.2/m4/qt.m4 2006-05-27 02:43:01.784504500 +0200 | |
2a32ae9d PS |
3 | @@ -7,8 +7,8 @@ |
4 | AC_DEFUN([POPPLER_FIND_QT], | |
5 | [ | |
6 | dnl Search paths for Qt | |
7 | -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" | |
8 | -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" | |
9 | +qt_incdirs="/usr/include/qt" | |
10 | +qt_libdirs="/usr/lib64 /usr/lib" | |
11 | if test -n "$QTDIR" ; then | |
12 | qt_incdirs="$QTDIR/include $qt_incdirs" | |
13 | qt_libdirs="$QTDIR/lib $qt_libdirs" | |
65b9f77c | 14 | @@ -99,8 +99,8 @@ |
2a32ae9d PS |
15 | [ |
16 | have_qt4=no | |
17 | dnl Search paths for Qt4 - not much real experience with this yet. | |
65b9f77c JB |
18 | -qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include" |
19 | -qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib" | |
2a32ae9d PS |
20 | +qt4_incdirs="/usr/include/qt4" |
21 | +qt4_libdirs="/usr/lib64 /usr/lib" | |
22 | ||
23 | if test -n "$QTDIR" ; then | |
24 | qt4_incdirs="$QTDIR/include $qt4_incdirs" | |
65b9f77c | 25 | @@ -179,8 +179,8 @@ |
2a32ae9d PS |
26 | [ |
27 | have_qt4testlib=no | |
28 | ||
29 | -qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include" | |
30 | -qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib" | |
31 | +qt4_incdirs="/usr/include/qt4" | |
32 | +qt4_libdirs="/usr/lib64 /usr/lib" | |
33 | ||
34 | if test -n "$QTDIR" ; then | |
35 | qt4_incdirs="$QTDIR/include $qt4_incdirs" |