head	1.4;
access;
symbols
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2;
locks; strict;
comment	@# @;


1.4
date	2002.09.21.05.15.55;	author pat;	state dead;
branches;
next	1.3;

1.3
date	2002.04.10.03.06.58;	author pat;	state Exp;
branches;
next	1.2;

1.2
date	2002.01.12.00.47.32;	author pat;	state Exp;
branches;
next	1.1;

1.1
date	2002.01.09.03.06.22;	author pat;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to 0.5 (Now requires QT 3)
@
text
@--- configure.orig	Tue Apr  9 22:35:07 2002
+++ configure	Tue Apr  9 22:35:17 2002
@@@@ -790,7 +790,7 @@@@
 QT_LIB_DIR=NO
 
 i_dir=NO
-for i in /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/local/qt2/include /usr/include/qt2 /usr/X11R6/include/X11/qt2 /usr/X11R6/include/qt2;
+for i in ${X11BASE}/include/qt2;
 do
   for j in qapplication.h;
   do
@@@@ -803,9 +803,9 @@@@
 
 
 l_dir=NO
-for i in /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/local/qt2/lib;
+for i in ${X11BASE}/lib;
 do
-  for j in libqt.so libqt2.so;
+  for j in libqt2.so;
   do
     if test -r "$i/$j"; then
       l_dir=$i
@@@@ -814,7 +814,7 @@@@
   done
 done
 
-for i in qt qt2;
+for i in qt2;
 do
 	
 
@@@@ -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
@


1.3
log
@Fix another case when build breaks when qt versions 1 and 2 coexist
@
text
@@


1.2
log
@Further avoid breakage when user has both qtlib version 1 and 2 installed.

Reported by:	Robert Huff <roberthuff@@rcn.com>
@
text
@d1 2
a2 2
--- configure.orig	Fri Jan 11 19:39:32 2002
+++ configure	Fri Jan 11 19:40:17 2002
d24 9
@


1.1
log
@Look only for qt version 2. People who have qt v1 and 2 installed at
the same time will have a problem and this patch fixes that.

Pointed out by:		Robert Huff <roberthuff@@rcn.com>
@
text
@d1 2
a2 2
--- configure.orig	Tue Jan  8 21:54:19 2002
+++ configure	Tue Jan  8 21:56:06 2002
d24 23
@

