enable-openssl option

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10164 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+2001-06-11  Adam Fedor  <fedor@gnu.org>
+
+	* configure.in (enable-openssl): New option, disabled by default.
+	* Documentation/install.texi: document it.
+
 2001-06-09  Adam Fedor  <fedor@gnu.org>
 
 	* Source/externs.m: Change definition of exception strings and some

Documentation/install.texi

@@ -5,6 +5,12 @@
 @c set the vars GNUSTEP_BASE_VERSION and GNUSTEP_BASE_GCC_VERSION
 @include version.texi
 
+@menu
+* Introduction::                
+* Configuration::               
+* Compilation::                 
+@end menu
+
 @node Top, Introduction, (dir), (dir)
 
 @menu
@@ -34,7 +40,7 @@ When you configure this library, make sure you use the same
 configuration options as with gstep-make. Some additional options to
 configure are described below.
 
-@node Configuration, Reading Command-Line Arguments, Introduction, Top
+@node Configuration, Compilation, Introduction, Top
 @section Configuration
 
 Configuration is performed by running the @file{configure} program at a
@@ -58,9 +64,10 @@ GNUstep-HOWTO and are also located at the GNUstep web site at
 @menu
 * Reading Command-Line Arguments::  
 * FFI Library::                 
+* OpenSSL::                     
 @end menu
 
-@node Reading Command-Line Arguments, FFI Library, Configuration, Top
+@node Reading Command-Line Arguments, FFI Library, Configuration, Configuration
 @subsection Reading Command-Line Arguments
 
 There are two features that change how GNUstep gets access to 
@@ -97,7 +104,7 @@ NSProcessInfo initializeWithArguments method to pass the program
 arguments to NSProcessInfo (This would be done automatically if you use
 the NSApplicationMain function in a gui application).
 
-@node FFI Library, Compilation, Reading Command-Line Arguments, Top
+@node FFI Library, OpenSSL, Reading Command-Line Arguments, Configuration
 @subsection FFI Library
 
 GNUstep's NSInvocations and Distributed Objects code involves detailed
@@ -115,7 +122,17 @@ version of the Objective-C library (as of gcc 2.95.x the required hooks
 are not in the standard library). You can get this library from
 @url{ftp://www.gnustep.org/pub/gnustep/libs/libobjc-0.9.1.tar.gz}.
 
-@node Compilation,  , FFI Library, Top
+@node OpenSSL,  , FFI Library, Configuration
+@subsection OpenSSL
+
+GNUstep base has optional support for using the OpenSSL libraries for
+secure URL connections (with the NSURL classes). To enable this option
+you need to have the openssl libraries installed and add the option
+@code{--enable-openssl} when running the @file{configure} script. Note that
+the OpenSSL license is not compatible with GPL, so do not use this option
+if you want your programs to be GPL compatible.
+
+@node Compilation,  , Configuration, Top
 @section Compilation
 
 To compile this library, type make. After this is complete, type make

configure.in

@@ -773,11 +773,12 @@ AC_SUBST(HAVE_LIBXML)
 #--------------------------------------------------------------------
 # Check OpenSSL for HTTPS support.
 #--------------------------------------------------------------------
-echo "Checking for OpenSSL"
+AC_ARG_ENABLE(openssl,
+  [  --enable-openssl       	Enable support for openssl in URL classes],,
+  enable_openssl=no)
 AC_ARG_WITH(openssl-include,
   [  --with-openssl-include=PATH  include path for openssl headers],
   openssl_incdir="$withval", openssl_incdir="no")
-
 AC_ARG_WITH(openssl-library,
   [  --with-openssl-library=PATH  library path for openssl libraries],
   openssl_libdir="$withval", openssl_libdir="no")
@@ -792,22 +793,24 @@ if test "$openssl_libdir" != "no"; then
   LIBS="$LIBS -L$openssl_libdir"
 fi
 
-AC_CHECK_HEADERS(openssl/ssl.h)
-if test $ac_cv_header_openssl_ssl_h = no; then
-  echo "Could not find openssl headers"
-  echo "Check to make sure you have a recent version of openssl installed"
-  AC_MSG_WARN(Could not find openssl headers)
-  ssl_ok=no
-else
-  AC_CHECK_LIB(crypto, CRYPTO_malloc, ssl_ok=yes, ssl_ok=no)
-  if test "$ssl_ok" = yes; then
-    base_libs="$LIBS"
-    LIBS="$LIBS -lcrypto"
-    AC_CHECK_LIB(ssl, ssl2_clear, ssl_ok=yes, ssl_ok=no)
+if test $enable_openssl = yes; then
+  AC_CHECK_HEADERS(openssl/ssl.h)
+  if test $ac_cv_header_openssl_ssl_h = no; then
+    echo "Could not find openssl headers"
+    echo "Check to make sure you have a recent version of openssl installed"
+    AC_MSG_WARN(Could not find openssl headers)
+    ssl_ok=no
+  else
+    AC_CHECK_LIB(crypto, CRYPTO_malloc, ssl_ok=yes, ssl_ok=no)
     if test "$ssl_ok" = yes; then
-      LIBS="$base_libs -lssl -lcrypto"
-      AC_SUBST(LIBS)
-      AC_DEFINE(HAVE_OPENSSL)
+      base_libs="$LIBS"
+      LIBS="$LIBS -lcrypto"
+      AC_CHECK_LIB(ssl, ssl2_clear, ssl_ok=yes, ssl_ok=no)
+      if test "$ssl_ok" = yes; then
+        LIBS="$base_libs -lssl -lcrypto"
+        AC_SUBST(LIBS)
+        AC_DEFINE(HAVE_OPENSSL)
+      fi
     fi
   fi
 fi
@@ -820,7 +823,6 @@ fi
 #--------------------------------------------------------------------
 # Check GMP for NSDecimal
 #--------------------------------------------------------------------
-echo "Checking for GMP"
 AC_ARG_WITH(gmp-include,
   [  --with-gmp-include=PATH  include path for gmp headers],
   gmp_incdir="$withval", gmp_incdir="no")
@@ -841,11 +843,7 @@ fi
 
 HAVE_GMP=0
 AC_CHECK_HEADERS(gmp.h)
-if test $ac_cv_header_gmp_h = no; then
-  echo "Could not find gmp headers"
-  echo "Check to make sure you have gmp installed"
-  AC_MSG_WARN(Could not find gmp headers)
-else
+if test $ac_cv_header_gmp_h = yes; then
   AC_CHECK_LIB(gmp, mpf_abs, gmp_ok=yes, gmp_ok=no)
   if test "$gmp_ok" = no; then
     AC_CHECK_LIB(gmp, __gmpf_abs, gmp_ok=yes, gmp_ok=no)
@@ -855,10 +853,6 @@ else
     LIBS="$LIBS -lgmp"
     AC_SUBST(LIBS)
     HAVE_GMP=1
-  else
-    echo "Could not find gmp library" 
-    echo "Check to make sure you have gmp installed"
-    AC_MSG_WARN(Could not find gmp library)
   fi
 fi