update to latest upstream

author: Waldemar Brodkorb <wbx@openadk.org> 2010-04-06 15:54:57 +0200
committer: Waldemar Brodkorb <wbx@openadk.org> 2010-04-06 15:54:57 +0200
commit: 2aa2990811a2dbdcf7e65ab04c9fda4756864121 (patch)
tree: 6c727f750fb12f20cc3df8e40a4239e613f2a344
parent: ca760844fcd08190b692a674ff387fe15c39a497 (diff)
2 files changed, 4538 insertions, 4823 deletions
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index 0496f58fb..c923305b2 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bogofilter
-PKG_VERSION:=		1.2.0
+PKG_VERSION:=		1.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4bbc9adc30d4f8e3a547f9be18a1cb74
+PKG_MD5SUM:=		a12a16d88d6d565dacf2a5e6259a3337
 PKG_DESCR:=		mail filter
 PKG_SECTION:=		mail
 PKG_DEPENDS:=		libiconv libdb
@@ -18,7 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		LIBS="-liconv"
+CONFIGURE_ENV+=		LIBS="-liconv" \
+			ac_cv_func_memcmp_working=yes
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
 			--without-libqdbm-prefix \
 			--with-included-gsl \
diff --git a/package/bogofilter/patches/autotool.patch b/package/bogofilter/patches/autotool.patch
index ebdeaf637..5f1222af1 100644
--- a/package/bogofilter/patches/autotool.patch
+++ b/package/bogofilter/patches/autotool.patch
@@ -1,9 +1,9 @@
-diff -Nur bogofilter-1.2.0.orig/aclocal.m4 bogofilter-1.2.0/aclocal.m4
---- bogofilter-1.2.0.orig/aclocal.m4	2009-02-21 21:41:46.000000000 +0100
-+++ bogofilter-1.2.0/aclocal.m4	2010-02-18 20:49:10.140857487 +0100
+diff -Nur bogofilter-1.2.1.orig/aclocal.m4 bogofilter-1.2.1/aclocal.m4
+--- bogofilter-1.2.1.orig/aclocal.m4	2009-08-01 21:00:46.000000000 +0200
++++ bogofilter-1.2.1/aclocal.m4	2010-04-02 14:08:23.291041357 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 -# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
@@ -17,8 +17,8 @@ diff -Nur bogofilter-1.2.0.orig/aclocal.m4 bogofilter-1.2.0/aclocal.m4
    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
 -[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
++[m4_warning([this file was generated for autoconf 2.64.
  You have another version of autoconf.  It may work, but is not guaranteed to.
  If you have problems, you may need to regenerate the build system entirely.
  To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -31,7 +31,7 @@ diff -Nur bogofilter-1.2.0.orig/aclocal.m4 bogofilter-1.2.0/aclocal.m4
  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
  dnl require some minimum version.  Point them to the right macro.
 -m4_if([$1], [1.10.2], [],
-+m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.11], [],
        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  ])
  
@@ -40,7 +40,7 @@ diff -Nur bogofilter-1.2.0.orig/aclocal.m4 bogofilter-1.2.0/aclocal.m4
  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -[AM_AUTOMAKE_VERSION([1.10.2])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.11])dnl
  m4_ifndef([AC_AUTOCONF_VERSION],
    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -546,9 +546,16 @@ diff -Nur bogofilter-1.2.0.orig/aclocal.m4 bogofilter-1.2.0/aclocal.m4
  # Check how to create a tarball.                            -*- Autoconf -*-
  
  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-diff -Nur bogofilter-1.2.0.orig/bogofilter.spec bogofilter-1.2.0/bogofilter.spec
---- bogofilter-1.2.0.orig/bogofilter.spec	2009-02-21 21:42:00.000000000 +0100
-+++ bogofilter-1.2.0/bogofilter.spec	1970-01-01 01:00:00.000000000 +0100
+diff -Nur bogofilter-1.2.1.orig/autogen.log bogofilter-1.2.1/autogen.log
+--- bogofilter-1.2.1.orig/autogen.log	1970-01-01 01:00:00.000000000 +0100
++++ bogofilter-1.2.1/autogen.log	2010-04-02 14:08:20.713465609 +0200
+@@ -0,0 +1,3 @@
++autoconf (GNU Autoconf) 2.64
++automake (GNU automake) 1.11
++flex 2.5.35
+diff -Nur bogofilter-1.2.1.orig/bogofilter.spec bogofilter-1.2.1/bogofilter.spec
+--- bogofilter-1.2.1.orig/bogofilter.spec	2009-08-01 21:01:04.000000000 +0200
++++ bogofilter-1.2.1/bogofilter.spec	1970-01-01 01:00:00.000000000 +0100
 @@ -1,247 +0,0 @@
 -# $Id: bogofilter.spec.in 6431 2006-01-22 03:28:21Z relson $
 -
@@ -569,7 +576,7 @@ diff -Nur bogofilter-1.2.0.orig/bogofilter.spec bogofilter-1.2.0/bogofilter.spec
 -# or place   %debugrpm 1   into your ~/.rpmmacros file.
 -
 -%define	Name		bogofilter
--%define	Version		1.2.0
+-%define	Version		1.2.1
 -%define	Release		1
 -
 -%{?bogostatic:  %define bogostatic 1}
@@ -797,19 +804,15 @@ diff -Nur bogofilter-1.2.0.orig/bogofilter.spec bogofilter-1.2.0/bogofilter.spec
 -%endif
 -
 -%changelog
-diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
---- bogofilter-1.2.0.orig/config.guess	2008-05-31 00:11:13.000000000 +0200
-+++ bogofilter-1.2.0/config.guess	2010-02-18 20:48:43.496856744 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+diff -Nur bogofilter-1.2.1.orig/config.guess bogofilter-1.2.1/config.guess
+--- bogofilter-1.2.1.orig/config.guess	2009-03-11 04:23:15.000000000 +0100
++++ bogofilter-1.2.1/config.guess	2009-05-05 10:45:31.000000000 +0200
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  #   Free Software Foundation, Inc.
  
--timestamp='2008-01-23'
-+timestamp='2009-06-10'
+-timestamp='2008-09-28'
++timestamp='2009-04-27'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@ -837,15 +840,6 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -187,7 +170,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
 @@ -341,6 +324,9 @@
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
@@ -878,35 +872,7 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
-@@ -657,7 +656,7 @@
- 	    # => hppa64-hp-hpux11.23
- 
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
--		grep __LP64__ >/dev/null
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -813,7 +812,7 @@
- 	    x86)
- 		echo i586-pc-interix${UNAME_RELEASE}
- 		exit ;;
--	    EM64T | authenticamd)
-+	    EM64T | authenticamd | genuineintel)
- 		echo x86_64-unknown-interix${UNAME_RELEASE}
- 		exit ;;
- 	    IA64)
-@@ -823,6 +822,9 @@
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -857,66 +859,43 @@
+@@ -857,31 +856,31 @@
  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  	    | grep -q __ARM_EABI__
  	then
