More changes to get SSL working with 2.x.x

[samba.git] / source / configure

diff --git a/source/configure b/source/configure
index a6fb9d31e737853f3017950e1c16bbbff649b916..f3a7b5bce4ad9b9cf0b877d6235c4d6f68bb5206 100755 (executable)
--- a/source/configure
+++ b/source/configure
@@ -44,6 +44,8 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-ssl     Include SSL support
   --without-ssl  Don't include SSL support (default)"
+ac_help="$ac_help
+  --with-sslinc=DIR Tells us where the SSL stuff is (default /usr/local/ssl)"
 ac_help="$ac_help
   --with-mmap     Include experimental MMAP support
   --without-mmap  Don't include MMAP support (default)"
@@ -1651,7 +1653,7 @@ else
 fi
 done
 
-for ac_hdr in sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h
+for ac_hdr in sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h sys/mman.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -8280,6 +8282,34 @@ if test "${with_ssl+set}" = set; then
 #define WITH_SSL 1
 EOF
 
+    CFLAGS="-I/usr/local/ssl/include $CFLAGS"
+
+    if test "${with_sslinc+set}" = set; then
+
+        withval="$with_sslinc"
+        case "$withval" in
+        yes|no)
+          echo "configure: warning: --with-sslinc called without argument - will
+ use default" 1>&2
+          CFLAGS="-I/usr/local/ssl/include $CFLAGS"
+          LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
+          LIBS="-lssl -lcrypto $LIBS"
+        ;;
+        * )
+          CFLAGS="-I${withval}/include $CFLAGS"
+          LDFLAGS="-L${withval}/lib $LDFLAGS"
+          LIBS="-lssl -lcrypto $LIBS"
+        ;;
+        esac
+
+    else
+
+        CFLAGS="-I/usr/local/ssl/include $CFLAGS"
+        LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
+        LIBS="-lssl -lcrypto $LIBS"
+
+    fi
+
     ;;
   *)
     echo "$ac_t""no" 1>&6