# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1062718408 0
# Node ID 82348b5ab87ec0e681393e2b2d5366c667771214
# Parent  c45c90c8ce8a0ff473da94bed0541ff35078e2db
[gaim-migrate @ 7279]
Waaahhh, I'm automake. I don't want to include a conditional variable in my
list of sources. That would be too much work for me, so I'll complain
instead! Poor me!

committer: Tailor Script <tailor@pidgin.im>

diff -r c45c90c8ce8a -r 82348b5ab87e src/Makefile.am
--- a/src/Makefile.am	Thu Sep 04 23:31:53 2003 +0000
+++ b/src/Makefile.am	Thu Sep 04 23:33:28 2003 +0000
@@ -45,14 +45,6 @@
 
 SUBDIRS = protocols
 
-if USE_NSS
-SSLSOURCES = ssl-nss.c
-endif
-
-if USE_GNUTLS
-SSLSOURCES = ssl-gnutls.c
-endif
-
 CORESOURCES = \
 	$(SSLSOURCES) \
 	account.c \
@@ -100,6 +92,8 @@
 	status.h \
 	sound.c \
 	sound.h \
+	ssl-gnutls.c \
+	ssl-nss.c \
 	sslconn.c \
 	sslconn.h \
 	util.c \
diff -r c45c90c8ce8a -r 82348b5ab87e src/ssl-gnutls.c
--- a/src/ssl-gnutls.c	Thu Sep 04 23:31:53 2003 +0000
+++ b/src/ssl-gnutls.c	Thu Sep 04 23:33:28 2003 +0000
@@ -20,6 +20,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
+
+#ifdef HAVE_GNUTLS
+
 #include "debug.h"
 #include "sslconn.h"
 
@@ -147,3 +151,5 @@
 {
 	return &ssl_ops;
 }
+
+#endif /* HAVE_GNUTLS */
diff -r c45c90c8ce8a -r 82348b5ab87e src/ssl-nss.c
--- a/src/ssl-nss.c	Thu Sep 04 23:31:53 2003 +0000
+++ b/src/ssl-nss.c	Thu Sep 04 23:33:28 2003 +0000
@@ -20,6 +20,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
+
+#ifdef HAVE_NSS
+
 #include "debug.h"
 #include "sslconn.h"
 
@@ -271,3 +275,5 @@
 {
 	return &ssl_ops;
 }
+
+#endif /* HAVE_NSS */