diff options
| author | Patrick Li <pat@FreeBSD.org> | 2002-01-12 00:47:32 +0000 |
|---|---|---|
| committer | Patrick Li <pat@FreeBSD.org> | 2002-01-12 00:47:32 +0000 |
| commit | 5f2243f411e7035a1da8a2346fe8b923cf38fe37 (patch) | |
| tree | 116e20f143b91874a8a8f53a6f027789081b5a4a /security | |
| parent | dca4690b02bdd7889a2467134bacf6b0dc1bc9bd (diff) | |
| download | ports-5f2243f411e7035a1da8a2346fe8b923cf38fe37.tar.gz ports-5f2243f411e7035a1da8a2346fe8b923cf38fe37.zip | |
Further avoid breakage when user has both qtlib version 1 and 2 installed.
Reported by: Robert Huff <roberthuff@rcn.com>
Notes
Notes:
svn path=/head/; revision=52962
Diffstat (limited to 'security')
| -rw-r--r-- | security/qtfw/files/patch-configure | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/security/qtfw/files/patch-configure b/security/qtfw/files/patch-configure index 11bf6edb2a41..28b9010bbc7c 100644 --- a/security/qtfw/files/patch-configure +++ b/security/qtfw/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Tue Jan 8 21:54:19 2002 -+++ configure Tue Jan 8 21:56:06 2002 +--- configure.orig Fri Jan 11 19:39:32 2002 ++++ configure Fri Jan 11 19:40:17 2002 @@ -790,7 +790,7 @@ QT_LIB_DIR=NO @@ -21,3 +21,26 @@ do if test -r "$i/$j"; then l_dir=$i +@@ -850,22 +850,6 @@ + for base_dir in /usr/X11R6 /usr/local /usr;do + l_dir=`find $base_dir -name "libqt*.so"|$AWK -F "/" '{gsub($NF,"");print}'|head -n 1` + i_dir=`find $base_dir -name "qapplication.h"|$AWK -F "/" '{gsub($NF,"");print}'|head -n 1` +- +- +-echo '#include <qglobal.h>' >libtestprg.cpp +-echo 'int main(){qVersion();return 0;}' >>libtestprg.cpp +-if $CXX -o libtestprg.out libtestprg.cpp -I$i_dir -L$l_dir -lqt 2>/dev/null +-then +- rm -r libtestprg.* +- LIB_QT=qt +- QT_INCLUDE_DIR=$i_dir +- QT_LIB_DIR=$l_dir +- echo "$ac_t""link with: $LIB_QT includes: $QT_INCLUDE_DIR libs: $QT_LIB_DIR" 1>&6;break 1 +-else +- rm -r libtestprg.* +- +-fi +- + + + echo '#include <qglobal.h>' >libtestprg.cpp |