Commits

Ivan Vučica committed 80db8b4

Corrected the patch to disable OpenSSL: defining a default value for ENABLE_OPENSSL.

Comments (0)

Files changed (1)

patches/03-ivucica-gsbase-disabling_openssl.patch

 ===================================================================
 --- configure.ac	(revision 37522)
 +++ configure.ac	(working copy)
-@@ -3438,7 +3438,7 @@
+@@ -3438,8 +3438,13 @@
  # If there's no TLS support ... try to get some limited functionality
  # by using OpenSSL instead.
  
 -if test "$HAVE_TLS" = "0"; then
++# Using name "ENABLE_OPENSSL" instead of "HAVE_OPENSSL" because we're not
++# actually testing for presence of OpenSSL (which may be done in 
++# AC_CONFIG_SUBDIRS(SSL))
++ENABLE_OPENSSL=0
+ 
 +if test "$HAVE_GNUTLS" = "0"; then
- 
++
  #--------------------------------------------------------------------
  # Configure flags from sub-configure runs, so they show up in our
-@@ -3447,7 +3447,6 @@
+ # help file.
+@@ -3447,7 +3452,6 @@
  AC_ARG_ENABLE(openssl,
    [  --disable-openssl		Disable support for openssl in URL classes],,
    enable_openssl=yes)
  AC_ARG_WITH(openssl-include,
    [  --with-openssl-include=PATH  include path for openssl headers],
    openssl_incdir="$withval", openssl_incdir="no")
-@@ -3455,9 +3454,19 @@
+@@ -3455,9 +3459,16 @@
    [  --with-openssl-library=PATH  library path for openssl libraries],
    openssl_libdir="$withval", openssl_libdir="no")
  
 -AC_CONFIG_SUBDIRS(SSL)
-+if test $enable_openssl = yes; then
-+  # Using name "ENABLE_OPENSSL" instead of "HAVE_OPENSSL" because we're not
-+  # actually testing for presence of OpenSSL (which may be done in 
-+  # AC_CONFIG_SUBDIRS(SSL))
++if test $enable_openssl = yes; then 
 +  ENABLE_OPENSSL=1
-+  AC_DEFINE_UNQUOTED(ENABLE_OPENSSL,$ENABLE_OPENSSL,[Define if OpenSSL code should be used])
-+  AC_SUBST(ENABLE_OPENSSL)
-+  
 +  AC_CONFIG_SUBDIRS(SSL)
  fi
  
 +fi
 +
++AC_DEFINE_UNQUOTED(ENABLE_OPENSSL,$ENABLE_OPENSSL,[Define if OpenSSL code should be used])
++AC_SUBST(ENABLE_OPENSSL)
++
  #--------------------------------------------------------------------
  # Record the version
  #--------------------------------------------------------------------
  #
  SUBPROJECTS = Source
  ifeq ($(GNUSTEP_BASE_HAVE_GNUTLS), 0)
-+ifneq ($(GNUSTEP_BASE_ENABLE_OPENSSL), 0)
++ifeq ($(GNUSTEP_BASE_ENABLE_OPENSSL), 1)
  ifneq ($(GNUSTEP_TARGET_OS), mingw32)
    SUBPROJECTS += SSL
  endif
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.