# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 977234886 0
# Node ID 5ad8344b6e500389c79bfe5487c35870901f0f15
# Parent  9089f72972eebc32a75c11b00106ccb0232f39b3
[gaim-migrate @ 1324]
more changes to whether jabber is compiled or not

committer: Tailor Script <tailor@pidgin.im>

diff -r 9089f72972ee -r 5ad8344b6e50 ChangeLog
--- a/ChangeLog	Tue Dec 19 13:55:13 2000 +0000
+++ b/ChangeLog	Tue Dec 19 14:08:06 2000 +0000
@@ -4,7 +4,8 @@
 	* ICQ upgraded to use icqlib 1.1.0
 	* An enormous amount of bug fixes
 	* Even More Protocol Plugins:
-		Jabber (plugins/jabber) [CVS - currently disabled]
+		Jabber (plugins/jabber) [currently requires libxode and
+					 libjabber, which aren't provided]
 
 version 0.11.0-pre3 (12/15/2000):
 	* Away messages arranged alphabetically (Thanks Justin)
diff -r 9089f72972ee -r 5ad8344b6e50 configure.in
--- a/configure.in	Tue Dec 19 13:55:13 2000 +0000
+++ b/configure.in	Tue Dec 19 14:08:06 2000 +0000
@@ -47,7 +47,7 @@
 AC_ARG_ENABLE(esd,     [  --disable-esd           Turn off ESD (default=auto)],,enable_esd=yes)
 AC_ARG_ENABLE(nas,     [  --enable-nas            Enable NAS (Network Audio System) support],,enable_nas=no)
 AC_ARG_ENABLE(plugins, [  --disable-plugins       compile without plugin support],,enable_plugins=yes)
-AC_ARG_ENABLE(jabber,  [  --enable-jabber         compile the jabber plugin (requires libxode and libjabber)],,enable_jabber=no)
+AC_ARG_ENABLE(jabber,  [  --disable-jabber         compile the jabber plugin (requires libxode and libjabber)],,enable_jabber=yes)
 AC_ARG_ENABLE(perl,    [  --disable-perl          compile without perl scripting],,enable_perl=yes)
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver   compile without X screensaver extension],,enable_xss=yes)
@@ -195,6 +195,8 @@
 fi
 
 if test "$enable_jabber" = yes ; then
+	AC_CHECK_LIB(xode, XML_ParserCreate, , enable_jabber=no)
+	AC_CHECK_LIB(jabber, jid_new, , enable_jabber=no, -lxode)
 	AC_CHECK_FUNCS(snprintf)
 	AC_CHECK_LIB(nsl, gethostent)
 	AC_CHECK_FUNCS(connect)
@@ -233,8 +235,8 @@
 echo Build with Plugin support.. : $enable_plugins
 echo Build with Perl support.... : $enable_perl
 echo
-#echo Build Jabber PRPL.......... : $enable_jabber
-#echo
+echo Build Jabber PRPL.......... : $enable_jabber
+echo
 echo Build with ESD............. : $enable_esd
 echo Build with NAS............. : $enable_nas
 echo