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

colin at claws-mail.org colin at claws-mail.org
Sun Apr 1 20:24:07 CEST 2012


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

Modified Files:
	configure.ac PATCHSETS ChangeLog 
Log Message:
2012-04-01 [colin]	0.6.0cvs83

	* configure.ac
	* src/callbacks.c
		Make things easier for new users migrating from old 
		Claws Mail's addressbook : build (and load by default)
		both XML and LDAP plugins

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/contacts/configure.ac,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- configure.ac	31 Mar 2012 02:20:22 -0000	1.83
+++ configure.ac	1 Apr 2012 18:24:04 -0000	1.84
@@ -11,7 +11,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=82
+EXTRA_VERSION=83
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -37,28 +37,17 @@
 AC_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
 
-if test "x$USE_MAINTAINER_MODE" = "xyes"; then
-    CFLAGS="-g -Wall -Werror"
-    BINDIR="${ac_pwd}/src"
-    AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR", [Where is binary installed])
-    AC_DEFINE_UNQUOTED(PIXDIR, "${ac_pwd}/pixmaps", [Directory with various pixmaps])
-    PLUGINDIR="${ac_pwd}/plugins"
-    CLAWS_CONTACTS_EXTENSIONDIR="${ac_pwd}/extensions"
-    AC_DEFINE_UNQUOTED(CLAWS_CONTACTS_EXTENSIONDIR, "$CLAWS_CONTACTS_EXTENSIONDIR", [Where is extensions located])
-    AC_DEFINE_UNQUOTED(EXTENSIONSUBDIR, 1, [is extensions located in subdirs])
-else
-    if test "x$prefix" = "xNONE"; then
+if test "x$prefix" = "xNONE"; then
 	prefix=$ac_default_prefix
-    fi
-    CFLAGS="-g -Wall -O -O2 -Wno-unused-variable -Wno-uninitialized"
-    BINDIR="${prefix}/bin"
-    AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR", [Where is binary installed])
-    AC_DEFINE_UNQUOTED(PIXDIR, "${prefix}/share/claws-contacts/pixmaps", [Directory with various pixmaps])
-    PLUGINDIR="${prefix}/lib/claws-contacts/plugins"
-    CLAWS_CONTACTS_EXTENSIONDIR="${prefix}/lib/claws-contacts/extensions"
-    AC_DEFINE_UNQUOTED(CLAWS_CONTACTS_EXTENSIONDIR, "$CLAWS_CONTACTS_EXTENSIONDIR", [Where is extensions located])
-    AC_DEFINE_UNQUOTED(EXTENSIONSUBDIR, 0, [is extensions located in subdirs])
 fi
+CFLAGS="-g -Wall -O -O2 -Wno-unused-variable -Wno-uninitialized"
+BINDIR="${prefix}/bin"
+AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR", [Where is binary installed])
+AC_DEFINE_UNQUOTED(PIXDIR, "${prefix}/share/claws-contacts/pixmaps", [Directory with various pixmaps])
+PLUGINDIR="${prefix}/lib/claws-contacts/plugins"
+CLAWS_CONTACTS_EXTENSIONDIR="${prefix}/lib/claws-contacts/extensions"
+AC_DEFINE_UNQUOTED(CLAWS_CONTACTS_EXTENSIONDIR, "$CLAWS_CONTACTS_EXTENSIONDIR", [Where is extensions located])
+AC_DEFINE_UNQUOTED(EXTENSIONSUBDIR, 0, [is extensions located in subdirs])
 CLAWS_CONTACTS_CFLAGS="-I${ac_pwd}/src -I${ac_pwd}/src/dbus"
 
 AC_SUBST(CLAWS_CONTACTS_CFLAGS)
@@ -192,6 +181,7 @@
 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])
 else
 	AC_MSG_RESULT(no)
 fi
@@ -200,8 +190,8 @@
 dnl --- LDAP plugin ---
 AC_MSG_CHECKING([whether to build ldap plugin])
 AC_ARG_ENABLE(ldap-plugin,
-	[AC_HELP_STRING([--enable-ldap-plugin],[build ldap addressbook plugin [default=no]])],
-	[ac_cv_enable_ldap_plugin=$enableval], [ac_cv_enable_ldap_plugin=no])
+	[AC_HELP_STRING([--enable-ldap-plugin],[build ldap addressbook plugin [default=yes]])],
+	[ac_cv_enable_ldap_plugin=$enableval], [ac_cv_enable_ldap_plugin=yes])
 if test x"$ac_cv_enable_ldap_plugin" = xyes; then
 	AC_MSG_RESULT(yes)
 	AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
@@ -228,6 +218,7 @@
 	if test "$ac_cv_enable_ldap" = yes; then
 		LDAP_LIBS="$LDAP_LIBS -lldap"
 		PLUGINS="ldap $PLUGINS"
+		AC_DEFINE(BUILD_LDAP_PLUGIN, 1, [Is the ldap plugin built])
 	else
 		AC_MSG_ERROR([Open LDAP is required. See http://www.openldap.org/])
 	fi

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/contacts/PATCHSETS,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- PATCHSETS	31 Mar 2012 02:20:22 -0000	1.82
+++ PATCHSETS	1 Apr 2012 18:24:04 -0000	1.83
@@ -80,3 +80,4 @@
 ( cvs diff -u -r 1.5 -r 1.6 extensions/vcard/src/vcard-extension.c;  cvs diff -u -r 1.2 -r 1.3 libversit/Makefile.am;  cvs diff -u -r 1.1 -r 1.2 libversit/vcard-utils.c;  cvs diff -u -r 1.1 -r 1.2 libversit/vcard-utils.h;  cvs diff -u -r 1.13 -r 1.14 src/utils.c;  cvs diff -u -r 1.11 -r 1.12 src/utils.h;  cvs diff -u -r 1.1 -r 1.2 src/dbus/Makefile.am;  cvs diff -u -r 1.1 -r 1.2 src/dbus/claws-contacts.xml;  cvs diff -u -r 1.4 -r 1.5 src/dbus/server-object.c;  cvs diff -u -r 1.1 -r 1.2 src/dbus/server-object.h;  cvs diff -u -r 1.7 -r 1.8 xmllib/parser.c;  ) > 0.6.0cvs80.patchset
 ( 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

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/contacts/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ChangeLog	31 Mar 2012 02:20:22 -0000	1.82
+++ ChangeLog	1 Apr 2012 18:24:04 -0000	1.83
@@ -1,3 +1,11 @@
+2012-04-01 [colin]	0.6.0cvs83
+
+	* configure.ac
+	* src/callbacks.c
+		Make things easier for new users migrating from old 
+		Claws Mail's addressbook : build (and load by default)
+		both XML and LDAP plugins
+
 2012-03-31 [mir]	0.6.0cvs82
 
 	* src/dbus/dbus-service.c



More information about the Commits mailing list