[Commits] PATCHSETS 1.35 1.36 ChangeLog 1.35 1.36 configure.ac 1.36 1.37

miras at claws-mail.org miras at claws-mail.org
Sat Dec 3 22:18:40 CET 2011 

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

Modified Files:
	PATCHSETS ChangeLog configure.ac 
Log Message:
2011-12-03 [mir]	0.6.0cvs36

	* plugins/example/AUTHORS
	* plugins/example/ChangeLog
	* plugins/example/Makefile.am
	* plugins/example/NEWS
	* plugins/example/README
	* plugins/example/TODO
	* plugins/example/configure.ac
	* plugins/example/example-plugin.c
	* plugins/example/src/Makefile.am
	* plugins/example/src/example-plugin.c
	* extensions/Makefile.am
	* extensions/example/AUTHORS
	* extensions/example/ChangeLog
	* extensions/example/Makefile.am
	* extensions/example/NEWS
	* extensions/example/README
	* extensions/example/TODO
	* extensions/example/configure.ac
	* extensions/example/config/Makefile.am
	* extensions/example/src/Makefile.am
	* extensions/example/src/example-extension.c
	* extensions/export/Makefile.am
	* extensions/export/ldifexport_extension.c
	* extensions/import/Makefile.am
	    Refactored extensions and plugins.

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/contacts/configure.ac,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- configure.ac	3 Dec 2011 15:21:32 -0000	1.36
+++ configure.ac	3 Dec 2011 21:18:37 -0000	1.37
@@ -2,7 +2,6 @@
 AC_INIT(src/claws-contacts.c)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SUBDIRS(extentions)
 AC_COPYRIGHT([Copyright (c) 2011 Michael Rasmussen.])
 PACKAGE=claws-contacts
 
@@ -12,7 +11,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -148,6 +147,19 @@
 fi
 AC_DEFINE_UNQUOTED(DEBUG, $DEBUG_MODE, [Activate debug mode in source])
 
+dnl --- Example extension ---
+AC_MSG_CHECKING([whether to build example extension])
+AC_ARG_ENABLE(example-extension,
+	[AC_HELP_STRING([--enable-example-extension],[build example extension [default=no]])],
+	[ac_cv_enable_example_extension=$enableval], [ac_cv_enable_example_extension=no])
+if test x"$ac_cv_enable_example_extension" = xyes; then
+	AC_MSG_RESULT(yes)
+	AC_CONFIG_SUBDIRS(extensions/example)
+else
+	AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_EXAMPLE_EXTENSION, test x"$ac_cv_enable_example_extension" = xyes)
+
 PLUGINS=""
 dnl --- Example plugin ---
 AC_MSG_CHECKING([whether to build example plugin])
@@ -156,7 +168,7 @@
 	[ac_cv_enable_example_plugin=$enableval], [ac_cv_enable_example_plugin=no])
 if test x"$ac_cv_enable_example_plugin" = xyes; then
 	AC_MSG_RESULT(yes)
-	PLUGINS="example $PLUGINS"
+	AC_CONFIG_SUBDIRS(plugins/example)
 else
 	AC_MSG_RESULT(no)
 fi
@@ -250,13 +262,13 @@
 		 		 src/dbus/Makefile
 		 		 dbus-client/Makefile
                  xmllib/Makefile
+				 extensions/Makefile
+				 extensions/export/Makefile
+				 extensions/import/Makefile
                  plugins/Makefile
                  plugins/example/Makefile
                  plugins/xml/Makefile
                  plugins/ldap/Makefile
-				 extensions/Makefile
-				 extensions/import/Makefile
-				 extensions/export/Makefile
 ])
 
 AC_OUTPUT
@@ -268,6 +280,7 @@
         Source code:\t${srcdir}
         Compiler:\t${CC} $($CC -dumpversion)
         CFLAGS:\t\t${CFLAGS}
