OpenSSl enabled NetWare builds are changed to use the 'openssl' subdirectory

when including the OpenSSL header files. This is the recommended setting, this
prevents the undesired inclusion of header files with the same name as those
of OpenSSL but which do not belong to the OpenSSL package. The visible change
from previously released libcurl versions is that now OpenSSl enabled NetWare
builds also define USE_OPENSSL in config files, and that OpenSSL header files
must be located in a subdirectory named 'openssl'.

diff --git a/CHANGES b/CHANGES
index 5d02a05992f20b26a6b7e786d9a81e8d28a64c1c..3ed37883a89a1e64bad33ceedaa5b41577034397 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,15 @@
 
                                   Changelog
 
+Yang Tse (17 Aug 2008)
+- OpenSSl enabled NetWare builds are changed to use the 'openssl' subdirectory
+  when including the OpenSSL header files. This is the recommended setting, this
+  prevents the undesired inclusion of header files with the same name as those
+  of OpenSSL but which do not belong to the OpenSSL package. The visible change
+  from previously released libcurl versions is that now OpenSSl enabled NetWare
+  builds also define USE_OPENSSL in config files, and that OpenSSL header files
+  must be located in a subdirectory named 'openssl'.
+
 Yang Tse (16 Aug 2008)
 - Library internal only C preprocessor macros FORMAT_OFF_T and FORMAT_OFF_TU
   remain in use as internal curl_off_t print formatting strings for the internal

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index b52ac01284221022fddf1eb4a58ce927677dda31..a7b6f00dcf847579b0e841e20d02d61d196b0d11 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -168,7 +168,7 @@ else
 endif
 endif
 ifdef WITH_SSL
-       INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)/openssl
+       INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
        IMPORTS += GetProcessSwitchCount RunningProcess
@@ -517,6 +517,7 @@ ifdef WITH_ZLIB
 endif
 ifdef WITH_SSL
        @echo $(DL)#define USE_SSLEAY 1$(DL) >> $@
+       @echo $(DL)#define USE_OPENSSL 1$(DL) >> $@
        @echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_OPENSSL_RSA_H 1$(DL) >> $@

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 47a7cada98cc24ae135ce8142826332e48453e75..b8ff8b7c3b427cfbf4e1df3e318f80c0e90a262e 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -167,6 +167,7 @@ else
 endif
 endif
 ifdef WITH_SSL
+       INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
        IMPORTS += GetProcessSwitchCount RunningProcess
@@ -504,6 +505,7 @@ ifdef WITH_ZLIB
 endif
 ifdef WITH_SSL
        @echo $(DL)#define USE_SSLEAY 1$(DL) >> $@
+       @echo $(DL)#define USE_OPENSSL 1$(DL) >> $@
        @echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_OPENSSL_RSA_H 1$(DL) >> $@