2000-04-01 05:21:42 +00:00
|
|
|
--- plugins/qt-gui/acinclude.m4.in.orig Wed Mar 29 01:36:10 2000
|
|
|
|
+++ plugins/qt-gui/acinclude.m4.in Wed Mar 29 01:37:07 2000
|
|
|
|
@@ -72,7 +72,7 @@
|
2000-02-15 01:46:27 +00:00
|
|
|
fi
|
1999-05-02 20:21:41 +00:00
|
|
|
|
2000-02-15 01:46:27 +00:00
|
|
|
for qt_dir in $qt_library_dirs; do
|
|
|
|
- for qt_check_lib in $qt_dir/libqt.so.2; do
|
2000-04-01 05:21:42 +00:00
|
|
|
+ for qt_check_lib in $qt_dir/libqt2.so.3; do
|
2000-02-15 01:46:27 +00:00
|
|
|
if test -r $qt_check_lib; then
|
|
|
|
ac_qt_libraries=$qt_dir
|
|
|
|
break 2
|
2000-04-01 05:21:42 +00:00
|
|
|
@@ -93,7 +93,7 @@
|
2000-02-15 01:46:27 +00:00
|
|
|
fi
|
1999-05-02 20:21:41 +00:00
|
|
|
|
2000-02-15 01:46:27 +00:00
|
|
|
dnl Check if we have the right lib
|
2000-04-01 05:21:42 +00:00
|
|
|
- output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
|
|
|
|
+ output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
|
2000-02-15 01:46:27 +00:00
|
|
|
if test -z "$output"; then
|
|
|
|
AC_MSG_ERROR([The Qt lib directory
|
|
|
|
$ac_cv_lib_qtlib
|
2000-04-01 05:21:42 +00:00
|
|
|
@@ -196,8 +196,8 @@
|
1999-05-02 20:21:41 +00:00
|
|
|
|
2000-04-01 05:21:42 +00:00
|
|
|
AC_PATH_PROG(
|
|
|
|
MOC,
|
|
|
|
- moc,
|
|
|
|
- $QTDIR/bin/moc,
|
|
|
|
+ moc2,
|
|
|
|
+ $QTDIR/bin/moc2,
|
|
|
|
$QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
|
|
|
|
)
|
|
|
|
else
|