+        Extension dir:\t${EXTENSIONDIR}
         Plugins:\t${PLUGINS}
         Plugin dir:\t${PLUGINDIR}
         Debug mode:\t${DEBUG_MODE}

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/contacts/PATCHSETS,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- PATCHSETS	3 Dec 2011 15:21:32 -0000	1.35
+++ PATCHSETS	3 Dec 2011 21:18:37 -0000	1.36
@@ -33,3 +33,4 @@
 ( cvs diff -u -r 1.10 -r 1.11 src/contactwindow.c;  ) > 0.6.0cvs33.patchset
 ( cvs diff -u -r 1.2 -r 1.3 Makefile.am;  cvs diff -u -r 1.1 -r 1.2 TODO;  cvs diff -u -r 1.34 -r 1.35 configure.ac;  diff -u /dev/null extensions/.cvsignore;  diff -u /dev/null extensions/Makefile.am;  diff -u /dev/null extensions/export/.cvsignore;  diff -u /dev/null extensions/export/Makefile.am;  diff -u /dev/null extensions/export/ldifexport_extension.c;  diff -u /dev/null extensions/import/.cvsignore;  diff -u /dev/null extensions/import/Makefile.am;  diff -u /dev/null extensions/import/ldifimport_extension.c;  cvs diff -u -r 1.2 -r 1.3 src/Makefile.am;  cvs diff -u -r 1.2 -r 1.3 src/claws-contacts.c;  diff -u /dev/null src/extension-loader.c;  diff -u /dev/null src/extension-loader.h;  diff -u /dev/null src/extension.c;  diff -u /dev/null src/extension.h;  cvs diff -u -r 1.4 -r 1.5 src/mainwindow.c;  cvs diff -u -r 1.2 -r 1.3 src/mainwindow.h;  ) > 0.6.0cvs34.patchset
 ( cvs diff -u -r 1.2 -r 1.3 commitHelper;  ) > 0.6.0cvs35.patchset
+( diff -u /dev/null plugins/example/AUTHORS;  diff -u /dev/null plugins/example/ChangeLog;  cvs diff -u -r 1.1 -r 1.2 plugins/example/Makefile.am;  diff -u /dev/null plugins/example/NEWS;  diff -u /dev/null plugins/example/README;  diff -u /dev/null plugins/example/TODO;  diff -u /dev/null plugins/example/configure.ac;  cvs diff -u -r -1.6 -r -1.7 plugins/example/example-plugin.c;  diff -u /dev/null plugins/example/src/Makefile.am;  diff -u /dev/null plugins/example/src/example-plugin.c;  cvs diff -u -r 1.1 -r 1.2 extensions/Makefile.am;  diff -u /dev/null extensions/example/AUTHORS;  diff -u /dev/null extensions/example/ChangeLog;  diff -u /dev/null extensions/example/Makefile.am;  diff -u /dev/null extensions/example/NEWS;  diff -u /dev/null extensions/example/README;  diff -u /dev/null extensions/example/TODO;  diff -u /dev/null extensions/example/configure.ac;  diff -u /dev/null extensions/example/config/Makefile.am;  diff -u /dev/null extensions/example/src/Makefile.am;  diff -u /dev/null extensions/example/src/example-extension.c;  cvs diff -u -r 1.1 -r 1.2 extensions/export/Makefile.am;  cvs diff -u -r 1.1 -r 1.2 extensions/export/ldifexport_extension.c;  cvs diff -u -r 1.1 -r 1.2 extensions/import/Makefile.am;  ) > 0.6.0cvs36.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/contacts/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ChangeLog	3 Dec 2011 15:21:32 -0000	1.35
+++ ChangeLog	3 Dec 2011 21:18:37 -0000	1.36
@@ -1,3 +1,31 @@
+2011-12-03 [mir]	0.6.0cvs36
+
+	* plugins/example/AUTHORS
+	* plugins/example/ChangeLog
+	* plugins/example/Makefile.am
+	* plugins/example/NEWS
+	* plugins/example/README
+	* plugins/example/TODO
+	* plugins/example/configure.ac
+	* plugins/example/example-plugin.c
+	* plugins/example/src/Makefile.am
+	* plugins/example/src/example-plugin.c
+	* extensions/Makefile.am
+	* extensions/example/AUTHORS
+	* extensions/example/ChangeLog
+	* extensions/example/Makefile.am
+	* extensions/example/NEWS
+	* extensions/example/README
+	* extensions/example/TODO
+	* extensions/example/configure.ac
+	* extensions/example/config/Makefile.am
+	* extensions/example/src/Makefile.am
+	* extensions/example/src/example-extension.c
+	* extensions/export/Makefile.am
+	* extensions/export/ldifexport_extension.c
+	* extensions/import/Makefile.am
+	    Refactored extensions and plugins.
+
 2011-12-03 [mir]	0.6.0cvs35
 
 	* commitHelper

More information about the Commits mailing list