diff options
author | Brian Feldman <green@FreeBSD.org> | 2000-04-01 05:21:42 +0000 |
---|---|---|
committer | Brian Feldman <green@FreeBSD.org> | 2000-04-01 05:21:42 +0000 |
commit | 84a5ce14a5b6016af91a390179bb8537b1358d4a (patch) | |
tree | 1e048de895b6b99670477151a435997f71fd7f2c /net/licq-devel/files/patch-aa | |
parent | 71b1417b8e5c00517f8ad8741989746db89acfa7 (diff) |
Update to version 0.81. QT 2.1 (beta) is now needed. Thanks a bundle to
the submitter!!
Submitted by: Matt Heckaman <matt@arpa.mail.net>
Notes
Notes:
svn path=/head/; revision=27229
Diffstat (limited to 'net/licq-devel/files/patch-aa')
-rw-r--r-- | net/licq-devel/files/patch-aa | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/net/licq-devel/files/patch-aa b/net/licq-devel/files/patch-aa index 2a5bd5ffe26b..099bbe39d7b3 100644 --- a/net/licq-devel/files/patch-aa +++ b/net/licq-devel/files/patch-aa @@ -1,41 +1,42 @@ ---- plugins/qt-gui/configure.orig Tue Feb 8 16:14:18 2000 -+++ plugins/qt-gui/configure Tue Feb 8 16:15:42 2000 -@@ -3966,7 +3966,7 @@ +--- plugins/qt-gui/configure.orig Wed Mar 29 01:26:46 2000 ++++ plugins/qt-gui/configure Wed Mar 29 01:35:53 2000 +@@ -4217,7 +4217,7 @@ fi for qt_dir in $qt_library_dirs; do - for qt_check_lib in $qt_dir/libqt.so.2; do -+ for qt_check_lib in $qt_dir/libqt2.so.2; do ++ for qt_check_lib in $qt_dir/libqt2.so.3; do if test -r $qt_check_lib; then ac_qt_libraries=$qt_dir break 2 -@@ -3987,7 +3987,7 @@ +@@ -4238,7 +4238,7 @@ have_qt_lib="yes" fi -- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` -+ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` +- output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"` ++ output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"` if test -z "$output"; then { echo "configure: error: The Qt lib directory $ac_cv_lib_qtlib -@@ -4050,6 +4050,7 @@ +@@ -4301,7 +4301,7 @@ + /usr/X11/include/qt \ /usr/X11/include/X11/qt \ /usr/X11R6/include \ - /usr/X11R6/include/qt \ +- /usr/X11R6/include/qt \ + /usr/X11R6/include/qt2 \ /usr/X11R6/include/X11/qt \ /usr/X11/lib/qt/include" -@@ -4113,7 +4114,7 @@ - +@@ -4380,7 +4380,7 @@ + fi - # Extract the first word of "moc", so it can be a program name with args. + # Extract the first word of "moc", so it can be a program name with args. -set dummy moc; ac_word=$2 +set dummy moc2; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:4119: checking for $ac_word" >&5 + echo "configure:4386: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then -@@ -4137,7 +4138,7 @@ +@@ -4405,7 +4405,7 @@ fi done IFS="$ac_save_ifs" @@ -44,12 +45,3 @@ ;; esac fi -@@ -4152,7 +4153,7 @@ - - - if test -z "$QTDIR"; then -- echo "** environment variable QTDIR is not set, moc might not be found" -+ echo "** environment variable QTDIR is not set, moc2 might not be found" - fi - - |