@@ -945,49 +911,18 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
--    mips:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips
--	#undef mipsel
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
+     mips:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -904,7 +903,7 @@
+ 		s: ::g
+ 		p
+ 	    }'`"
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
--	;;
--    mips64:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     mips64:Linux:*:*)
  	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips64
--	#undef mips64el
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
-@@ -927,16 +906,16 @@
+@@ -927,16 +926,16 @@
  		s: ::g
  		p
  	    }'`"
@@ -1008,20 +943,18 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -948,41 +927,44 @@
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+@@ -949,8 +948,8 @@
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
          esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 -	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 -	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
  	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+@@ -958,34 +957,34 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1066,40 +999,30 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
  	exit ;;
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
-@@ -997,22 +979,9 @@
+@@ -1000,19 +999,17 @@
  				    p'`
          case "$ld_supported_targets" in
  	  elf32-i386)
 -		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
 +		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  		;;
--	  a.out-i386-linux)
+ 	  a.out-i386-linux)
 -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
--		exit ;;
--	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
--		exit ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ 		exit ;;
+ 	  "")
+ 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+ 		# one that does not give us useful --help.
 -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
--		exit ;;
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ 		exit ;;
  	esac
 -	# This should get integrated into the C code below, but now we hack
 -	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -1077,7 +1046,7 @@
