1 Description: Build with NSS.
4 Author: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
5 Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
6 Last-Update: 2015-08-12
8 --- a/docs/examples/Makefile.am
9 +++ b/docs/examples/Makefile.am
13 if USE_EXPLICIT_LIB_DEPS
14 -LDADD = $(LIBDIR)/libcurl-gnutls.la @LIBCURL_LIBS@
15 +LDADD = $(LIBDIR)/libcurl-nss.la @LIBCURL_LIBS@
17 -LDADD = $(LIBDIR)/libcurl-gnutls.la
18 +LDADD = $(LIBDIR)/libcurl-nss.la
21 # Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
25 firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \
26 objnames-test08.sh objnames-test10.sh objnames.inc
28 -lib_LTLIBRARIES = libcurl-gnutls.la
29 +lib_LTLIBRARIES = libcurl-nss.la
32 noinst_LTLIBRARIES = libcurlu.la
37 -libcurl_gnutls_la_CPPFLAGS_EXTRA =
38 -libcurl_gnutls_la_LDFLAGS_EXTRA =
39 -libcurl_gnutls_la_CFLAGS_EXTRA =
40 +libcurl_nss_la_CPPFLAGS_EXTRA =
41 +libcurl_nss_la_LDFLAGS_EXTRA =
42 +libcurl_nss_la_CFLAGS_EXTRA =
45 -libcurl_gnutls_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
46 -libcurl_gnutls_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
47 +libcurl_nss_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
48 +libcurl_nss_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
50 if CURL_LT_SHLIB_USE_VERSION_INFO
51 -libcurl_gnutls_la_LDFLAGS_EXTRA += $(VERSIONINFO)
52 +libcurl_nss_la_LDFLAGS_EXTRA += $(VERSIONINFO)
55 if CURL_LT_SHLIB_USE_NO_UNDEFINED
56 -libcurl_gnutls_la_LDFLAGS_EXTRA += -no-undefined
57 +libcurl_nss_la_LDFLAGS_EXTRA += -no-undefined
60 if CURL_LT_SHLIB_USE_MIMPURE_TEXT
61 -libcurl_gnutls_la_LDFLAGS_EXTRA += -mimpure-text
62 +libcurl_nss_la_LDFLAGS_EXTRA += -mimpure-text
65 if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS
66 -libcurl_gnutls_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers
67 +libcurl_nss_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers
70 if USE_CPPFLAG_CURL_STATICLIB
71 -libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB
72 +libcurl_nss_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB
75 if DOING_CURL_SYMBOL_HIDING
76 -libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS
77 -libcurl_gnutls_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
78 +libcurl_nss_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS
79 +libcurl_nss_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
82 -libcurl_gnutls_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_gnutls_la_CPPFLAGS_EXTRA)
83 -libcurl_gnutls_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_gnutls_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
84 -libcurl_gnutls_la_CFLAGS = $(AM_CFLAGS) $(libcurl_gnutls_la_CFLAGS_EXTRA)
85 +libcurl_nss_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_nss_la_CPPFLAGS_EXTRA)
86 +libcurl_nss_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_nss_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
87 +libcurl_nss_la_CFLAGS = $(AM_CFLAGS) $(libcurl_nss_la_CFLAGS_EXTRA)
89 libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
90 libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
92 # Makefile.inc provides the CSOURCES and HHEADERS defines
95 -libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS)
96 +libcurl_nss_la_SOURCES = $(CSOURCES) $(HHEADERS)
97 libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)
100 --- a/src/Makefile.am
101 +++ b/src/Makefile.am
103 LIBS = $(BLANK_AT_MAKETIME)
105 if USE_EXPLICIT_LIB_DEPS
106 -curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
107 +curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
109 -curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
110 +curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
113 curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
114 --- a/tests/libtest/Makefile.am
115 +++ b/tests/libtest/Makefile.am
117 LIBS = $(BLANK_AT_MAKETIME)
119 if USE_EXPLICIT_LIB_DEPS
120 -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@
121 -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@
122 +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@
123 +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@
125 -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
126 -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
127 +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
128 +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
131 # Dependencies (may need to be overridden)