libpurple: Remove now unused GnuTLS and NSS references

7 files changed, 5 insertions, 120 deletions

diff --git a/configure.ac b/configure.ac
index a3caa79d6e..ad791abe58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1865,105 +1865,6 @@ if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
 fi
 AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_CERTIFICATES_DIR" = "x")
 
-dnl These two are inverses of each other <-- stolen from evolution!
-
-AC_ARG_ENABLE(gnutls,
-	[  --enable-gnutls=[yes,no]  attempt to use GnuTLS for SSL support [default=yes]],
-	[enable_gnutls="$enableval"],
-	[enable_gnutls="yes"])
-
-AC_ARG_ENABLE(nss,
-	[  --enable-nss=[yes,no,static]    attempt to use Mozilla libnss for SSL support [default=yes]],
-	[enable_nss="$enableval"],
-	[enable_nss="yes"])
-
-msg_ssl="None. Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
-looked_for_gnutls="no"
-dnl #
-dnl # Check for GnuTLS if it isn't disabled
-dnl #
-if test "x$enable_gnutls" != "xno"; then
-	looked_for_gnutls="yes"
-
-	if `$PKG_CONFIG --exists gnutls`; then
-		dnl # minimum required version should almost certainly be higher
-		PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.10], [
-			have_gnutls="yes"
-		], [
-			AC_MSG_RESULT(no)
-			have_gnutls="no"
-		])
-	fi
-
-	if test "x$have_gnutls" = "xyes"; then
-		AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS])
-		msg_gnutls="GnuTLS"
-	fi
-fi
-
-AM_CONDITIONAL(USE_GNUTLS, test "x$have_gnutls" = "xyes")
-
-
-dnl #
-dnl # Check for NSS if it isn't disabled
-dnl #
-looked_for_nss="no"
-if test "x$enable_nss" != "xno"; then
-	looked_for_nss="yes"
-
-	if `$PKG_CONFIG --exists mozilla-nss`; then
-		dnl # TODO: set required minimum version
-		PKG_CHECK_MODULES(NSS, mozilla-nss, [
-			have_nss="yes"
-		], [
-			AC_MSG_RESULT(no)
-			have_nss="no"
-		])
-	elif `$PKG_CONFIG --exists nss`; then
-		dnl # TODO: set required minimum version
-		PKG_CHECK_MODULES(NSS, nss, [
-			have_nss="yes"
-		], [
-			AC_MSG_RESULT(no)
-			have_nss="no"
-		])
-	fi
-
-	if test "x$have_nss" = "xyes"; then
-		AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS])
-		msg_nss="Mozilla NSS"
-	fi
-fi
-
-AM_CONDITIONAL(USE_NSS, test "x$have_nss" = "xyes")
-
-
-if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
-	msg_ssl="$msg_nss and $msg_gnutls"
-elif test "x$msg_nss" != "x"; then
-	msg_ssl=$msg_nss
-elif test "x$msg_gnutls" != "x"; then
-	msg_ssl=$msg_gnutls
-elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
-	AC_MSG_ERROR([
-Neither GnuTLS or NSS SSL development headers found.
-Use --disable-nss --disable-gnutls if you do not need SSL support.
-Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
-])
-elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
-	AC_MSG_ERROR([
-GnuTLS SSL development headers not found.
-Use --disable-gnutls if you do not need SSL support.
-Novell Groupwise and Google Talk will not work without SSL support.
-])
-elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
-	AC_MSG_ERROR([
-NSS SSL development headers not found.
-Use --disable-nss if you do not need SSL support.
-Novell Groupwise and Google Talk will not work without SSL support.
-])
-fi
-
 if test "$ac_cv_cygwin" = yes ; then
 	LDADD="$LDADD -static"
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
@@ -2257,7 +2158,6 @@ if test "x$enable_dbus" = "xyes" ; then
 	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
 fi
 echo Build with GNU Libidn......... : $enable_idn
-echo SSL Library/Libraries......... : $msg_ssl
 if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
 	eval eval echo SSL CA certificates directory. : $SSL_CERTIFICATES_DIR
 fi
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
index c85113820d..359ed3400e 100644
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -135,8 +135,6 @@ GTKDOC_CFLAGS = \
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(NSS_CFLAGS) \
 	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
@@ -155,8 +153,6 @@ GTKDOC_LIBS = \
 	$(GSTINTERFACES_LIBS) \
 	$(IDN_LIBS) \
 	$(JSON_LIBS) \
-	$(GNUTLS_LIBS) \
-	$(NSS_LIBS) \
 	$(ZLIB_LIBS) \
 	$(INTROSPECTION_LIBS) \
 	-lm
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
index 3503d73a1e..a853071098 100644
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -445,8 +445,6 @@ libpurple_la_LIBADD = \
 	$(GSTINTERFACES_LIBS) \
 	$(IDN_LIBS) \
 	$(JSON_LIBS) \
-	$(GNUTLS_LIBS) \
-	$(NSS_LIBS) \
 	$(ZLIB_LIBS) \
 	$(INTROSPECTION_LIBS) \
 	-lm
@@ -465,8 +463,6 @@ AM_CPPFLAGS = \
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(NSS_CFLAGS) \
 	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
@@ -507,8 +503,6 @@ Purple_3_0_gir_CFLAGS = \
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
 	$(JSON_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(NSS_CFLAGS) \
 	$(ZLIB_CFLAGS) \
 	$(INTROSPECTION_CFLAGS)
 
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
index fa009c5ad8..aa9f5f489a 100644
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -120,11 +120,9 @@ AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GPLUGIN_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(NSS_CFLAGS)
+	$(DBUS_CFLAGS)
 
-PLUGIN_LIBS = \
-	$(NSS_LIBS)
+PLUGIN_LIBS =
 
 #
 # This part allows people to build their own plugins in here.
diff --git a/libpurple/protocols/jabber/tests/Makefile.am b/libpurple/protocols/jabber/tests/Makefile.am
index b80b9d123a..9c27452dad 100644
--- a/libpurple/protocols/jabber/tests/Makefile.am
+++ b/libpurple/protocols/jabber/tests/Makefile.am
@@ -33,5 +33,4 @@ AM_CPPFLAGS = \
 	$(GPLUGIN_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(LIBXML_CFLAGS) \
-	$(NSS_CFLAGS)
+	$(LIBXML_CFLAGS)
diff --git a/libpurple/protocols/oscar/tests/Makefile.am b/libpurple/protocols/oscar/tests/Makefile.am
index 55bd659569..cc6dec34a8 100644
--- a/libpurple/protocols/oscar/tests/Makefile.am
+++ b/libpurple/protocols/oscar/tests/Makefile.am
@@ -19,5 +19,4 @@ AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GPLUGIN_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(NSS_CFLAGS)
+	$(DBUS_CFLAGS)
diff --git a/libpurple/tests/Makefile.am b/libpurple/tests/Makefile.am
index bc7aaf5848..8475a79ea5 100644
--- a/libpurple/tests/Makefile.am
+++ b/libpurple/tests/Makefile.am
@@ -35,8 +35,7 @@ AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GPLUGIN_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(NSS_CFLAGS)
+	$(DBUS_CFLAGS)
 
 EXTRA_DIST += \
 	data/test-image.png