-     i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
- 	exit ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     i*86:*DOS:*:*)
-@@ -1121,8 +1090,11 @@
+@@ -1121,8 +1118,11 @@
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1113,7 +1036,7 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
          exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
-@@ -1160,6 +1132,16 @@
+@@ -1160,6 +1160,16 @@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && { echo i486-ncr-sysv4; exit; } ;;
@@ -1130,26 +1053,7 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1172,7 +1154,7 @@
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
-@@ -1235,6 +1217,9 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-@@ -1343,6 +1328,9 @@
+@@ -1346,6 +1356,9 @@
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
@@ -1159,9 +1063,9 @@ diff -Nur bogofilter-1.2.0.orig/config.guess bogofilter-1.2.0/config.guess
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -Nur bogofilter-1.2.0.orig/config.in bogofilter-1.2.0/config.in
---- bogofilter-1.2.0.orig/config.in	2009-02-21 21:42:01.000000000 +0100
-+++ bogofilter-1.2.0/config.in	2010-02-18 20:49:43.224855052 +0100
+diff -Nur bogofilter-1.2.1.orig/config.in bogofilter-1.2.1/config.in
+--- bogofilter-1.2.1.orig/config.in	2009-08-01 21:00:50.000000000 +0200
++++ bogofilter-1.2.1/config.in	2010-04-02 14:08:25.000000000 +0200
 @@ -279,6 +279,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -1172,19 +1076,15 @@ diff -Nur bogofilter-1.2.0.orig/config.in bogofilter-1.2.0/config.in
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
---- bogofilter-1.2.0.orig/config.sub	2008-05-31 00:11:13.000000000 +0200
-+++ bogofilter-1.2.0/config.sub	2010-02-18 20:48:43.496856744 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+diff -Nur bogofilter-1.2.1.orig/config.sub bogofilter-1.2.1/config.sub
+--- bogofilter-1.2.1.orig/config.sub	2009-03-11 04:23:15.000000000 +0100
++++ bogofilter-1.2.1/config.sub	2009-05-05 10:45:31.000000000 +0200
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  #   Free Software Foundation, Inc.
  
--timestamp='2008-01-16'
-+timestamp='2009-06-11'
+-timestamp='2008-09-08'
++timestamp='2009-04-17'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@ -1196,17 +1096,7 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -152,6 +153,9 @@
- 		os=
- 		basic_machine=$1
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -244,18 +248,21 @@
+@@ -244,11 +245,12 @@
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  	| bfin \
  	| c4x | clipper \
@@ -1218,20 +1108,9 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	| ip2k | iq2000 \
 +	| lm32 \
  	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore | mep \
-+	| maxq | mb | microblaze | mcore | mep | metag \
+ 	| maxq | mb | microblaze | mcore | mep | metag \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-@@ -268,6 +275,7 @@
+@@ -270,6 +272,7 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -1239,7 +1118,7 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	| mt \
  	| msp430 \
  	| nios | nios2 \
-@@ -277,7 +285,7 @@
+@@ -279,7 +282,7 @@
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
  	| score \
@@ -1248,36 +1127,15 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	| sh64 | sh64le \
  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -286,7 +294,7 @@
- 	| v850 | v850e \
- 	| we32k \
- 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
--	| z8k)
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -329,14 +337,17 @@
+@@ -331,6 +334,7 @@
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
 +	| lm32-* \
  	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-@@ -358,20 +369,20 @@
+ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+@@ -362,7 +366,7 @@
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
@@ -1286,22 +1144,7 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
  	| sparclite-* \
