[Commits] PATCHSETS 1.83 1.84 ChangeLog 1.83 1.84 configure.ac 1.84 1.85

[miras at claws-mail.org]

Update of /home/claws-mail/contacts
In directory srv:/tmp/cvs-serv31357

Modified Files:
	PATCHSETS ChangeLog configure.ac 
Log Message:
2012-04-07 [mir]	0.6.0cvs84

	* plugins/xml/xml-plugin.c
	    If no old address books are found stop
	    import process immediately.

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/contacts/configure.ac,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- configure.ac	1 Apr 2012 18:24:04 -0000	1.84
+++ configure.ac	7 Apr 2012 15:31:11 -0000	1.85
@@ -11,7 +11,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=83
+EXTRA_VERSION=84
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -180,8 +180,14 @@
 	[ac_cv_enable_xml_plugin=$enableval], [ac_cv_enable_xml_plugin=yes])
 if test x"$ac_cv_enable_xml_plugin" = xyes; then
 	AC_MSG_RESULT(yes)
-	PLUGINS="xml $PLUGINS"
-	AC_DEFINE(BUILD_XML_PLUGIN, 1, [Is the xml plugin built])
+	AC_CHECK_PROG(ac_cv_have_yacc, yacc, yes, no)
+	if test x"$ac_cv_have_yacc" = xyes; then
+	    PLUGINS="xml $PLUGINS"
+	    AC_DEFINE(BUILD_XML_PLUGIN, 1, [Is the xml plugin built])
+	else
+	    ac_cv_enable_xml_plugin="no"
+	    AC_MSG_ERROR("Executable 'yacc' was not found. Install package byacc or disable building of the XML plugin")
+	fi
 else
 	AC_MSG_RESULT(no)
 fi

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/contacts/PATCHSETS,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- PATCHSETS	1 Apr 2012 18:24:04 -0000	1.83
+++ PATCHSETS	7 Apr 2012 15:31:11 -0000	1.84
@@ -81,3 +81,4 @@
 ( cvs diff -u -r 1.1 -r 1.2 README;  cvs diff -u -r 1.2 -r 1.3 TODO;  ) > 0.6.0cvs81.patchset
 ( cvs diff -u -r 1.3 -r 1.4 src/dbus/dbus-service.c;  ) > 0.6.0cvs82.patchset
 ( cvs diff -u -r 1.83 -r 1.84 configure.ac;  cvs diff -u -r 1.19 -r 1.20 src/callbacks.c;  ) > 0.6.0cvs83.patchset
+( cvs diff -u -r 1.11 -r 1.12 plugins/xml/xml-plugin.c;  ) > 0.6.0cvs84.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/contacts/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	1 Apr 2012 18:24:04 -0000	1.83
+++ ChangeLog	7 Apr 2012 15:31:11 -0000	1.84
@@ -1,3 +1,9 @@
+2012-04-07 [mir]	0.6.0cvs84
+
+	* plugins/xml/xml-plugin.c
+	    If no old address books are found stop
+	    import process immediately.
+
 2012-04-01 [colin]	0.6.0cvs83
 
 	* configure.ac