diff options
Diffstat (limited to 'crypto/qca-tls/patch-configure')
| -rw-r--r-- | crypto/qca-tls/patch-configure | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/crypto/qca-tls/patch-configure b/crypto/qca-tls/patch-configure new file mode 100644 index 0000000000..e1f3a26967 --- /dev/null +++ b/crypto/qca-tls/patch-configure @@ -0,0 +1,75 @@ +--- 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\'. |