- 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
--	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- 	| tron-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
- 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- 	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
- 		;;
- 	# Recognize the basic CPU types without company name, with glob match.
- 	xtensa*)
-@@ -439,6 +450,10 @@
+@@ -443,6 +447,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -1312,37 +1155,7 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -455,10 +470,18 @@
- 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		os=-linux
- 		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -526,6 +549,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
- 	djgpp)
- 		basic_machine=i586-pc
- 		os=-msdosdjgpp
-@@ -714,24 +741,6 @@
+@@ -726,24 +734,6 @@
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -1367,18 +1180,7 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -1146,6 +1155,10 @@
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1184,7 +1197,7 @@
+@@ -1200,7 +1190,7 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -1387,12 +1189,9 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1254,10 +1267,11 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
+@@ -1272,8 +1262,9 @@
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1401,16 +1200,7 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1266,7 +1280,7 @@
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -chorusos* | -chorusrdb* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1276,7 +1290,7 @@
+@@ -1292,7 +1283,7 @@
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -1419,40 +1209,19 @@ diff -Nur bogofilter-1.2.0.orig/config.sub bogofilter-1.2.0/config.sub
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1406,6 +1420,9 @@
- 	-zvmoe)
- 		os=-zvmoe
- 		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1603,7 +1620,7 @@
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
-diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
---- bogofilter-1.2.0.orig/configure	2009-02-21 21:41:49.000000000 +0100
-+++ bogofilter-1.2.0/configure	2010-02-18 20:49:14.956852485 +0100
-@@ -1,18 +1,22 @@
+diff -Nur bogofilter-1.2.1.orig/configure bogofilter-1.2.1/configure
+--- bogofilter-1.2.1.orig/configure	2009-08-01 21:00:49.000000000 +0200
++++ bogofilter-1.2.1/configure	2010-04-02 14:08:24.691012680 +0200
+@@ -1,18 +1,20 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for bogofilter 1.2.0.
-+# Generated by GNU Autoconf 2.65 for bogofilter 1.2.0.
-+#
+-# Generated by GNU Autoconf 2.63 for bogofilter 1.2.1.
++# Generated by GNU Autoconf 2.64 for bogofilter 1.2.1.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
++# Foundation, Inc.
 +#
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
@@ -1470,7 +1239,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20,23 +24,15 @@
+@@ -20,23 +22,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -1499,7 +1268,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  as_nl='
  '
  export as_nl
-@@ -44,7 +40,13 @@
+@@ -44,7 +38,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -1514,7 +1283,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -55,7 +57,7 @@
+@@ -55,7 +55,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -1523,7 +1292,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -78,13 +80,6 @@
+@@ -78,13 +78,6 @@
    }
  fi
  
@@ -1537,7 +1306,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -94,15 +89,15 @@
+@@ -94,15 +87,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -1556,7 +1325,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  IFS=$as_save_IFS
  
       ;;
-@@ -114,12 +109,16 @@
+@@ -114,12 +107,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -1577,7 +1346,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  done
  PS1='$ '
  PS2='> '
-@@ -131,330 +130,299 @@
+@@ -131,330 +128,299 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -2153,7 +1922,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
    sed -n '
      p
      /[$]LINENO/=
-@@ -471,8 +439,7 @@
+@@ -471,8 +437,7 @@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -2163,7 +1932,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-@@ -482,29 +449,18 @@
+@@ -482,29 +447,18 @@
    exit
  }
  
@@ -2198,7 +1967,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -534,7 +490,7 @@
+@@ -534,7 +488,7 @@
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
@@ -2207,7 +1976,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -553,10 +509,10 @@
+@@ -553,10 +507,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -2220,18 +1989,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -570,8 +526,8 @@
+@@ -570,7 +524,6 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
 -
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
+ exec 7<&0 </dev/null 6>&1
  
  # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -589,7 +545,6 @@
+@@ -589,7 +542,6 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -2239,27 +2005,26 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  
  # Identity of this package.
  PACKAGE_NAME='bogofilter'
-@@ -597,6 +552,7 @@
- PACKAGE_VERSION='1.2.0'
- PACKAGE_STRING='bogofilter 1.2.0'
+@@ -597,6 +549,7 @@
+ PACKAGE_VERSION='1.2.1'
+ PACKAGE_STRING='bogofilter 1.2.1'
  PACKAGE_BUGREPORT=''
 +PACKAGE_URL=''
  
- ac_unique_file="src/bogofilter.c"
  # Factoring default headers for most tests.
-@@ -635,7 +591,10 @@
- # include <unistd.h>
+ ac_includes_default="\
+@@ -635,7 +588,9 @@
  #endif"
  
+ ac_unique_file="src/bogofilter.c"
 -ac_subst_vars='LTLIBOBJS
-+ac_header_list=
 +ac_subst_vars='am__EXEEXT_FALSE
 +am__EXEEXT_TRUE
 +LTLIBOBJS
  transformed_bogoutil
  transformed_bogofilter
  NEED_GETOPT_FALSE
