emacs-jabber configure.ac,1.8,1.9 NEWS,1.70,1.71 Makefile.am,1.8,1.9

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22140

Modified Files:
	configure.ac NEWS Makefile.am 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-612
Creator:  Magnus Henoch <ma...@fr...>

Install GConf schema for XMPP URI handler


Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- NEWS	5 Oct 2008 00:03:52 -0000	1.70
+++ NEWS	23 Oct 2008 01:23:49 -0000	1.71
@@ -51,6 +51,9 @@
 ** Gmail notifications
 (Not documented nor autoloaded)
 
+** GConf-based installation of URI handler
+(Not documented yet)
+
 * New features in jabber.el 0.7.1
 
 ** STARTTLS

Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	30 Sep 2008 12:02:51 -0000	1.8
+++ configure.ac	23 Oct 2008 01:23:49 -0000	1.9
@@ -12,5 +12,10 @@
 AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno])
 AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno])
 
-AC_CONFIG_FILES([Makefile tests/Makefile jabber-ourversion.el])
+dnl GConf schemas, for registering our URL handler
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+AM_CONDITIONAL(USE_GCONFTOOL, test "x$GCONFTOOL" != "xno")
+AM_GCONF_SOURCE_2
+
+AC_CONFIG_FILES([Makefile tests/Makefile gconf/Makefile jabber-ourversion.el])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	17 Jun 2008 14:51:04 -0000	1.8
+++ Makefile.am	23 Oct 2008 01:23:49 -0000	1.9
@@ -54,6 +54,11 @@
 dist_libexec_SCRIPTS = xmppuri.sh
 
 SUBDIRS = . tests
+if USE_GCONFTOOL
+if GCONF_SCHEMAS_INSTALL
+SUBDIRS += gconf
+endif
+endif
 
 # Package everything in a form suitable for ELPA.  That is, use
 # "jabber" instead of "emacs-jabber" as base name.