commit 974efa6241b53e17aca908af17104794e22f453e
parent 58d34b5125c84e7d9edf57d25d09c731f2b656f8
Author: andreaha <andreaha@b31fe1f4-c0d1-0310-8000-a34f4ae90293>
Date: Thu, 4 Mar 2004 20:08:52 +0000
- configure.in now also searches correctly for the OpenSSL include
path.
git-svn-id: file:///home/cwright/convert/bincimap/trunk@52 b31fe1f4-c0d1-0310-8000-a34f4ae90293
Diffstat:
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
@@ -10,7 +10,7 @@ dnl USA.
dnl Process this file with autoconf to produce a configure script.
dnl AC_PREREQ(2.57)
-AC_INIT(bincimap, 1.2.7beta2, bincimap@andreas.hanssen.name)
+AC_INIT(bincimap, 1.2.7beta3, andreas-binc@bincimap.org)
AC_CONFIG_SRCDIR([config.h.in])
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
@@ -164,7 +164,7 @@ AC_ARG_WITH(openssl-lib,
AC_ARG_WITH(openssl-include,
AC_HELP_STRING([--with-openssl-include], [Set path to OpenSSL headers]),
- [ if [[ "x$withval" != "xno" -a "x$withval" != "xyes" ]]; then CXXFLAGS="$CXXFLAGS -I$withval"; fi ],)
+ [ if [[ "x$withval" != "xno" -a "x$withval" != "xyes" ]]; then CXXFLAGS="$CXXFLAGS -I$withval"; SSLINCLUDEPATH=$withval; fi ],)
AC_ARG_WITH(ssl,
AC_HELP_STRING([--with-ssl], [Enable SSL support (default)])
@@ -180,6 +180,19 @@ if [[ "$WITH_SSL" = "1" ]]; then
AC_TRY_LINK([], [], LIBSOCKET="-lsocket"; AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
export LIBS=$LDTMP
+ AC_MSG_CHECKING(for OpenSSL includes)
+ export CXXTMP=$CXXFLAGS
+ for k in found $SSLINCLUDEPATH /usr/include /usr/local/include /usr/local/ssl/include /usr/local/openssl/include /opt/ssl/include /opt/openssl/include; do
+ export CXXFLAGS="$CXXTMP -I$k"
+ AC_TRY_COMPILE([#include <openssl/ssl.h>], [SSL_write(0, 0, 0);], INCLUDESSL="-I$k"; AC_MSG_RESULT($k), [])
+ if [[ "x$INCLUDESSL" != "x" ]]; then break; fi
+ done
+
+ if [[ "x$INCLUDESSL" = "x" ]]; then
+ AC_MSG_RESULT(not found)
+ export CXXFLAGS=$CXXTMP
+ fi
+
AC_MSG_CHECKING(for OpenSSL libraries)
export LIBTMP=$LIBS
export LDTMP=$LDFLAGS
