[Commits] Makefile.am 1.2 1.3 configure.ac 1.1 1.2

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/plugins/example
In directory claws-mail:/tmp/cvs-serv2085/plugins/example

Modified Files:
	Makefile.am configure.ac 
Log Message:
2011-12-09 [mir]	0.6.0cvs38

	* claws-contacts.pc.in
	* configure.ac
	* extensions/Makefile.am
	* extensions/example/Makefile.am
	* extensions/example/configure.ac
	* extensions/example/config/Makefile.am
	* extensions/example/src/Makefile.am
	* extensions/example/src/example-extension.c
	* extensions/export/ldifexport_extension.c
	* plugins/Makefile.am
	* plugins/example/Makefile.am
	* plugins/example/configure.ac
	* src/Makefile.am
	* src/callbacks.c
	* src/contactwindow.c
	* src/extension-loader.c
	* src/extension-loader.h
	* src/extension.c
	* src/extension.h
	* src/gtk-utils.c
	* src/mainwindow.c
	* src/mainwindow.h
	    Fix a number of bugs
	    Refined the build system
	    Added a plugable extension framework 

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/contacts/plugins/example/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	3 Dec 2011 21:18:38 -0000	1.1
+++ configure.ac	9 Dec 2011 23:01:21 -0000	1.2
@@ -48,18 +48,37 @@
 AC_PROG_LIBTOOL
 
 # Checks for libraries.
-#
+dnl check if compiler pre-processor defines __FUNCTION__
+AC_MSG_CHECKING([if __FUNCTION__ is defined])
+AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+[],
+[char* cp =  __FUNCTION__])],
+[
+ AC_MSG_RESULT([yes])
+ ac_cv_HAVE_FUNCTION_DEFINED=yes
+],
+[
+ AC_MSG_RESULT([no])
+ ac_cv_HAVE_FUNCTION_DEFINED=no
+])
+
+if test "x$ac_cv_HAVE_FUNCTION_DEFINED" = "xyes"; then
+    AC_DEFINE(HAVE_FUNCTION_DEFINED, [1], [Does current compiler support __FUNCTION__])
+fi
+
 # Find pkg-config
-#
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test x$PKG_CONFIG = xno ; then
   AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
 fi
 
-#
 # Check for claws-contacts
-#
-PKG_CHECK_MODULES(CLAWS_CONTACTS, claws-contacts >= 0.6.0)
+if test "x$USE_MAINTAINER_MODE" = "xyes"; then
+    CLAWS_CONTACTS_CFLAGS="-I ../../../src -I ../../../src/dbus"
+    CLAWS_CONTACTS_LIBS=""
+else
+    PKG_CHECK_MODULES(CLAWS_CONTACTS, claws-contacts >= 0.6.0)
+fi
 AC_SUBST(CLAWS_CONTACTS_CFLAGS)
 AC_SUBST(CLAWS_CONTACTS_LIBS)
 if test -z $prefix || test "${prefix}" = "NONE" ; then
@@ -128,7 +147,6 @@
 
 AC_OUTPUT([
     Makefile
-    config/Makefile
     src/Makefile
 ])
 

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/contacts/plugins/example/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	3 Dec 2011 21:18:38 -0000	1.2
+++ Makefile.am	9 Dec 2011 23:01:21 -0000	1.3
@@ -1,4 +1,7 @@
-SUBDIRS = config src
+# $Id$
+AUTOMAKE_OPTIONS = gnu
+
+SUBDIRS = src
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -9,4 +12,4 @@
 	INSTALL \
 	NEWS \
 	README \
-	TODO
+	TODO
\ No newline at end of file