head	1.3;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.3
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.3
	RELEASE_7_2_0:1.3
	RELEASE_7_1_0:1.3
	RELEASE_6_4_0:1.3
	RELEASE_5_EOL:1.3
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.3
	RELEASE_4_EOL:1.3
	RELEASE_6_2_0:1.3
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2005.09.06.06.06.15;	author demon;	state Exp;
branches;
next	1.2;

1.2
date	2004.11.18.09.08.41;	author demon;	state Exp;
branches;
next	1.1;

1.1
date	2004.01.27.13.24.43;	author demon;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Fix build with openssl-0.9.8.

PR:		85309
Submitted by:	Daniel Roethlisberger <daniel@@roe.ch>
@
text
@--- configure.orig	Wed Dec 17 23:54:50 2003
+++ configure	Fri Aug 26 11:59:28 2005
@@@@ -20,17 +20,17 @@@@
 while [ $# -gt 0 ]; do
 	case "$1" in
 		--qtdir=*)
-			QTDIR=`expr "${1}" : "--qtdir=\(.*\)"`
+			QTDIR="${1#--qtdir=}"
 			shift
 			;;
 
 		--with-openssl-inc=*)
-			QC_WITH_OPENSSL_INC=`expr "${1}" : "--with-openssl-inc=\(.*\)"`
+			QC_WITH_OPENSSL_INC="${1#--with-openssl-inc=}"
 			shift
 			;;
 
 		--with-openssl-lib=*)
-			QC_WITH_OPENSSL_LIB=`expr "${1}" : "--with-openssl-lib=\(.*\)"`
+			QC_WITH_OPENSSL_LIB="${1#--with-openssl-lib=}"
 			shift
 			;;
 
@@@@ -84,7 +86,7 @@@@
 		echo Warning: qmake not in \$QTDIR/bin/qmake
 		echo trying to find it in \$PATH
 	fi
-	qm=`type -p qmake`
+	qm=`which qmake`
 	if [ -x "$qm" ]; then
 		if [ "$QC_DEBUG" = "Y" ]; then
 			echo qmake found in $qm
@@@@ -144,8 +146,6 @@@@
 
 		s = conf->getenv("QC_WITH_OPENSSL_LIB");
 		if(!s.isEmpty()) {
-			if(!conf->checkLibrary(s, "ssl"))
-				return false;
 			lib = s;
 		}
 		else {
@@@@ -175,6 +175,19 @@@@
 		if(ret == 0)
 			conf->addDefine("OSSL_097");
 
+		// is it at least openssl 0.9.8?
+		str =
+			"#include<openssl/opensslv.h>\n"
+			"int main()\n"
+			"{\n"
+			"  unsigned long x = OPENSSL_VERSION_NUMBER;\n"
+			"  if(x >= 0x00908000) return 0; else return 1;\n"
+			"}\n";
+		if(!conf->doCompileAndLink(str, ext, &ret))
+			return false;
+		if(ret == 0)
+			conf->addDefine("OSSL_098");
+
 		if(!inc.isEmpty())
 			conf->addIncludePath(inc);
 		if(kb)
@@@@ -570,13 +583,6 @@@@
 	echo
 	exit 1;
 fi
-cat >Makefile.tmp <<EOT
-export QTDIR = $QTDIR
-EOT
-cat Makefile >> Makefile.tmp
-rm -f Makefile
-cp -f Makefile.tmp Makefile
-rm -f Makefile.tmp
 
 echo
 echo Good, your configure finished.  Now run \'make\'.
@


1.2
log
@Fix build on 5.x.
Get rid of gmake dependency.

PR:		74016
Submitted by:	Eugene Ossintsev <eugos@@gmx.net>
@
text
@d2 1
a2 1
+++ configure	Tue Nov 16 12:33:52 2004
a23 9
@@@@ -43,6 +43,8 @@@@
 	esac
 done
 
+QC_WITH_OPENSSL_INC=/usr/include
+QC_WITH_OPENSSL_LIB=/usr/lib
 
 echo "Configuring qca-tls ..."
 
d42 21
a62 1
@@@@ -570,13 +570,6 @@@@
@


1.1
log
@New port: qca-tls.

A plugin to provide SSL/TLS capability to programs that utilize the
Qt Cryptographic Architecture (QCA).
@
text
@d1 23
a23 2
--- configure.orig	Thu Dec 18 01:54:50 2003
+++ configure	Tue Jan 27 14:58:26 2004
d51 14
@

