CVS: sylpheedclaws/sylpheed-claws/m4 aclocal-include.m4,1.1.4.1,1.1.4.1.12.1 check-type.m4,1.1.4.1,1.1.4.1.12.1

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/m4
In directory sunsite.dk:/tmp/cvs-serv28725/m4

Modified Files:
      Tag: stable_2_6
	aclocal-include.m4 check-type.m4 
Log Message:
2006-12-04 [paul]	2.6.0cvs25-stable

	* ChangeLog
	* Makefile.am
	* configure.ac
	* m4/aclocal-include.m4
	* m4/check-type.m4
	* src/Makefile.am
	* src/addr_compl.c
	* src/compose.c
	* src/crash.c
	* src/export.c
	* src/exporthtml.c
	* src/exportldif.c
	* src/imap.c
	* src/import.c
	* src/main.c
	* src/main.h
	* src/matcher.c
	* src/mimeview.c
	* src/procmsg.c
	* src/common/Makefile.am
	* src/common/claws.c
	* src/common/claws.h
	* src/common/ssl.c
	* src/common/sylpheed.c
	* src/common/sylpheed.h
	* src/etpan/Makefile.am
	* src/gtk/Makefile.am
	* src/gtk/claws-marshal.list
	* src/gtk/filesel.c
	* src/gtk/gtksctree.c
	* src/gtk/quicksearch.c
	* src/gtk/sylpheed-marshal.list
	* src/plugins/bogofilter/bogofilter.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/clamav/clamav_plugin.c
	* src/plugins/clamav/clamav_plugin_gtk.c
	* src/plugins/demo/demo.c
	* src/plugins/dillo_viewer/dillo_viewer.c
	* src/plugins/pgpcore/Makefile.am
	* src/plugins/pgpcore/claws.def
	* src/plugins/pgpcore/pgp_viewer.c
	* src/plugins/pgpcore/plugin.c
	* src/plugins/pgpcore/sylpheed.def
	* src/plugins/pgpinline/Makefile.am
	* src/plugins/pgpinline/claws.def
	* src/plugins/pgpinline/plugin.c
	* src/plugins/pgpinline/sylpheed.def
	* src/plugins/pgpmime/Makefile.am
	* src/plugins/pgpmime/claws.def
	* src/plugins/pgpmime/plugin.c
	* src/plugins/pgpmime/sylpheed.def
	* src/plugins/spamassassin/spamassassin.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
		backport from 2.6.0cvs64:
		yet more renaming 

Index: aclocal-include.m4
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/m4/aclocal-include.m4,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.12.1
diff -u -d -r1.1.4.1 -r1.1.4.1.12.1
--- aclocal-include.m4	2004/05/05 08:46:03	1.1.4.1
+++ aclocal-include.m4	2006/12/04 14:21:47	1.1.4.1.12.1
@@ -3,8 +3,8 @@
 # This macro adds the name macrodir to the set of directories
 # that `aclocal' searches for macros.
 
-dnl SYLPHEED_ACLOCAL_INCLUDE(macrodir)
-AC_DEFUN([SYLPHEED_ACLOCAL_INCLUDE],
+dnl CLAWS_ACLOCAL_INCLUDE(macrodir)
+AC_DEFUN([CLAWS_ACLOCAL_INCLUDE],
 [
 	test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 

Index: check-type.m4
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/m4/check-type.m4,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.12.1
diff -u -d -r1.1.4.1 -r1.1.4.1.12.1
--- check-type.m4	2004/05/05 08:46:03	1.1.4.1
+++ check-type.m4	2006/12/04 14:21:47	1.1.4.1.12.1
@@ -1,14 +1,14 @@
-dnl SYLPHEED_CHECK_TYPE(TYPE, DEFAULT [, INCLUDES, COMMENT])
+dnl CLAWS_CHECK_TYPE(TYPE, DEFAULT [, INCLUDES, COMMENT])
 dnl
 dnl Like AC_CHECK_TYPE, but in addition to `sys/types.h', `stdlib.h' and
 dnl `stddef.h' checks files included by INCLUDES, which should be a
 dnl series of #include statements.  If TYPE is not defined, define it
 dnl to DEFAULT.
 dnl
-AC_DEFUN([SYLPHEED_CHECK_TYPE],
+AC_DEFUN([CLAWS_CHECK_TYPE],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(sylpheed_cv_type_$1,
+AC_CACHE_VAL(claws_cv_type_$1,
 [AC_TRY_COMPILE([
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -19,9 +19,9 @@
 ], [
 #undef $1
 int a = sizeof($1);
-], sylpheed_cv_type_$1=yes, sylpheed_cv_type_$1=no)])dnl
-AC_MSG_RESULT($sylpheed_cv_type_$1)
-if test $sylpheed_cv_type_$1 = no; then
+], claws_cv_type_$1=yes, claws_cv_type_$1=no)])dnl
+AC_MSG_RESULT($claws_cv_type_$1)
+if test $claws_cv_type_$1 = no; then
   AC_DEFINE($1, $2, $4)
 fi
 ])