-@@ -789,6 +748,7 @@
+@@ -785,6 +740,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -2267,7 +2032,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -940,8 +900,7 @@
+@@ -936,8 +892,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -2277,7 +2042,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -967,8 +926,7 @@
+@@ -963,8 +918,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -2287,7 +2052,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1172,8 +1130,7 @@
+@@ -1168,8 +1122,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -2297,7 +2062,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1189,8 +1146,7 @@
+@@ -1185,8 +1138,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -2307,7 +2072,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1220,17 +1176,17 @@
+@@ -1216,17 +1168,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -2331,7 +2096,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1247,15 +1203,13 @@
+@@ -1243,15 +1195,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -2349,7 +2114,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1278,8 +1232,7 @@
+@@ -1274,8 +1224,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -2359,7 +2124,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1309,11 +1262,9 @@
+@@ -1305,11 +1254,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -2373,7 +2138,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  
  
  # Find the source files, if location was not specified.
-@@ -1352,13 +1303,11 @@
+@@ -1348,13 +1295,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -2389,36 +2154,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1471,7 +1420,7 @@
-                           use specified header name instead of "X-Bogosity"
-   --disable-unicode       disables Unicode/UTF-8 conversion of character sets
-   --disable-rpath         do not hardcode runtime library paths
--  --enable-russian        switch default character set to CP866 [iso-8859-1]
-+  --enable-russian        switch default character set to CP866 [[iso-8859-1]]
-   --enable-memdebug       enable memory usage debugging
-   --enable-transactions   force transactional mode (disable traditional) in
-                           Berkeley DB [compile both modes and select at
-@@ -1489,9 +1438,9 @@
-   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
-   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-   --with-charset=name     use specified charset (overrides --enable-russian)
--                          [iso-8859-1]
-+                          [[iso-8859-1]]
-   --with-database=ENGINE  choose database engine
--                          {db|qdbm|sqlite3|tokyocabinet} [db]
-+                          {db|qdbm|sqlite3|tokyocabinet} [[db]]
-   --with-libsqlite3-prefix[=DIR]  search for libsqlite3 in DIR/include and DIR/lib
-   --without-libsqlite3-prefix     don't search for libsqlite3 in includedir and libdir
-   --with-libtokyocabinet-prefix[=DIR]  search for libtokyocabinet in DIR/include and DIR/lib
-@@ -1510,13 +1459,14 @@
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-   LIBS        libraries to pass to the linker, e.g. -l<library>
--  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
- 
+@@ -1512,6 +1457,7 @@
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
  
@@ -2426,12 +2162,12 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
  _ACEOF
  ac_status=$?
  fi
-@@ -1580,410 +1530,1006 @@
+@@ -1575,577 +1521,1178 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- bogofilter configure 1.2.0
+ bogofilter configure 1.2.1
 -generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.64
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -2445,7 +2181,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
 -This file contains any messages produced by compilers while
 -running configure, to aid debugging if configure makes a mistake.
  
--It was created by bogofilter $as_me 1.2.0, which was
+-It was created by bogofilter $as_me 1.2.1, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +## ------------------------ ##
 +## Autoconf initialization. ##
@@ -2486,31 +2222,30 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
++  return $ac_retval
  
 -_ACEOF
 -exec 5>>config.log
 +} # ac_fn_c_try_compile
 +
-+# ac_fn_c_try_link LINENO
-+# -----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_link ()
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
  {
 -cat <<_ASUNAME
 -## --------- ##
 -## Platform. ##
 -## --------- ##
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+  if { { ac_try="$ac_link"
++  if { { ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>conftest.err
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
@@ -2518,12 +2253,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2
author	Waldemar Brodkorb <wbx@openadk.org>	2010-04-06 15:54:57 +0200
committer	Waldemar Brodkorb <wbx@openadk.org>	2010-04-06 15:54:57 +0200
commit	2aa2990811a2dbdcf7e65ab04c9fda4756864121 (patch)
tree	6c727f750fb12f20cc3df8e40a4239e613f2a344
parent	ca760844fcd08190b692a674ff387fe15c39a497 (diff)