diff options
| -rw-r--r-- | package/bogofilter/Makefile | 7 | ||||
| -rw-r--r-- | package/bogofilter/patches/autotool.patch | 9354 |
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.0/configure + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else @@ -2535,19 +2267,14 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ ac_retval=1 ++ ac_retval=1 +fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval ++ return $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+} # ac_fn_c_try_link ++} # ac_fn_c_try_cpp -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` @@ -2556,43 +2283,57 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+# ac_fn_c_check_decl LINENO SYMBOL VAR -+# ------------------------------------ -+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. -+ac_fn_c_check_decl () ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -+$as_echo_n "checking whether $2 is declared... " >&6; } ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } +else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 -+int -+main () -+{ -+#ifndef $2 -+ (void) $2; -+#endif - --_ASUNAME -+ ; -+ return 0; -+} ++#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" ++ ac_header_compiler=yes +else -+ eval "$3=no" ++ ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + +-_ASUNAME ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no +fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH @@ -2602,50 +2343,44 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS -+} # ac_fn_c_check_decl - --} >&5 -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; +esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 +else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --cat >&5 <<_ACEOF -+ ac_retval=1 ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval -+} # ac_fn_c_try_cpp +-} >&5 ++} # ac_fn_c_check_header_mongrel --## ----------- ## --## Core tests. ## --## ----------- ## +-cat >&5 <<_ACEOF +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -2684,15 +2419,18 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ as_fn_set_status $ac_retval -+ ++ return $ac_retval + +-## ----------- ## +-## Core tests. ## +-## ----------- ## +} # ac_fn_c_try_run -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () + ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -2700,38 +2438,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} ++#include <$2> _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : - -+else + eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi @@ -2740,6 +2455,8 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++} # ac_fn_c_check_header_compile + -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. @@ -2787,8 +2504,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+} # ac_fn_c_check_type - +- -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. @@ -2798,34 +2514,39 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - # Save into config.log some information that might help in debugging. - { - echo -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++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 ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 +else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 - cat <<\_ASBOX -## ---------------- ## @@ -2864,7 +2585,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - sort -) - echo -+} # ac_fn_c_check_header_compile ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval - cat <<\_ASBOX -## ----------------- ## @@ -2881,40 +2610,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } ++} # ac_fn_c_try_link - if test -n "$ac_subst_files"; then - cat <<\_ASBOX @@ -2933,22 +2629,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - done | sort - echo - fi -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } - +- - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## @@ -2971,45 +2652,107 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac ++# ac_fn_c_check_decl LINENO SYMBOL VAR ++# ------------------------------------ ++# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++ac_fn_c_check_decl () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 ++$as_echo_n "checking whether $2 is declared... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++#ifndef $2 ++ (void) $2; ++#endif + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +-# Predefined preprocessor variables. ++} # ac_fn_c_check_decl + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else -+ eval "$3=\$ac_header_compiler" ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } -+fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} --# confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -f -r conftest* confdefs.h -+} # ac_fn_c_check_header_mongrel +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +-_ACEOF ++} # ac_fn_c_check_type --# Predefined preprocessor variables. +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes @@ -3030,7 +2773,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +test_array [0] = 0 -cat >>confdefs.h <<_ACEOF --#define PACKAGE_NAME "$PACKAGE_NAME" +-#define PACKAGE_VERSION "$PACKAGE_VERSION" + ; + return 0; +} @@ -3047,13 +2790,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_TARNAME "$PACKAGE_TARNAME" + ; + return 0; +} - _ACEOF ++_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else @@ -3076,9 +2816,8 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 -- -cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION "$PACKAGE_VERSION" +-#define PACKAGE_STRING "$PACKAGE_STRING" + ; + return 0; +} @@ -3095,13 +2834,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 -- --cat >>confdefs.h <<_ACEOF --#define PACKAGE_STRING "$PACKAGE_STRING" + ; + return 0; +} - _ACEOF ++_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else @@ -3132,7 +2868,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 -- -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + ; @@ -3229,7 +2964,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - esac 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 + +} # ac_fn_c_compute_int + @@ -3248,12 +2983,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case <limits.h> declares $2. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $2 innocuous_$2 - +- -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false @@ -3313,6 +3043,26 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case <limits.h> declares $2. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since @@ -3366,8 +3116,8 @@ 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 -+generated by GNU Autoconf 2.65. Invocation command line was ++It was created by bogofilter $as_me 1.2.1, which was ++generated by GNU Autoconf 2.64. Invocation command line was + $ $0 $@ @@ -3385,6 +3135,11 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` @@ -3398,27 +3153,126 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +_ASUNAME -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done + $as_echo "PATH: $as_dir" + done -+IFS=$as_save_IFS + IFS=$as_save_IFS +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +} >&5 +cat >&5 <<_ACEOF +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +## ----------- ## +## Core tests. ## +## ----------- ## +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-else +- CC="$ac_cv_prog_CC" +-fi +_ACEOF - +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH ++ +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. @@ -3429,7 +3283,16 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 -+do + do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done + for ac_arg + do + case $ac_arg in @@ -3463,7 +3326,19 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + ;; + esac + done -+done + done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} @@ -3476,7 +3351,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + # Save into config.log some information that might help in debugging. + { + echo - ++ + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## @@ -3514,7 +3389,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + sort +) + echo - ++ + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## @@ -3530,7 +3405,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo - ++ + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## @@ -3548,12 +3423,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + done | sort + echo + fi - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## @@ -3576,12 +3446,12 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 - ++ +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h - ++ +$as_echo "/* confdefs.h */" > confdefs.h - ++ +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF @@ -3625,34 +3495,35 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ if test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done -+ + +if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special ++ # files actually), so we avoid doing that. ++ if test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac -+ fi + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file -+fi + fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + -+as_fn_append ac_header_list " stdlib.h" -+as_fn_append ac_header_list " unistd.h" -+as_fn_append ac_header_list " sys/param.h" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false @@ -3719,9 +3590,1754 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- ac_prog_rejected=no + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $# != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi --ac_aux_dir= --for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -2157,9 +2704,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2170,24 +2717,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2201,9 +2748,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -2214,24 +2761,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2244,7 +2791,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2255,73 +2802,55 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include <stdio.h> + int + main () + { ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 + $as_echo_n "checking for C compiler default output file name... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +@@ -2338,17 +2867,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -2365,7 +2894,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -2384,84 +2913,75 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 + $as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then ++if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } + fi +- + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 + $as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. ++as_fn_error "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -2476,32 +2996,24 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2513,17 +3025,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -2536,31 +3048,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2574,37 +3078,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -2613,20 +3096,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2637,35 +3116,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2676,36 +3131,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2716,42 +3147,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -2768,18 +3174,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +@@ -2836,32 +3238,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -2872,17 +3251,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -2896,14 +3277,14 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -2918,11 +3299,7 @@ + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include <limits.h> +@@ -2931,78 +3308,34 @@ + #endif + Syntax error + _ACEOF +-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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -3014,7 +3347,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -3025,11 +3358,7 @@ + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include <limits.h> +@@ -3038,87 +3367,40 @@ + #endif + Syntax error + _ACEOF +-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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -3128,9 +3410,9 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -3141,7 +3423,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +@@ -3161,7 +3443,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -3176,26 +3458,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -3209,7 +3489,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +@@ -3229,7 +3509,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -3244,12 +3524,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -3257,21 +3535,17 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> + #include <stdarg.h> +@@ -3286,48 +3560,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <string.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -3337,18 +3586,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -3358,14 +3603,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ctype.h> + #include <stdlib.h> +@@ -3392,118 +3633,34 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -3514,134 +3671,8 @@ + + + +- if test "${ac_cv_header_minix_config_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 +-$as_echo_n "checking for minix/config.h... " >&6; } +-if test "${ac_cv_header_minix_config_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 +-$as_echo "$ac_cv_header_minix_config_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 +-$as_echo_n "checking minix/config.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <minix/config.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 +-$as_echo_n "checking minix/config.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <minix/config.h> +-_ACEOF +-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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} +- +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 +-$as_echo_n "checking for minix/config.h... " >&6; } +-if test "${ac_cv_header_minix_config_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_minix_config_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 +-$as_echo "$ac_cv_header_minix_config_h" >&6; } +- +-fi +-if test "x$ac_cv_header_minix_config_h" = x""yes; then ++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" ++if test "x$ac_cv_header_minix_config_h" = x""yes; then : + MINIX=yes + else + MINIX= +@@ -3650,34 +3681,23 @@ + + if test "$MINIX" = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define _POSIX_SOURCE 1 +-_ACEOF ++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + + +-cat >>confdefs.h <<\_ACEOF +-#define _POSIX_1_SOURCE 2 +-_ACEOF ++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + + +-cat >>confdefs.h <<\_ACEOF +-#define _MINIX 1 +-_ACEOF ++$as_echo "#define _MINIX 1" >>confdefs.h + + fi + + +- +- { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 + $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then ++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + # define __EXTENSIONS__ 1 +@@ -3690,79 +3710,40 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_safe_to_define___extensions__=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_safe_to_define___extensions__=no ++ ac_cv_safe_to_define___extensions__=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 + $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + test $ac_cv_safe_to_define___extensions__ = yes && +- cat >>confdefs.h <<\_ACEOF +-#define __EXTENSIONS__ 1 +-_ACEOF ++ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + +- cat >>confdefs.h <<\_ACEOF +-#define _ALL_SOURCE 1 +-_ACEOF ++ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + +- cat >>confdefs.h <<\_ACEOF +-#define _GNU_SOURCE 1 +-_ACEOF ++ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + +- cat >>confdefs.h <<\_ACEOF +-#define _POSIX_PTHREAD_SEMANTICS 1 +-_ACEOF ++ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + +- cat >>confdefs.h <<\_ACEOF +-#define _TANDEM_SOURCE 1 +-_ACEOF ++ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + + + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" @@ -3735,17 +5351,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi --done --if test -z "$ac_aux_dir"; then -- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -- { (exit 1); exit 1; }; } --fi -+ -+ -+ -+ac_aux_dir= -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir @@ -3753,14 +5358,16 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure + break 2 + fi + done -+done -+if test -z "$ac_aux_dir"; then + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi + fi # These three variables are undocumented and unsupported, - # and are intended to be withdrawn in a future Autoconf release. -@@ -1996,35 +2542,27 @@ +@@ -3776,35 +3757,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -3803,7 +5410,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -2040,28 +2578,24 @@ +@@ -3820,28 +3793,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -3837,50 +5444,16 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -2077,28 +2611,24 @@ +@@ -3857,7 +3826,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac --{ $as_echo "$as_me:$LINENO: checking target system type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 - $as_echo_n "checking target system type... " >&6; } --if test "${ac_cv_target+set}" = set; then -+if test "${ac_cv_target+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host - else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 - $as_echo "$ac_cv_target" >&6; } - case $ac_cv_target in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 --$as_echo "$as_me: error: invalid value of canonical target" >&2;} -- { (exit 1); exit 1; }; };; -+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; - esac - target=$ac_cv_target - ac_save_IFS=$IFS; IFS='-' -@@ -2120,7 +2650,7 @@ - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- -am__api_version='1.10' +am__api_version='1.11' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or -@@ -2136,10 +2666,10 @@ +@@ -3873,10 +3842,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. @@ -3893,7 +5466,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2147,11 +2677,11 @@ +@@ -3884,11 +3853,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3909,7 +5482,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2188,7 +2718,7 @@ +@@ -3925,7 +3894,7 @@ ;; esac @@ -3918,7 +5491,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2204,7 +2734,7 @@ +@@ -3941,7 +3910,7 @@ INSTALL=$ac_install_sh fi fi @@ -3927,7 +5500,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2215,21 +2745,34 @@ +@@ -3952,21 +3921,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -3965,7 +5538,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ -@@ -2239,11 +2782,8 @@ +@@ -3976,11 +3958,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -3979,7 +5552,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi test "$2" = conftest.file -@@ -2252,13 +2792,10 @@ +@@ -3989,13 +3968,10 @@ # Ok. : else @@ -3996,7 +5569,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2273,20 +2810,136 @@ +@@ -4010,59 +3986,175 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -4020,6 +5593,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +-if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) @@ -4040,28 +5616,57 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue +- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +- 'mkdir (GNU coreutils) '* | \ +- 'mkdir (coreutils) '* | \ +- 'mkdir (fileutils) '4.1*) +- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext +- break 3;; +- esac +- done +- done + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi -+done + done + done -+IFS=$as_save_IFS -+ -+fi -+fi + IFS=$as_save_IFS + + fi +- +- if test "${ac_cv_path_mkdir+set}" = set; then +- MKDIR_P="$ac_cv_path_mkdir -p" +- else +- # As a last resort, use the slow shell script. Don't cache a +- # value for MKDIR_P within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version +- MKDIR_P="$ac_install_sh -d" +- fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +-$as_echo "$MKDIR_P" >&6; } +- +-mkdir_p="$MKDIR_P" +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 @@ -4130,50 +5735,52 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 - $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } - if test -z "$MKDIR_P"; then -- if test "${ac_cv_path_mkdir+set}" = set; then ++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } ++if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2294,7 +2947,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in mkdir gmkdir; do ++ $as_echo_n "(cached) " >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -2306,11 +2959,12 @@ - esac - done - done --done ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done + done - IFS=$as_save_IFS - - fi - -+ test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else -@@ -2318,11 +2972,10 @@ - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. -- test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi - fi --{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 - $as_echo "$MKDIR_P" >&6; } - - mkdir_p="$MKDIR_P" -@@ -2335,9 +2988,9 @@ ++$as_echo "$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" + case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +@@ -4072,9 +4164,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4185,7 +5792,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2348,24 +3001,24 @@ +@@ -4085,24 +4177,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4215,7 +5822,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -2373,11 +3026,11 @@ +@@ -4110,11 +4202,11 @@ test -n "$AWK" && break done @@ -4229,7 +5836,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2395,11 +3048,11 @@ +@@ -4132,11 +4224,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -4243,7 +5850,71 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2419,9 +3072,7 @@ +@@ -4158,44 +4250,44 @@ + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -4218,9 +4310,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -4254,7 +5925,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi fi -@@ -2465,111 +3116,9 @@ +@@ -4264,108 +4354,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} @@ -4360,16 +6031,91 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --# Always define AMTAR for backward compatibility. -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+# Always define AMTAR for backward compatibility. + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. +@@ -4379,9 +4367,9 @@ + + depcc="$CC" am_compiler_list= - AMTAR=${AMTAR-"${am_missing_run}tar"} +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4407,6 +4395,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -4424,7 +4417,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -2586,9 +3135,9 @@ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -4434,19 +4437,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -4470,7 +4477,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -4493,9 +4500,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4381,7 +6127,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2599,24 +3148,24 @@ +@@ -4506,24 +4513,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4411,7 +6157,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -2634,9 +3183,9 @@ +@@ -4541,9 +4548,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4423,7 +6169,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -2647,24 +3196,24 @@ +@@ -4554,24 +4561,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4453,7 +6199,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -2678,9 +3227,9 @@ +@@ -4585,9 +4592,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4465,7 +6211,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -2691,24 +3240,24 @@ +@@ -4598,24 +4605,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4495,7 +6241,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -2721,7 +3270,7 @@ +@@ -4628,7 +4635,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4504,7 +6250,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -2730,57 +3279,37 @@ +@@ -4637,62 +4644,42 @@ fi @@ -4536,17 +6282,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in @@ -4555,328 +6290,35 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 +- (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2796,8 +3325,8 @@ - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } - ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - - # The possible output files: -@@ -2813,17 +3342,17 @@ - done - rm -f $ac_rmfiles - --if { (ac_try="$ac_link_default" -+if { { ac_try="$ac_link_default" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' - # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -2840,7 +3369,7 @@ - # certainly right. - break;; - *.* ) -- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi -@@ -2859,84 +3388,42 @@ - else - ac_file='' - fi -- --{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 --$as_echo "$ac_file" >&6; } --if test -z "$ac_file"; then -- $as_echo "$as_me: failed program was:" >&5 -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; }; } -+{ as_fn_set_status 77 -+as_fn_error "C compiler cannot create executables -+See \`config.log' for more details." "$LINENO" 5; }; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext - --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --$as_echo_n "checking whether the C compiler works... " >&6; } --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (case "(($ac_try" in +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 +- (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -- fi -- fi --fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --$as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 --$as_echo "$cross_compiling" >&6; } -- --{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 - $as_echo_n "checking for suffix of executables... " >&6; } --if { (ac_try="$ac_link" -+if { { ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -2951,32 +3438,83 @@ - esac - done - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+as_fn_error "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." "$LINENO" 5; } - fi -- --rm -f conftest$ac_cv_exeext --{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 - $as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+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>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { 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_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } -+ fi +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err + fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } --if test "${ac_cv_objext+set}" = set; then -+if test "${ac_cv_objext+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2988,17 +3526,17 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (ac_try="$ac_compile" -+if { { ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -@@ -3011,31 +3549,23 @@ - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 ++ test $ac_status = 0; } ++done --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+as_fn_error "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 - $as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } @@ -4893,7 +6335,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -3049,37 +3579,16 @@ +@@ -4706,37 +4693,16 @@ return 0; } _ACEOF @@ -4934,7 +6376,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3088,20 +3597,16 @@ +@@ -4745,20 +4711,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -4958,7 +6400,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -3112,35 +3617,11 @@ +@@ -4769,35 +4731,27 @@ return 0; } _ACEOF @@ -4985,19 +6427,33 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ + - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++ ; ++ return 0; ++} + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -3151,36 +3632,12 @@ +@@ -4808,82 +4762,17 @@ return 0; } _ACEOF @@ -5023,25 +6479,24 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_compile "$LINENO"; then : - +- - ac_c_werror_flag=$ac_save_c_werror_flag -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" +- CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3191,42 +3648,17 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -5083,7 +6538,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3243,18 +3675,14 @@ +@@ -4900,18 +4789,14 @@ CFLAGS= fi fi @@ -5105,7 +6560,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -@@ -3311,32 +3739,9 @@ +@@ -4968,32 +4853,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -5139,7 +6594,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -3347,17 +3752,19 @@ +@@ -5004,17 +4866,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -5162,152 +6617,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -3372,44 +3779,44 @@ - am_make=${MAKE-make} - cat > confinc << 'END' - am__doit: -- @echo done -+ @echo this is the am__doit target - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 - $as_echo_n "checking for style of include used by $am_make... " >&6; } - am__include="#" - am__quote= - _am_result=none - # First try GNU make style include. - echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi -+# Ignore all kinds of additional output from `make'. -+case `$am_make -s -f confmf 2> /dev/null` in #( -+*the\ am__doit\ target*) -+ am__include=include -+ am__quote= -+ _am_result=GNU -+ ;; -+esac - # Now try BSD make style include. - if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote="\"" -- _am_result=BSD -- fi -+ case `$am_make -s -f confmf 2> /dev/null` in #( -+ *the\ am__doit\ target*) -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ ;; -+ esac - fi - - --{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 - $as_echo "$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. --if test "${enable_dependency_tracking+set}" = set; then -+if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; - fi - -@@ -3429,9 +3836,9 @@ - - depcc="$CC" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -3457,6 +3864,11 @@ - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi -+ am__universal=false -+ case " $depcc " in #( -+ *\ -arch\ *\ -arch\ *) am__universal=true ;; -+ esac -+ - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and -@@ -3474,7 +3886,17 @@ - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs -+ am__obj=sub/conftest.${OBJEXT-o} -+ am__minus_obj="-o $am__obj" - case $depmode in -+ gcc) -+ # This depmode causes a compiler race in universal mode. -+ test "$am__universal" = false || continue -+ ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested -@@ -3484,19 +3906,23 @@ - break - fi - ;; -+ msvisualcpp | msvcmsys) -+ # This compiler won't grok `-c -o', but also, the minuso test has -+ # not run yet. These depmodes are late enough in the game, and -+ # so weak that their functioning should not be impacted. -+ am__obj=conftest.${OBJEXT-o} -+ am__minus_obj= -+ ;; - none) break ;; - esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. - if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message -@@ -3520,7 +3946,7 @@ - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -@@ -3538,9 +3964,9 @@ +@@ -5025,9 +4889,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -5319,7 +6629,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -3551,24 +3977,24 @@ +@@ -5038,24 +4902,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5349,7 +6659,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3578,9 +4004,9 @@ +@@ -5065,9 +4929,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -5361,7 +6671,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -3591,24 +4017,24 @@ +@@ -5078,24 +4942,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5391,7 +6701,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3617,7 +4043,7 @@ +@@ -5104,7 +4968,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5400,7 +6710,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3628,16 +4054,14 @@ +@@ -5115,16 +4979,14 @@ fi if test "$AR" = no ; then @@ -5420,7 +6730,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -3648,24 +4072,24 @@ +@@ -5135,24 +4997,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5450,7 +6760,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3675,9 +4099,9 @@ +@@ -5162,9 +5024,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -5462,7 +6772,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -3688,24 +4112,24 @@ +@@ -5175,24 +5037,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5492,7 +6802,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3714,7 +4138,7 @@ +@@ -5201,7 +5063,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5501,7 +6811,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3728,9 +4152,9 @@ +@@ -5215,9 +5077,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5513,7 +6823,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else case $PERL in -@@ -3744,14 +4168,14 @@ +@@ -5231,14 +5093,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5531,7 +6841,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS ;; -@@ -3759,10 +4183,10 @@ +@@ -5246,10 +5108,10 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -5544,7 +6854,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3774,9 +4198,9 @@ +@@ -5261,9 +5123,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5556,7 +6866,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else case $NSGMLS in -@@ -3789,14 +4213,14 @@ +@@ -5276,14 +5138,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5574,7 +6884,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS ;; -@@ -3804,10 +4228,10 @@ +@@ -5291,10 +5153,10 @@ fi NSGMLS=$ac_cv_path_NSGMLS if test -n "$NSGMLS"; then @@ -5587,7 +6897,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3820,9 +4244,9 @@ +@@ -5307,9 +5169,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5599,7 +6909,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else case $RPMBUILD in -@@ -3835,14 +4259,14 @@ +@@ -5322,14 +5184,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5617,7 +6927,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS ;; -@@ -3850,10 +4274,10 @@ +@@ -5337,10 +5199,10 @@ fi RPMBUILD=$ac_cv_path_RPMBUILD if test -n "$RPMBUILD"; then @@ -5630,7 +6940,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3867,9 +4291,9 @@ +@@ -5353,9 +5215,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5642,7 +6952,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then -@@ -3880,24 +4304,24 @@ +@@ -5366,24 +5228,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5672,7 +6982,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } fi -@@ -3926,20 +4350,20 @@ +@@ -5412,20 +5274,20 @@ return ! yylex () + ! yywrap (); } _ACEOF @@ -5700,7 +7010,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -3948,19 +4372,17 @@ +@@ -5434,19 +5296,17 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else @@ -5724,7 +7034,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -3968,55 +4390,29 @@ +@@ -5454,55 +5314,29 @@ ac_cv_lib_lex='none needed' for ac_lib in '' -lfl -ll; do LIBS="$ac_lib $ac_save_LIBS" @@ -5788,7 +7098,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the -@@ -4025,52 +4421,24 @@ +@@ -5511,52 +5345,24 @@ ac_cv_prog_lex_yytext_pointer=no ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" @@ -5848,7 +7158,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi rm -f conftest.l $LEX_OUTPUT_ROOT.c -@@ -4080,16 +4448,12 @@ +@@ -5566,16 +5372,12 @@ LEX=${am_missing_run}flex fi @@ -5868,7 +7178,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -4149,56 +4513,29 @@ +@@ -5635,56 +5437,29 @@ return 0; } _ACEOF @@ -5932,7 +7242,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -@@ -4207,41 +4544,17 @@ +@@ -5693,41 +5468,17 @@ #endif _ACEOF @@ -5976,7 +7286,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure case $ac_cv_c_inline in inline | yes) ;; *) -@@ -4257,16 +4570,12 @@ +@@ -5743,16 +5494,12 @@ ;; esac @@ -5996,7 +7306,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -4280,65 +4589,36 @@ +@@ -5766,65 +5513,36 @@ return 0; } _ACEOF @@ -6070,7 +7380,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ extern $ac_cv_c_inline double foo(double x); extern $ac_cv_c_inline double foo(double x) { return x+1.0; }; -@@ -4351,50 +4631,25 @@ +@@ -5837,50 +5555,25 @@ return 0; } _ACEOF @@ -6125,7 +7435,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "checking for a working shell...... " >&6; } for i in /usr/xpg6/bin/sh /usr/xpg4/bin/sh /usr/ccs/bin/sh /bin/sh /usr/bin/sh /bin/ksh /bin/bash /usr/local/bin/bash ; do $i -c 'if ! false ; then echo $(echo ok) ; fi' >config.$$ 2>/dev/null -@@ -4406,12 +4661,11 @@ +@@ -5892,12 +5585,11 @@ break fi done @@ -6140,8 +7450,8 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +as_fn_error "no SUS compliant shell found - on Solaris" "$LINENO" 5; } fi - if test "x$target_cpu" = "xs390" && test "x$GCC" = "xyes" ; then -@@ -4420,7 +4674,7 @@ + if test "x$host_cpu" = "xs390" && test "x$GCC" = "xyes" ; then +@@ -5906,7 +5598,7 @@ OCFLAGS="$CFLAGS" CFLAGS="`echo \"$CFLAGS\" | sed 's/-O[s1-9][0-9]*/-O1/'`" export CFLAGS @@ -6150,7 +7460,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: GCC for s390: Overriding CFLAGS \"$OCFLAGS\" to \"$CFLAGS\"." >&6;} esac fi -@@ -4440,7 +4694,7 @@ +@@ -5926,7 +5618,7 @@ *) CFLAGS="$CFLAGS$i " ;; esac done @@ -6159,7 +7469,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: dgux: Removing -g options from CFLAGS, new: \"$CFLAGS\"." >&6;} ;; esac -@@ -4451,18 +4705,18 @@ +@@ -5937,18 +5629,18 @@ esac if test "$GCC" = yes ; then @@ -6182,7 +7492,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -4497,7 +4751,7 @@ +@@ -5983,7 +5675,7 @@ done fi fi @@ -6191,7 +7501,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_prog_gcc_flags" >&6; } rm -f configure-dummy.c configure-dummy.o CFLAGS="$CFLAGS $ac_cv_prog_gcc_flags" -@@ -4546,15 +4800,15 @@ +@@ -6032,15 +5724,15 @@ # Check whether --enable-largefile was given. @@ -6210,7 +7520,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no -@@ -4563,11 +4817,7 @@ +@@ -6049,11 +5741,7 @@ while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. @@ -6223,7 +7533,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. -@@ -4586,60 +4836,14 @@ +@@ -6072,60 +5760,14 @@ return 0; } _ACEOF @@ -6286,7 +7596,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -4647,23 +4851,19 @@ +@@ -6133,23 +5775,19 @@ rm -f conftest.$ac_ext fi fi @@ -6314,7 +7624,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. -@@ -4682,38 +4882,11 @@ +@@ -6168,38 +5806,11 @@ return 0; } _ACEOF @@ -6355,7 +7665,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include <sys/types.h> -@@ -4733,38 +4906,15 @@ +@@ -6219,38 +5830,15 @@ return 0; } _ACEOF @@ -6396,7 +7706,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -4776,17 +4926,13 @@ +@@ -6262,17 +5850,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -6417,7 +7727,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. -@@ -4805,38 +4951,11 @@ +@@ -6291,38 +5875,11 @@ return 0; } _ACEOF @@ -6458,7 +7768,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include <sys/types.h> -@@ -4856,38 +4975,15 @@ +@@ -6342,38 +5899,15 @@ return 0; } _ACEOF @@ -6499,7 +7809,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -4902,19 +4998,14 @@ +@@ -6388,19 +5922,14 @@ fi @@ -6522,7 +7832,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -4932,43 +5023,18 @@ +@@ -6418,43 +5947,18 @@ return 0; } _ACEOF @@ -6572,7 +7882,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF -@@ -4979,369 +5045,80 @@ +@@ -6465,369 +5969,80 @@ @@ -6643,49 +7953,34 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETOPT 1 -+#define HAVE_DECL_GETOPT $ac_have_decl - _ACEOF -+ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" " -+#include <unistd.h> -+/* Solaris */ -+#include <stdlib.h> - +-_ACEOF - -+" -+if test "x$ac_cv_have_decl_optreset" = x""yes; then : -+ ac_have_decl=1 - else +- +-else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETOPT 0 -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_OPTRESET $ac_have_decl - _ACEOF - - +-_ACEOF +- +- -fi -{ $as_echo "$as_me:$LINENO: checking whether optreset is declared" >&5 -$as_echo_n "checking whether optreset is declared... " >&6; } -if test "${ac_cv_have_decl_optreset+set}" = set; then - $as_echo_n "(cached) " >&6 -+ac_fn_c_check_decl "$LINENO" "O_DSYNC" "ac_cv_have_decl_O_DSYNC" "#include <fcntl.h> -+" -+if test "x$ac_cv_have_decl_O_DSYNC" = x""yes; then : -+ ac_have_decl=1 - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++#define HAVE_DECL_GETOPT $ac_have_decl + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - --#include <unistd.h> --/* Solaris */ --#include <stdlib.h> -- ++ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" " + #include <unistd.h> + /* Solaris */ + #include <stdlib.h> + - -int -main () @@ -6717,7 +8012,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_optreset=yes --else ++" ++if test "x$ac_cv_have_decl_optreset" = x""yes; then : ++ ac_have_decl=1 + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -6725,12 +8023,13 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi ++ ac_have_decl=0 + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5 -$as_echo "$ac_cv_have_decl_optreset" >&6; } -if test "x$ac_cv_have_decl_optreset" = x""yes; then -- --cat >>confdefs.h <<_ACEOF + + cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_OPTRESET 1 -_ACEOF - @@ -6752,19 +8051,20 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++#define HAVE_DECL_OPTRESET $ac_have_decl + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <fcntl.h> -- + -int -main () -{ -#ifndef O_DSYNC - (void) O_DSYNC; -#endif -- + - ; - return 0; -} @@ -6788,21 +8088,24 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_O_DSYNC=yes --else ++ac_fn_c_check_decl "$LINENO" "O_DSYNC" "ac_cv_have_decl_O_DSYNC" "#include <fcntl.h> ++" ++if test "x$ac_cv_have_decl_O_DSYNC" = x""yes; then : ++ ac_have_decl=1 + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_O_DSYNC=no --fi -- ++ ac_have_decl=0 + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_O_DSYNC" >&5 -$as_echo "$ac_cv_have_decl_O_DSYNC" >&6; } -if test "x$ac_cv_have_decl_O_DSYNC" = x""yes; then -+ ac_have_decl=0 -+fi - +- cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_O_DSYNC 1 -_ACEOF @@ -6868,15 +8171,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_O_SYNC=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_have_decl=0 fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_O_SYNC" >&5 -$as_echo "$ac_cv_have_decl_O_SYNC" >&6; } -if test "x$ac_cv_have_decl_O_SYNC" = x""yes; then -- + cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_O_SYNC 1 -_ACEOF @@ -6966,8 +8269,8 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -fi - - - - + -cat >>confdefs.h <<\_ACEOF -#define __NO_CTYPE 1 -_ACEOF @@ -6981,7 +8284,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_static; fi -@@ -5349,17 +5126,13 @@ +@@ -6835,17 +6050,13 @@ case a$enable_static in ayes) EXE_EXT="_static" @@ -7001,7 +8304,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdlib.h> int -@@ -5370,44 +5143,21 @@ +@@ -6856,44 +6067,21 @@ return 0; } _ACEOF @@ -7050,7 +8353,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: WARNING: Cannot figure out how to statically link a program." >&2;} STATICLDFLAGS= enable_static=no -@@ -5434,7 +5184,7 @@ +@@ -6920,7 +6108,7 @@ # Check whether --enable-spam-header-name was given. @@ -7059,7 +8362,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_spam_header_name; cat >>confdefs.h <<_ACEOF #define SPAM_HEADER_NAME "$enableval" -@@ -5451,7 +5201,7 @@ +@@ -6937,7 +6125,7 @@ # Check whether --enable-unicode was given. @@ -7068,7 +8371,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_unicode; if test "$enableval" = no; then USE_UNICODE=NO fi -@@ -5489,9 +5239,7 @@ +@@ -6975,9 +6163,7 @@ if test x$USE_UNICODE = xNO ; then @@ -7079,7 +8382,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ENCODING="raw" else -@@ -5513,7 +5261,7 @@ +@@ -6999,7 +6185,7 @@ # Check whether --with-gnu-ld was given. @@ -7088,7 +8391,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -5535,7 +5283,7 @@ +@@ -7021,7 +6207,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -7097,7 +8400,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) -@@ -5565,13 +5313,13 @@ +@@ -7051,13 +6237,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -7114,7 +8417,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -5599,18 +5347,16 @@ +@@ -7085,18 +6271,16 @@ LD="$acl_cv_path_LD" if test -n "$LD"; then @@ -7138,7 +8441,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -@@ -5621,15 +5367,15 @@ +@@ -7107,15 +6291,15 @@ acl_cv_prog_gnu_ld=no ;; esac fi @@ -7157,7 +8460,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -5640,7 +5386,7 @@ +@@ -7126,7 +6310,7 @@ acl_cv_rpath=done fi @@ -7166,7 +8469,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" libext="$acl_cv_libext" -@@ -5650,7 +5396,7 @@ +@@ -7136,7 +6320,7 @@ hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. @@ -7175,7 +8478,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_rpath; : else enable_rpath=yes -@@ -5678,7 +5424,7 @@ +@@ -7164,7 +6348,7 @@ # Check whether --with-libiconv-prefix was given. @@ -7184,15 +8487,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -5916,6163 +5662,1650 @@ - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in -- linux*) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then +@@ -7407,4924 +6591,1238 @@ + fi + fi + if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do - @@ -7636,377 +8934,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -fi - - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu --{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --$as_echo_n "checking how to run the C preprocessor... " >&6; } --# On Suns, sometimes $CPP names a directory. --if test -n "$CPP" && test -d "$CPP"; then -- CPP= --fi --if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CPP=$CPP -- --fi -- CPP=$ac_cv_prog_CPP --else -- ac_cv_prog_CPP=$CPP --fi --{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 --$as_echo "$CPP" >&6; } --ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } --fi -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 --$as_echo_n "checking for grep that handles long lines and -e... " >&6; } --if test "${ac_cv_path_GREP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -z "$GREP"; then -- ac_path_GREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in grep ggrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue --# Check for GNU ac_path_GREP and select it if it is found. -- # Check for GNU $ac_path_GREP --case `"$ac_path_GREP" --version 2>&1` in --*GNU*) -- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -- while : -- do -- cat "conftest.in" "conftest.in" >"conftest.tmp" -- mv "conftest.tmp" "conftest.in" -- cp "conftest.in" "conftest.nl" -- $as_echo 'GREP' >> "conftest.nl" -- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -- if test $ac_count -gt ${ac_path_GREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_GREP="$ac_path_GREP" -- ac_path_GREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac -- -- $ac_path_GREP_found && break 3 -- done -- done --done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_GREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -- ac_cv_path_GREP=$GREP --fi -- --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 --$as_echo "$ac_cv_path_GREP" >&6; } -- GREP="$ac_cv_path_GREP" -- -- --{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 --$as_echo_n "checking for egrep... " >&6; } --if test "${ac_cv_path_EGREP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -- then ac_cv_path_EGREP="$GREP -E" -- else -- if test -z "$EGREP"; then -- ac_path_EGREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in egrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue --# Check for GNU ac_path_EGREP and select it if it is found. -- # Check for GNU $ac_path_EGREP --case `"$ac_path_EGREP" --version 2>&1` in --*GNU*) -- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -- while : -- do -- cat "conftest.in" "conftest.in" >"conftest.tmp" -- mv "conftest.tmp" "conftest.in" -- cp "conftest.in" "conftest.nl" -- $as_echo 'EGREP' >> "conftest.nl" -- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -- if test $ac_count -gt ${ac_path_EGREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_EGREP="$ac_path_EGREP" -- ac_path_EGREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac -- -- $ac_path_EGREP_found && break 3 -- done -- done --done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_EGREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -- ac_cv_path_EGREP=$EGREP --fi -- -- fi --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 --$as_echo "$ac_cv_path_EGREP" >&6; } -- EGREP="$ac_cv_path_EGREP" -- -- -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then @@ -8185,79 +9112,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - -fi - --# On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- eval "$as_ac_Header=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_Header=no" --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- -{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 -$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then @@ -9463,64 +10317,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - -fi - --{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --$as_echo_n "checking return type of signal handlers... " >&6; } --if test "${ac_cv_type_signal+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> --#include <signal.h> -- --int --main () --{ --return *(signal (0, 0)) (0) == 1; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_type_signal=int --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_type_signal=void --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --$as_echo "$ac_cv_type_signal" >&6; } -- --cat >>confdefs.h <<_ACEOF --#define RETSIGTYPE $ac_cv_type_signal --_ACEOF -- -- - - -for ac_header in sys/select.h sys/socket.h @@ -10761,23 +11557,136 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- ++ haveit= ++ for x in $LDFLAGS $LIBICONV; do + ++ acl_save_prefix="$prefix" ++ prefix="$acl_final_prefix" ++ acl_save_exec_prefix="$exec_prefix" ++ exec_prefix="$acl_final_exec_prefix" ++ eval x=\"$x\" ++ exec_prefix="$acl_save_exec_prefix" ++ prefix="$acl_save_prefix" + -fi -- ++ if test "X$x" = "X-L$additional_libdir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test -d "$additional_libdir"; then ++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" ++ fi ++ fi ++ haveit= ++ for x in $LDFLAGS $LTLIBICONV; do + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -$as_echo "$ac_cv_type_ssize_t" >&6; } -if test "x$ac_cv_type_ssize_t" = x""yes; then -- ++ acl_save_prefix="$prefix" ++ prefix="$acl_final_prefix" ++ acl_save_exec_prefix="$exec_prefix" ++ exec_prefix="$acl_final_exec_prefix" ++ eval x=\"$x\" ++ exec_prefix="$acl_save_exec_prefix" ++ prefix="$acl_save_prefix" + -cat >>confdefs.h <<_ACEOF -#define HAVE_SSIZE_T 1 -_ACEOF -- -- ++ if test "X$x" = "X-L$additional_libdir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ if test -d "$additional_libdir"; then ++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" ++ fi ++ fi ++ fi ++ fi ++ ;; ++ -R*) ++ dir=`echo "X$dep" | sed -e 's/^X-R//'` ++ if test "$enable_rpath" != no; then ++ haveit= ++ for x in $rpathdirs; do ++ if test "X$x" = "X$dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ rpathdirs="$rpathdirs $dir" ++ fi ++ haveit= ++ for x in $ltrpathdirs; do ++ if test "X$x" = "X$dir"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ ltrpathdirs="$ltrpathdirs $dir" ++ fi ++ fi ++ ;; ++ -l*) ++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ++ ;; ++ *.la) ++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` ++ ;; ++ *) ++ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" ++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" ++ ;; ++ esac ++ done ++ fi ++ else ++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" ++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" ++ fi ++ fi ++ fi ++ done ++ done ++ if test "X$rpathdirs" != "X"; then ++ if test -n "$hardcode_libdir_separator"; then ++ alldirs= ++ for found_dir in $rpathdirs; do ++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" ++ done ++ acl_save_libdir="$libdir" ++ libdir="$alldirs" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ libdir="$acl_save_libdir" ++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" ++ else ++ for found_dir in $rpathdirs; do ++ acl_save_libdir="$libdir" ++ libdir="$found_dir" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ libdir="$acl_save_libdir" ++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" ++ done ++ fi ++ fi ++ if test "X$ltrpathdirs" != "X"; then ++ for found_dir in $ltrpathdirs; do ++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" ++ done ++ fi + + -fi -- + -{ $as_echo "$as_me:$LINENO: checking for u_long" >&5 -$as_echo_n "checking for u_long... " >&6; } -if test "${ac_cv_type_u_long+set}" = set; then @@ -10856,18 +11765,19 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_cv_type_u_long=yes -fi -- + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- + + -fi -- ++ am_save_CPPFLAGS="$CPPFLAGS" + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_long" >&5 @@ -10875,18 +11785,41 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -if test "x$ac_cv_type_u_long" = x""yes; then - : -else -- ++ for element in $INCICONV; do ++ haveit= ++ for x in $CPPFLAGS; do + -cat >>confdefs.h <<_ACEOF -#define u_long unsigned long -_ACEOF -- ++ acl_save_prefix="$prefix" ++ prefix="$acl_final_prefix" ++ acl_save_exec_prefix="$exec_prefix" ++ exec_prefix="$acl_final_exec_prefix" ++ eval x=\"$x\" ++ exec_prefix="$acl_save_exec_prefix" ++ prefix="$acl_save_prefix" + -fi -- ++ if test "X$x" = "X$element"; then ++ haveit=yes ++ break ++ fi ++ done ++ if test -z "$haveit"; then ++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" ++ fi ++ done + -{ $as_echo "$as_me:$LINENO: checking for sig_atomic_t" >&5 -$as_echo_n "checking for sig_atomic_t... " >&6; } -if test "${ac_cv_type_sig_atomic_t+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 ++$as_echo_n "checking for iconv... " >&6; } ++if test "${am_cv_func_iconv+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_cv_type_sig_atomic_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ @@ -10897,16 +11830,25 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - -#include <signal.h> - -- --int --main () --{ + ++ am_cv_func_iconv="no, consider installing GNU libiconv" ++ am_cv_lib_iconv=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <iconv.h> + int + main () + { -if (sizeof (sig_atomic_t)) - return 0; -- ; -- return 0; --} --_ACEOF ++iconv_t cd = iconv_open("",""); ++ iconv(cd,NULL,NULL,NULL,NULL); ++ iconv_close(cd); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -10930,20 +11872,34 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++if ac_fn_c_try_link "$LINENO"; then : ++ am_cv_func_iconv=yes ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ if test "$am_cv_func_iconv" != yes; then ++ am_save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBICONV" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ - -#include <signal.h> - - --int --main () --{ ++#include <stdlib.h> ++#include <iconv.h> + int + main () + { -if (sizeof ((sig_atomic_t))) - return 0; -- ; -- return 0; --} --_ACEOF ++iconv_t cd = iconv_open("",""); ++ iconv(cd,NULL,NULL,NULL,NULL); ++ iconv_close(cd); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -10976,52 +11932,91 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - --fi -- ++if ac_fn_c_try_link "$LINENO"; then : ++ am_cv_lib_iconv=yes ++ am_cv_func_iconv=yes + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$am_save_LIBS" ++ fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 -$as_echo "$ac_cv_type_sig_atomic_t" >&6; } -if test "x$ac_cv_type_sig_atomic_t" = x""yes; then -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 ++$as_echo "$am_cv_func_iconv" >&6; } ++ if test "$am_cv_func_iconv" = yes; then + -cat >>confdefs.h <<_ACEOF -#define HAVE_SIG_ATOMIC_T 1 -_ACEOF -- -- ++$as_echo "#define HAVE_ICONV 1" >>confdefs.h ++ ++ fi ++ if test "$am_cv_lib_iconv" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 ++$as_echo_n "checking how to link with libiconv... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 ++$as_echo "$LIBICONV" >&6; } ++ else ++ CPPFLAGS="$am_save_CPPFLAGS" ++ LIBICONV= ++ LTLIBICONV= ++ fi + + -fi -- + -{ $as_echo "$as_me:$LINENO: checking for rlim_t" >&5 -$as_echo_n "checking for rlim_t... " >&6; } -if test "${ac_cv_type_rlim_t+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ if test "$am_cv_func_iconv" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 ++$as_echo_n "checking for iconv declaration... " >&6; } ++ if test "${am_cv_proto_iconv+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_cv_type_rlim_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> --#endif ++#include <stdlib.h> ++#include <iconv.h> ++extern ++#ifdef __cplusplus ++"C" + #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> --#endif ++#if defined(__STDC__) || defined(__cplusplus) ++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ++#else ++size_t iconv(); + #endif -#include <sys/resource.h> - -- --int --main () --{ + + int + main () + { -if (sizeof (rlim_t)) - return 0; -- ; -- return 0; --} --_ACEOF ++ + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -11042,11 +12037,28 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ am_cv_proto_iconv_arg1="" ++else ++ am_cv_proto_iconv_arg1="const" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" ++fi ++ ++ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- ++ }$am_cv_proto_iconv" >&5 ++$as_echo "${ac_t:- ++ }$am_cv_proto_iconv" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++#define ICONV_CONST $am_cv_proto_iconv_arg1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- + -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif @@ -11054,8 +12066,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -#include <sys/time.h> -#endif -#include <sys/resource.h> -- -- ++ fi + + -int -main () -{ @@ -11087,31 +12100,54 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++$as_echo "#define ENABLE_UNICODE 1" >>confdefs.h + - ac_cv_type_rlim_t=yes --fi -- ++ ENCODING="utf-8" + fi ++DEFAULT_CHARSET="iso-8859-1" + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- + ++if test x$USE_UNICODE != xYES ; then ++# Check whether --enable-russian was given. ++if test "${enable_russian+set}" = set; then : ++ enableval=$enable_russian; if test "$enableval" = no; then ++ USE_CP866=NO ++ else ++ USE_CP866=YES ++ fi + + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi ++ ++if test x$USE_CP866 = xYES ; then ++ ++$as_echo "#define CP866 1" >>confdefs.h ++ ++ DEFAULT_CHARSET="CP866" ++fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5 -$as_echo "$ac_cv_type_rlim_t" >&6; } -if test "x$ac_cv_type_rlim_t" = x""yes; then -- --cat >>confdefs.h <<_ACEOF + ++ ++# Check whether --with-charset was given. ++if test "${with_charset+set}" = set; then : ++ withval=$with_charset; + cat >>confdefs.h <<_ACEOF -#define HAVE_RLIM_T 1 --_ACEOF -- -- --fi -- ++#define DEFAULT_CHARSET "$withval" + _ACEOF + + + fi + -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure @@ -11125,9 +12161,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. -- + -_ACEOF -- + -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. @@ -11149,7 +12185,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - esac ;; - esac - done -- + - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) @@ -11209,7 +12245,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -{ -static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)]; -test_array [0] = 0 -- + - ; - return 0; -} @@ -11236,7 +12272,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define DEFAULT_CHARSET "$DEFAULT_CHARSET" + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ @@ -11246,7 +12284,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -{ -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; -test_array [0] = 0 -- + - ; - return 0; -} @@ -11273,21 +12311,30 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` --fi -- ++ ++# Check whether --enable-memdebug was given. ++if test "${enable_memdebug+set}" = set; then : ++ enableval=$enable_memdebug; if test "$enableval" = no; then ++ USE_MEMDEBUG=NO ++ else ++ USE_MEMDEBUG=YES ++ fi ++ + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -11300,7 +12347,19 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -{ -static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)]; -test_array [0] = 0 -- ++if test x$USE_MEMDEBUG = xYES ; then ++ ++$as_echo "#define ENABLE_MEMDEBUG 1" >>confdefs.h ++ ++fi ++ if test x$USE_MEMDEBUG = xYES; then ++ ENABLE_MEMDEBUG_TRUE= ++ ENABLE_MEMDEBUG_FALSE='#' ++else ++ ENABLE_MEMDEBUG_TRUE='#' ++ ENABLE_MEMDEBUG_FALSE= ++fi + - ; - return 0; -} @@ -11330,18 +12389,30 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default --int --main () --{ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ + int + main () + { -static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)]; -test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF + + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -11361,147 +12432,45 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ haveit= -+ for x in $LDFLAGS $LIBICONV; do - +- - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` --fi -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ acl_save_exec_prefix="$exec_prefix" -+ exec_prefix="$acl_final_exec_prefix" -+ eval x=\"$x\" -+ exec_prefix="$acl_save_exec_prefix" -+ prefix="$acl_save_prefix" - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" -+ fi -+ fi -+ haveit= -+ for x in $LDFLAGS $LTLIBICONV; do - ac_lo= ac_hi= --fi -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ acl_save_exec_prefix="$exec_prefix" -+ exec_prefix="$acl_final_exec_prefix" -+ eval x=\"$x\" -+ exec_prefix="$acl_save_exec_prefix" -+ prefix="$acl_save_prefix" ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=no + fi ++rm -f conftest* -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" -+ fi -+ fi -+ fi -+ fi -+ ;; -+ -R*) -+ dir=`echo "X$dep" | sed -e 's/^X-R//'` -+ if test "$enable_rpath" != no; then -+ haveit= -+ for x in $rpathdirs; do -+ if test "X$x" = "X$dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ rpathdirs="$rpathdirs $dir" -+ fi -+ haveit= -+ for x in $ltrpathdirs; do -+ if test "X$x" = "X$dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ ltrpathdirs="$ltrpathdirs $dir" -+ fi -+ fi -+ ;; -+ -l*) -+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` -+ ;; -+ *.la) -+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` -+ ;; -+ *) -+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" -+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" -+ ;; -+ esac -+ done -+ fi -+ else -+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" -+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" -+ fi -+ fi -+ fi -+ done -+ done -+ if test "X$rpathdirs" != "X"; then -+ if test -n "$hardcode_libdir_separator"; then -+ alldirs= -+ for found_dir in $rpathdirs; do -+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" -+ done -+ acl_save_libdir="$libdir" -+ libdir="$alldirs" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" -+ else -+ for found_dir in $rpathdirs; do -+ acl_save_libdir="$libdir" -+ libdir="$found_dir" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" -+ done -+ fi -+ fi -+ if test "X$ltrpathdirs" != "X"; then -+ for found_dir in $ltrpathdirs; do -+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" -+ done -+ fi + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. @@ -11512,18 +12481,22 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; -test_array [0] = 0 ++#include <stdlib.h> - ; - return 0; -} --_ACEOF + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -11543,12 +12516,18 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid --else ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* - ac_lo=`expr '(' $ac_mid ')' + 1` --fi + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done @@ -11566,22 +12545,40 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - ac_cv_sizeof_short=0 - fi ;; -esac --else ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (short)); } -static unsigned long int ulongval () { return (long int) (sizeof (short)); } -#include <stdio.h> --#include <stdlib.h> --int --main () --{ - ++#include <ctype.h> + #include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int + main () + { +- - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; @@ -11602,11 +12599,16 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - +- - ; -- return 0; --} --_ACEOF ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; + return 0; + } + _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -11634,6 +12636,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -if test "$ac_cv_type_short" = yes; then @@ -11650,38 +12653,29 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi ++else ++ ac_cv_header_stdc=no + fi -rm -f conftest.val --fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } -+ am_save_CPPFLAGS="$CPPFLAGS" - -+ for element in $INCICONV; do -+ haveit= -+ for x in $CPPFLAGS; do +- -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ acl_save_exec_prefix="$exec_prefix" -+ exec_prefix="$acl_final_exec_prefix" -+ eval x=\"$x\" -+ exec_prefix="$acl_save_exec_prefix" -+ prefix="$acl_save_prefix" ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -_ACEOF -+ if test "X$x" = "X$element"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" -+ fi -+ done ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h ++fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects @@ -11690,9 +12684,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -{ $as_echo "$as_me:$LINENO: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -+$as_echo_n "checking for iconv... " >&6; } -+if test "${am_cv_func_iconv+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 ++$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } ++if test "${ac_cv_header_stdbool_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then @@ -11702,23 +12696,49 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ -+ am_cv_func_iconv="no, consider installing GNU libiconv" -+ am_cv_lib_iconv=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -+#include <stdlib.h> -+#include <iconv.h> ++ ++#include <stdbool.h> ++#ifndef bool ++# error bool is not defined ++#endif ++#ifndef false ++# error false is not defined ++#endif ++#if false ++# error false is not 0 ++#endif ++#ifndef true ++# error true is not defined ++#endif ++#if true != 1 ++# error true is not 1 ++#endif ++#ifndef __bool_true_false_are_defined ++# error __bool_true_false_are_defined is not defined ++#endif ++ ++ struct s { _Bool s: 1; _Bool t; } s; ++ ++ char a[true == 1 ? 1 : -1]; ++ char b[false == 0 ? 1 : -1]; ++ char c[__bool_true_false_are_defined == 1 ? 1 : -1]; ++ char d[(bool) -0.5 == true ? 1 : -1]; ++ bool e = &s; ++ char f[(_Bool) -0.0 == false ? 1 : -1]; ++ char g[true]; ++ char h[sizeof (_Bool)]; ++ char i[sizeof s.t]; ++ int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)]; -test_array [0] = 0 - -+iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd); ++ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ; return 0; } @@ -11745,31 +12765,55 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdbool_h=yes ++else ++ ac_cv_header_stdbool_h=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 ++$as_echo "$ac_cv_header_stdbool_h" >&6; } ++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" ++if test "x$ac_cv_type__Bool" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE__BOOL 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ am_cv_func_iconv=yes ++ ++ +fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "$am_cv_func_iconv" != yes; then -+ am_save_LIBS="$LIBS" -+ LIBS="$LIBS $LIBICONV" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ ++if test $ac_cv_header_stdbool_h = yes; then ++ ++$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h ++ ++fi ++ ++ac_header_dirent=no ++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do ++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 ++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -+#include <stdlib.h> -+#include <iconv.h> ++#include <sys/types.h> ++#include <$ac_hdr> ++ int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; -test_array [0] = 0 - -+iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd); ++if ((DIR *) 0) ++return 0; ; return 0; } @@ -11793,17 +12837,23 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$as_ac_Header=yes" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_link "$LINENO"; then : -+ am_cv_lib_iconv=yes -+ am_cv_func_iconv=yes ++ eval "$as_ac_Header=no" +fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$am_save_LIBS" -+ fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$as_ac_Header ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 ++_ACEOF - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then @@ -11811,65 +12861,46 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` ++ac_header_dirent=$ac_hdr; break fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -+$as_echo "$am_cv_func_iconv" >&6; } -+ if test "$am_cv_func_iconv" = yes; then -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -+$as_echo "#define HAVE_ICONV 1" >>confdefs.h -+ -+ fi -+ if test "$am_cv_lib_iconv" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -+$as_echo_n "checking how to link with libiconv... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -+$as_echo "$LIBICONV" >&6; } -+ else -+ CPPFLAGS="$am_save_CPPFLAGS" -+ LIBICONV= -+ LTLIBICONV= -+ fi -+ -+ -+ -+ if test "$am_cv_func_iconv" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -+$as_echo_n "checking for iconv declaration... " >&6; } -+ if test "${am_cv_proto_iconv+set}" = set; then : ++done ++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++if test $ac_header_dirent = dirent.h; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default + -+#include <stdlib.h> -+#include <iconv.h> -+extern ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus -+"C" -+#endif -+#if defined(__STDC__) || defined(__cplusplus) -+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -+#else -+size_t iconv(); ++extern "C" +#endif -+ ++char opendir (); int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)]; -test_array [0] = 0 - +- ++return opendir (); ; return 0; } @@ -11896,161 +12927,69 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+if ac_fn_c_try_compile "$LINENO"; then : -+ am_cv_proto_iconv_arg1="" -+else -+ am_cv_proto_iconv_arg1="const" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -+fi -+ -+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- -+ }$am_cv_proto_iconv" >&5 -+$as_echo "${ac_t:- -+ }$am_cv_proto_iconv" >&6; } -+ -+cat >>confdefs.h <<_ACEOF -+#define ICONV_CONST $am_cv_proto_iconv_arg1 -+_ACEOF -+ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++for ac_lib in '' dir; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi -+ -+ -+$as_echo "#define ENABLE_UNICODE 1" >>confdefs.h -+ -+ ENCODING="utf-8" ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_opendir=$ac_res +fi -+DEFAULT_CHARSET="iso-8859-1" -+ -+ -+if test x$USE_UNICODE != xYES ; then -+# Check whether --enable-russian was given. -+if test "${enable_russian+set}" = set; then : -+ enableval=$enable_russian; if test "$enableval" = no; then -+ USE_CP866=NO -+ else -+ USE_CP866=YES -+ fi -+ ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : ++ break +fi ++done ++if test "${ac_cv_search_opendir+set}" = set; then : + -+ -+if test x$USE_CP866 = xYES ; then -+ -+$as_echo "#define CP866 1" >>confdefs.h -+ -+ DEFAULT_CHARSET="CP866" -+fi ++else ++ ac_cv_search_opendir=no +fi -+ -+ -+# Check whether --with-charset was given. -+if test "${with_charset+set}" = set; then : -+ withval=$with_charset; -+cat >>confdefs.h <<_ACEOF -+#define DEFAULT_CHARSET "$withval" -+_ACEOF -+ -+ ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS +fi -+ -+ -+ -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define DEFAULT_CHARSET "$DEFAULT_CHARSET" - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ -+ -+ -+# Check whether --enable-memdebug was given. -+if test "${enable_memdebug+set}" = set; then : -+ enableval=$enable_memdebug; if test "$enableval" = no; then -+ USE_MEMDEBUG=NO -+ else -+ USE_MEMDEBUG=YES -+ fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 ++$as_echo "$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + -+ -+if test x$USE_MEMDEBUG = xYES ; then -+ -+$as_echo "#define ENABLE_MEMDEBUG 1" >>confdefs.h -+ -+fi -+ if test x$USE_MEMDEBUG = xYES; then -+ ENABLE_MEMDEBUG_TRUE= -+ ENABLE_MEMDEBUG_FALSE='#' +else -+ ENABLE_MEMDEBUG_TRUE='#' -+ ENABLE_MEMDEBUG_FALSE= -+fi -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test "${ac_cv_prog_CPP+set}" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else -+ # Double quotes because CPP needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default --int --main () --{ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char opendir (); + int + main () + { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)]; -test_array [0] = 0 -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : - -- ; -- return 0; --} -+else -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> +- ++return opendir (); + ; + return 0; + } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" @@ -12071,73 +13010,55 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -+if ac_fn_c_try_cpp "$LINENO"; then : -+ # Broken: success on invalid input. -+continue - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+rm -f conftest.err conftest.$ac_ext - +- - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ break ++for ac_lib in '' x; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_opendir=$ac_res fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_opendir+set}" = set; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -+ done -+ ac_cv_prog_CPP=$CPP -+ -+fi -+ CPP=$ac_cv_prog_CPP else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_search_opendir=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 ++$as_echo "$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + - ac_lo= ac_hi= -+ ac_cv_prog_CPP=$CPP fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } -+ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ # Broken: fails on valid input. -+continue fi -+rm -f conftest.err conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. @@ -12148,21 +13069,29 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 ++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } ++if test "${ac_cv_header_time+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default --int --main () --{ ++#include <sys/types.h> ++#include <sys/time.h> ++#include <time.h> ++ + int + main () + { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; -test_array [0] = 0 - -- ; -- return 0; --} -+#include <ac_nonexistent.h> ++if ((struct tm *) 0) ++return 0; + ; + return 0; + } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" @@ -12183,22 +13112,26 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -+if ac_fn_c_try_cpp "$LINENO"; then : -+ # Broken: success on invalid input. -+continue ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_time=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_header_time=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 ++$as_echo "$ac_cv_header_time" >&6; } ++if test $ac_cv_header_time = yes; then ++ ++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + - ac_lo=`expr '(' $ac_mid ')' + 1` -+ # Passes both tests. -+ac_preproc_ok=: -+break fi -+rm -f conftest.err conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +-done -case $ac_lo in -?*) ac_cv_sizeof_int=$ac_lo;; -'') if test "$ac_cv_type_int" = yes; then @@ -12216,7 +13149,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++for ac_header in syslog.h sys/param.h fcntl.h string.h strings.h unistd.h sys/time.h sys/select.h inttypes.h stdarg.h stdint.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ @@ -12228,7 +13169,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -int -main () -{ -- + - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; @@ -12249,14 +13190,22 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : ++fi - ; - return 0; -} --_ACEOF ++done ++ ++for ac_header in limits.h float.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -12280,16 +13229,23 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_int=`cat conftest.val` ++ else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ for ac_header in values.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default" ++if test "x$ac_cv_header_values_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_VALUES_H 1 ++_ACEOF + -( exit $ac_status ) -if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (int) @@ -12298,29 +13254,43 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - else - ac_cv_sizeof_int=0 - fi -+as_fn_error "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." "$LINENO" 5; } fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi ++ ++done ++ + fi -rm -f conftest.val --fi ++ ++done ++ ++ ++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" ++if test "x$ac_cv_type_pid_t" = x""yes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define pid_t int ++_ACEOF ++ + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" ++if test "x$ac_cv_type_size_t" = x""yes; then : ++else --cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int --_ACEOF -- -- ++#define size_t unsigned int + _ACEOF + ++fi + -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -12328,9 +13298,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -{ $as_echo "$as_me:$LINENO: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 ++$as_echo_n "checking for uid_t in sys/types.h... " >&6; } ++if test "${ac_cv_type_uid_t+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then @@ -12340,62 +13310,26 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; -test_array [0] = 0 -- ++#include <sys/types.h> + - ; - return 0; -} --_ACEOF + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 @@ -12412,91 +13346,79 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "uid_t" >/dev/null 2>&1; then : ++ ac_cv_type_uid_t=yes ++else ++ ac_cv_type_uid_t=no ++fi ++rm -f conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 ++$as_echo "$ac_cv_type_uid_t" >&6; } ++if test $ac_cv_type_uid_t = no; then ++ ++$as_echo "#define uid_t int" >>confdefs.h ++ ++ ++$as_echo "#define gid_t int" >>confdefs.h ++ ++fi ++ ++for ac_header in sys/select.h sys/socket.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ ++ ++fi ++ ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 ++$as_echo_n "checking types of arguments for select... " >&6; } ++if test "${ac_cv_func_select_args+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ for ac_arg234 in 'fd_set *' 'int *' 'void *'; do ++ for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do ++ for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default ++#ifdef HAVE_SYS_SELECT_H ++# include <sys/select.h> ++#endif ++#ifdef HAVE_SYS_SOCKET_H ++# include <sys/socket.h> ++#endif ++ + int + main () + { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; -test_array [0] = 0 - -- ; -- return 0; --} --_ACEOF +- ++extern int select ($ac_arg1, ++ $ac_arg234, $ac_arg234, $ac_arg234, ++ $ac_arg5); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 @@ -12510,66 +13432,59 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_path_EGREP=$EGREP -+fi - +- - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -+ fi ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- done +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++ done ++done ++# Provide a safe default value. ++: ${ac_cv_func_select_args='int,int *,struct timeval *'} ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 ++$as_echo "$ac_cv_func_select_args" >&6; } ++ac_save_IFS=$IFS; IFS=',' ++set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` ++IFS=$ac_save_IFS ++shift - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define SELECT_TYPE_ARG1 $1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -+#include <stdlib.h> -+#include <stdarg.h> -+#include <string.h> -+#include <float.h> -+ - int - main () - { +-int +-main () +-{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; -test_array [0] = 0 - ; - return 0; - } +- ; +- return 0; +-} ++ ++cat >>confdefs.h <<_ACEOF ++#define SELECT_TYPE_ARG234 ($2) _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" @@ -12593,31 +13508,31 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SELECT_TYPE_ARG5 ($3) + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdc=yes -+else -+ ac_cv_header_stdc=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; -test_array [0] = 0 -+#include <string.h> - ; - return 0; -} ++rm -f conftest* ++ ++ac_fn_c_check_type "$LINENO" "uint" "ac_cv_type_uint" "$ac_includes_default" ++if test "x$ac_cv_type_uint" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" @@ -12638,15 +13553,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then @@ -12654,31 +13563,35 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - break - fi - ac_mid=`expr 2 '*' $ac_mid` ++ fi ++ac_fn_c_check_type "$LINENO" "ulong" "ac_cv_type_ulong" "$ac_includes_default" ++if test "x$ac_cv_type_ulong" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_ULONG 1 ++_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdlib.h> -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then : - ac_lo= ac_hi= -+else -+ ac_cv_header_stdc=no fi -+rm -f conftest* ++ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" ++if test "x$ac_cv_type_uint32_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT32_T 1 ++_ACEOF ++ -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ++ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default" ++if test "x$ac_cv_type_u_int32_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. @@ -12686,45 +13599,29 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define HAVE_U_INT32_T 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then : -+ : -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -+#include <ctype.h> -+#include <stdlib.h> -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif -+ -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) - int - main () - { +-int +-main () +-{ -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; -test_array [0] = 0 -- + - ; -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; - return 0; - } +- return 0; +-} ++ ++fi ++ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" ++if test "x$ac_cv_type_int32_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_INT32_T 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" @@ -12745,45 +13642,18 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -+if ac_fn_c_try_run "$LINENO"; then : -+ - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_header_stdc=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then -+ -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h -+ -+fi -+ -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - ac_lo=`expr '(' $ac_mid ')' + 1` ++ fi ++ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" ++if test "x$ac_cv_type_int16_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +-done -case $ac_lo in -?*) ac_cv_sizeof_long=$ac_lo;; -'') if test "$ac_cv_type_long" = yes; then @@ -12798,20 +13668,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - ac_cv_sizeof_long=0 - fi ;; -esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -+if test "${ac_cv_header_stdbool_h+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define HAVE_INT16_T 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (long)); } -static unsigned long int ulongval () { return (long int) (sizeof (long)); } @@ -12841,30 +13706,35 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; -+#include <stdbool.h> -+#ifndef bool -+# error bool is not defined -+#endif -+#ifndef false -+# error false is not defined -+#endif -+#if false -+# error false is not 0 -+#endif -+#ifndef true -+# error true is not defined -+#endif -+#if true != 1 -+# error true is not 1 -+#endif -+#ifndef __bool_true_false_are_defined -+# error __bool_true_false_are_defined is not defined -+#endif - ; - return 0; -} --_ACEOF ++fi ++ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default" ++if test "x$ac_cv_type_u_int16_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_U_INT16_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default" ++if test "x$ac_cv_type_uint16_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_UINT16_T 1 ++_ACEOF ++ ++ ++fi ++ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default" ++if test "x$ac_cv_type_u_int8_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_U_INT8_T 1 + _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -12892,17 +13762,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ struct s { _Bool s: 1; _Bool t; } s; -+ -+ char a[true == 1 ? 1 : -1]; -+ char b[false == 0 ? 1 : -1]; -+ char c[__bool_true_false_are_defined == 1 ? 1 : -1]; -+ char d[(bool) -0.5 == true ? 1 : -1]; -+ bool e = &s; -+ char f[(_Bool) -0.0 == false ? 1 : -1]; -+ char g[true]; -+ char h[sizeof (_Bool)]; -+ char i[sizeof s.t]; -( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then @@ -12916,61 +13775,151 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - else - ac_cv_sizeof_long=0 - fi --fi ++ + fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+int -+main () -+{ -+ return !a + !b + !c + !d + !e + !f + !g + !h + !i; -+ ; -+ return 0; -+} ++ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" ++if test "x$ac_cv_type_ssize_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_SSIZE_T 1 +_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdbool_h=yes -+else -+ ac_cv_header_stdbool_h=no ++ ++ fi -rm -f conftest.val -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ac_fn_c_check_type "$LINENO" "u_long" "ac_cv_type_u_long" "$ac_includes_default" ++if test "x$ac_cv_type_u_long" = x""yes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define u_long unsigned long ++_ACEOF ++ fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } -- -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -+$as_echo "$ac_cv_header_stdbool_h" >&6; } -+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -+if test "x$ac_cv_type__Bool" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define SIZEOF_LONG $ac_cv_sizeof_long -+#define HAVE__BOOL 1 - _ACEOF ++ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" " ++#include <signal.h> ++" ++if test "x$ac_cv_type_sig_atomic_t" = x""yes; then : --# The cast to long int works around a bug in the HP C Compiler --# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. --# This bug is HP SR number 8606223364. --{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5 --$as_echo_n "checking size of size_t... " >&6; } --if test "${ac_cv_sizeof_size_t+set}" = set; then + cat >>confdefs.h <<_ACEOF +-#define SIZEOF_LONG $ac_cv_sizeof_long ++#define HAVE_SIG_ATOMIC_T 1 ++_ACEOF ++ ++ +fi + -+if test $ac_cv_header_stdbool_h = yes; then ++ac_fn_c_check_type "$LINENO" "rlim_t" "ac_cv_type_rlim_t" " ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_TIME_H ++#include <sys/time.h> ++#endif ++#include <sys/resource.h> ++ ++" ++if test "x$ac_cv_type_rlim_t" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_RLIM_T 1 ++_ACEOF + -+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h + +fi + -+ac_header_dirent=no -+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do -+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : ++cat >confcache <<\_ACEOF ++# This file is a shell script that caches the results of configure ++# tests run on this system so they can be shared between configure ++# scripts and configure runs, see configure's option --config-cache. ++# It is not useful on other systems. If it contains results you don't ++# want to keep, you may remove or edit it. ++# ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. ++# ++# `ac_cv_env_foo' variables (set or unset) will be overridden when ++# loading this file, other *unset* `ac_cv_foo' will be assigned the ++# following values. ++ + _ACEOF + ++# The following way of writing the cache mishandles newlines in values, ++# but we know of no workaround that is simple, portable, and efficient. ++# So, we kill variables containing newlines. ++# Ultrix sh set writes to stderr and can't be redirected directly, ++# and sets the high bit in the cache file unless we assign to the vars. ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done + ++ (set) 2>&1 | ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. ++ sed -n \ ++ "s/'/'\\\\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ++ ;; #( ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | ++ sed ' ++ /^ac_cv_env_/b end ++ t clear ++ :clear ++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ ++ t end ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ fi ++fi ++rm -f confcache + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5 +-$as_echo_n "checking size of size_t... " >&6; } +-if test "${ac_cv_sizeof_size_t+set}" = set; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 ++$as_echo_n "checking size of short... " >&6; } ++if test "${ac_cv_sizeof_short+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then @@ -12980,24 +13929,18 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -+#include <sys/types.h> -+#include <$ac_hdr> -+ - int - main () - { +-int +-main () +-{ -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)]; -test_array [0] = 0 - -+if ((DIR *) 0) -+return 0; - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -13020,58 +13963,22 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$as_ac_Header=yes" -+else -+ eval "$as_ac_Header=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$as_ac_Header -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ -+ac_header_dirent=$ac_hdr; break -+fi -+ -+done -+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -+if test $ac_header_dirent = dirent.h; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -+$as_echo_n "checking for library containing opendir... " >&6; } -+if test "${ac_cv_search_opendir+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char opendir (); - int - main () - { +-int +-main () +-{ -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)]; -test_array [0] = 0 -- -+return opendir (); - ; - return 0; - } - _ACEOF ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : + +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -13091,37 +13998,19 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -+for ac_lib in '' dir; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_opendir=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then : -+ break -+fi -+done -+if test "${ac_cv_search_opendir+set}" = set; then : -+ else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_search_opendir=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS ++ if test "$ac_cv_type_short" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (short) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_short=0 ++ fi +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -+$as_echo "$ac_cv_search_opendir" >&6; } -+ac_res=$ac_cv_search_opendir -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then @@ -13130,46 +14019,32 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 ++$as_echo "$ac_cv_sizeof_short" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -+$as_echo_n "checking for library containing opendir... " >&6; } -+if test "${ac_cv_search_opendir+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char opendir (); - int - main () - { +-int +-main () +-{ -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)]; -test_array [0] = 0 -- -+return opendir (); - ; - return 0; - } - _ACEOF + +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -13192,67 +14067,23 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_SHORT $ac_cv_sizeof_short + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+for ac_lib in '' x; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_opendir=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then : -+ break -+fi -+done -+if test "${ac_cv_search_opendir+set}" = set; then : -+ -+else -+ ac_cv_search_opendir=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -+$as_echo "$ac_cv_search_opendir" >&6; } -+ac_res=$ac_cv_search_opendir -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -+if test "${ac_cv_header_time+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -+#include <sys/types.h> -+#include <sys/time.h> -+#include <time.h> -+ - int - main () - { +-int +-main () +-{ -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)]; -test_array [0] = 0 -- -+if ((struct tm *) 0) -+return 0; - ; - return 0; - } - _ACEOF + +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -13272,20 +14103,19 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_time=yes ++ ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 ++$as_echo_n "checking size of int... " >&6; } ++if test "${ac_cv_sizeof_int+set}" = set; then : ++ $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_header_time=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -+$as_echo "$ac_cv_header_time" >&6; } -+if test $ac_cv_header_time = yes; then -+ -+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then @@ -13293,78 +14123,32 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - break - fi - ac_mid=`expr 2 '*' $ac_mid` ++else ++ if test "$ac_cv_type_int" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (int) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_int=0 ++ fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -+for ac_header in syslog.h sys/param.h fcntl.h string.h strings.h unistd.h sys/time.h sys/select.h inttypes.h stdarg.h stdint.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+for ac_header in limits.h float.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+else -+ for ac_header in values.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default" -+if test "x$ac_cv_header_values_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_VALUES_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+fi -+ -+done -+ -+ -+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -+if test "x$ac_cv_type_pid_t" = x""yes; then : -+ -+else -+ -+cat >>confdefs.h <<_ACEOF -+#define pid_t int -+_ACEOF -+ -+fi -+ -+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -+if test "x$ac_cv_type_size_t" = x""yes; then : -+ - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 ++$as_echo "$ac_cv_sizeof_int" >&6; } - ac_lo= ac_hi= -fi -+cat >>confdefs.h <<_ACEOF -+#define size_t unsigned int -+_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. @@ -13372,28 +14156,23 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_INT $ac_cv_sizeof_int + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -+$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -+if test "${ac_cv_type_uid_t+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)]; -test_array [0] = 0 -+#include <sys/types.h> - ; - return 0; -} - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -13413,21 +14192,22 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "uid_t" >/dev/null 2>&1; then : -+ ac_cv_type_uid_t=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_type_uid_t=no -+fi -+rm -f conftest* - ac_lo=`expr '(' $ac_mid ')' + 1` - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -+$as_echo "$ac_cv_type_uid_t" >&6; } -+if test $ac_cv_type_uid_t = no; then +-fi ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 ++$as_echo_n "checking size of long... " >&6; } ++if test "${ac_cv_sizeof_long+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done @@ -13435,47 +14215,41 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -?*) ac_cv_sizeof_size_t=$ac_lo;; -'') if test "$ac_cv_type_size_t" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++else ++ if test "$ac_cv_type_long" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } -- else ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (long) ++See \`config.log' for more details." "$LINENO" 5; }; } + else - ac_cv_sizeof_size_t=0 - fi ;; -esac -+$as_echo "#define uid_t int" >>confdefs.h -+ -+ -+$as_echo "#define gid_t int" >>confdefs.h -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if test "${ac_cv_type_signal+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -static long int longval () { return (long int) (sizeof (size_t)); } -static unsigned long int ulongval () { return (long int) (sizeof (size_t)); } -#include <stdio.h> -#include <stdlib.h> -+#include <sys/types.h> -+#include <signal.h> -+ - int - main () - { -- +-int +-main () +-{ ++ ac_cv_sizeof_long=0 ++ fi ++fi + - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; @@ -13496,11 +14270,17 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; -- -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 ++$as_echo "$ac_cv_sizeof_long" >&6; } + +- ; +- return 0; +-} ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" @@ -13525,104 +14305,80 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_size_t=`cat conftest.val` -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_type_signal=int ++ ++ ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 ++$as_echo_n "checking size of size_t... " >&6; } ++if test "${ac_cv_sizeof_size_t+set}" = set; then : ++ $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : + -( exit $ac_status ) -if test "$ac_cv_type_size_t" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++else ++ if test "$ac_cv_type_size_t" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (size_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } -- else -- ac_cv_sizeof_size_t=0 -- fi -+ ac_cv_type_signal=void ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (size_t) ++See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_size_t=0 + fi fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 --$as_echo "$ac_cv_sizeof_size_t" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } - -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 + $as_echo "$ac_cv_sizeof_size_t" >&6; } --cat >>confdefs.h <<_ACEOF --#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t -+for ac_header in sys/select.h sys/socket.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF +@@ -12335,19 +7833,15 @@ -+fi -+done -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5 --$as_echo_n "checking for working memcmp... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 + $as_echo_n "checking for working memcmp... " >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 -+$as_echo_n "checking types of arguments for select... " >&6; } -+if test "${ac_cv_func_select_args+set}" = set; then : ++if test "${ac_cv_func_memcmp_working+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then -- ac_cv_func_memcmp_working=no --else ++ if test "$cross_compiling" = yes; then : + ac_cv_func_memcmp_working=no + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ for ac_arg234 in 'fd_set *' 'int *' 'void *'; do -+ for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do -+ for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default -+#ifdef HAVE_SYS_SELECT_H -+# include <sys/select.h> -+#endif -+#ifdef HAVE_SYS_SOCKET_H -+# include <sys/socket.h> -+#endif -+ int - main () - { -- -- /* Some versions of memcmp are not 8-bit clean. */ -- char c0 = '\100', c1 = '\200', c2 = '\201'; -- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) -- return 1; -- -- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes -- or more and with at least one buffer not starting on a 4-byte boundary. -- William Lewis provided this test program. */ -- { -- char foo[21]; -- char bar[21]; -- int i; +@@ -12366,329 +7860,75 @@ + char foo[21]; + char bar[21]; + int i; - for (i = 0; i < 4; i++) - { - char *a = foo + i; @@ -13635,13 +14391,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - return 0; - } - -+extern int select ($ac_arg1, -+ $ac_arg234, $ac_arg234, $ac_arg234, -+ $ac_arg5); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -13675,18 +14428,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 - fi +-fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+ done -+done -+# Provide a safe default value. -+: ${ac_cv_func_select_args='int,int *,struct timeval *'} - - fi +- +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -$as_echo "$ac_cv_func_memcmp_working" >&6; } -test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in @@ -13694,22 +14439,10 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" - ;; -esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 -+$as_echo "$ac_cv_func_select_args" >&6; } -+ac_save_IFS=$IFS; IFS=',' -+set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` -+IFS=$ac_save_IFS -+shift - -+cat >>confdefs.h <<_ACEOF -+#define SELECT_TYPE_ARG1 $1 -+_ACEOF - - -+cat >>confdefs.h <<_ACEOF -+#define SELECT_TYPE_ARG234 ($2) -+_ACEOF - +- +- +- +- -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -13729,24 +14462,13 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ -+cat >>confdefs.h <<_ACEOF -+#define SELECT_TYPE_ARG5 ($3) - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -+ -+rm -f conftest* -+ -+ac_fn_c_check_type "$LINENO" "uint" "ac_cv_type_uint" "$ac_includes_default" -+if test "x$ac_cv_type_uint" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_UINT 1 - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -13769,38 +14491,25 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_compiler=no -fi - +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+fi -+ac_fn_c_check_type "$LINENO" "ulong" "ac_cv_type_ulong" "$ac_includes_default" -+if test "x$ac_cv_type_ulong" = x""yes; then : - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_ULONG 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -+ -+ -+fi -+ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" -+if test "x$ac_cv_type_uint32_t" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_UINT32_T 1 - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -13822,20 +14531,14 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_preproc=no -+ - fi -+ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default" -+if test "x$ac_cv_type_u_int32_t" = x""yes; then : - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -+cat >>confdefs.h <<_ACEOF -+#define HAVE_U_INT32_T 1 -+_ACEOF - +- -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -13858,7 +14561,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - +- - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -13867,35 +14570,25 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" - fi +-fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" -+if test "x$ac_cv_type_int32_t" = x""yes; then : - +- -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+cat >>confdefs.h <<_ACEOF -+#define HAVE_INT32_T 1 - _ACEOF - -+ - fi -+ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" -+if test "x$ac_cv_type_int16_t" = x""yes; then : - +-_ACEOF +- +-fi +- -done -+cat >>confdefs.h <<_ACEOF -+#define HAVE_INT16_T 1 -+_ACEOF - - +- +- -for ac_func in getpagesize -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -13906,39 +14599,27 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+fi -+ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default" -+if test "x$ac_cv_type_u_int16_t" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_U_INT16_T 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - +- -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -+fi -+ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default" -+if test "x$ac_cv_type_uint16_t" = x""yes; then : - +- -#undef $ac_func -+cat >>confdefs.h <<_ACEOF -+#define HAVE_UINT16_T 1 -+_ACEOF - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -13952,20 +14633,25 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif ++ for (i = 0; i < 4; i++) ++ { ++ char *a = foo + i; ++ char *b = bar + i; ++ strcpy (a, "--------01111111"); ++ strcpy (b, "--------10000000"); ++ if (memcmp (a, b, 16) >= 0) ++ return 1; ++ } ++ return 0; ++ } -int -main () -{ -return $ac_func (); -- ; -- return 0; --} -+fi -+ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default" -+if test "x$ac_cv_type_u_int8_t" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_U_INT8_T 1 + ; + return 0; + } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -13989,12 +14675,37 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_memcmp_working=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_func_memcmp_working=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi - eval "$as_ac_var=no" --fi + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 ++$as_echo "$ac_cv_func_memcmp_working" >&6; } ++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in ++ *" memcmp.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ++ ;; ++esac ++ ++ ++for ac_header in stdlib.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ @@ -14007,280 +14718,45 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -+if test "x$ac_cv_type_ssize_t" = x""yes; then : + -+cat >>confdefs.h <<_ACEOF -+#define HAVE_SSIZE_T 1 ++done ++ ++for ac_func in getpagesize ++do : ++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" ++if test "x$ac_cv_func_getpagesize" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_GETPAGESIZE 1 _ACEOF -+ fi --done + done -{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 --$as_echo_n "checking for working mmap... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 + $as_echo_n "checking for working mmap... " >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - if test "$cross_compiling" = yes; then -- ac_cv_func_mmap_fixed_mapped=no -+ac_fn_c_check_type "$LINENO" "u_long" "ac_cv_type_u_long" "$ac_includes_default" -+if test "x$ac_cv_type_u_long" = x""yes; then : -+ ++ if test "$cross_compiling" = yes; then : + ac_cv_func_mmap_fixed_mapped=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ -+cat >>confdefs.h <<_ACEOF -+#define u_long unsigned long - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --/* malloc might have been renamed as rpl_malloc. */ --#undef malloc - --/* Thanks to Mike Haertel and Jim Avera for this test. -- Here is a matrix of mmap possibilities: -- mmap private not fixed -- mmap private fixed at somewhere currently unmapped -- mmap private fixed at somewhere already mapped -- mmap shared not fixed -- mmap shared fixed at somewhere currently unmapped -- mmap shared fixed at somewhere already mapped -- For private mappings, we should verify that changes cannot be read() -- back from the file, nor mmap's back from the file at a different -- address. (There have been systems where private was not correctly -- implemented like the infamous i386 svr4.0, and systems where the -- VM page cache was not coherent with the file system buffer cache -- like early versions of FreeBSD and possibly contemporary NetBSD.) -- For shared mappings, we should conversely verify that changes get -- propagated back to all the places they're supposed to be. -+fi - -- Grep wants private fixed already mapped. -- The main things grep needs to know about mmap are: -- * does it exist and is it safe to write into the mmap'd area -- * how to use it (BSD variants) */ -+ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" " -+#include <signal.h> - --#include <fcntl.h> --#include <sys/mman.h> -+" -+if test "x$ac_cv_type_sig_atomic_t" = x""yes; then : - --#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H --char *malloc (); -+cat >>confdefs.h <<_ACEOF -+#define HAVE_SIG_ATOMIC_T 1 -+_ACEOF -+ -+ -+fi -+ -+ac_fn_c_check_type "$LINENO" "rlim_t" "ac_cv_type_rlim_t" " -+#ifdef HAVE_SYS_TYPES_H -+#include <sys/types.h> -+#endif -+#ifdef HAVE_SYS_TIME_H -+#include <sys/time.h> - #endif -+#include <sys/resource.h> - --/* This mess was copied from the GNU getpagesize.h. */ --#ifndef HAVE_GETPAGESIZE --/* Assume that all systems that can run configure have sys/param.h. */ --# ifndef HAVE_SYS_PARAM_H --# define HAVE_SYS_PARAM_H 1 --# endif -+" -+if test "x$ac_cv_type_rlim_t" = x""yes; then : - --# ifdef _SC_PAGESIZE --# define getpagesize() sysconf(_SC_PAGESIZE) --# else /* no _SC_PAGESIZE */ --# ifdef HAVE_SYS_PARAM_H --# include <sys/param.h> --# ifdef EXEC_PAGESIZE --# define getpagesize() EXEC_PAGESIZE --# else /* no EXEC_PAGESIZE */ --# ifdef NBPG --# define getpagesize() NBPG * CLSIZE --# ifndef CLSIZE --# define CLSIZE 1 --# endif /* no CLSIZE */ --# else /* no NBPG */ --# ifdef NBPC --# define getpagesize() NBPC --# else /* no NBPC */ --# ifdef PAGESIZE --# define getpagesize() PAGESIZE --# endif /* PAGESIZE */ --# endif /* no NBPC */ --# endif /* no NBPG */ --# endif /* no EXEC_PAGESIZE */ --# else /* no HAVE_SYS_PARAM_H */ --# define getpagesize() 8192 /* punt totally */ --# endif /* no HAVE_SYS_PARAM_H */ --# endif /* no _SC_PAGESIZE */ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_RLIM_T 1 -+_ACEOF - --#endif /* no HAVE_GETPAGESIZE */ - --int --main () --{ -- char *data, *data2, *data3; -- int i, pagesize; -- int fd; -+fi -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# `ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ cat confcache >$cache_file -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ fi -+fi -+rm -f confcache -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -+$as_echo_n "checking size of short... " >&6; } -+if test "${ac_cv_sizeof_short+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : -+ -+else -+ if test "$ac_cv_type_short" = yes; then -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (short) -+See \`config.log' for more details." "$LINENO" 5; }; } -+ else -+ ac_cv_sizeof_short=0 -+ fi -+fi - -- pagesize = getpagesize (); -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -+$as_echo "$ac_cv_sizeof_short" >&6; } - -- /* First, make a file with some known garbage in it. */ -- data = (char *) malloc (pagesize); -- if (!data) -- return 1; -- for (i = 0; i < pagesize; ++i) -- *(data + i) = rand (); -- umask (0); -- fd = creat ("conftest.mmap", 0600); -- if (fd < 0) -- return 1; -- if (write (fd, data, pagesize) != pagesize) -- return 1; -- close (fd); - -- /* Next, try to mmap the file at a fixed address which already has -- something else allocated at it. If we can, also make sure that -- we see the same garbage. */ -- fd = open ("conftest.mmap", O_RDWR); -- if (fd < 0) -- return 1; -- data2 = (char *) malloc (2 * pagesize); -- if (!data2) -- return 1; -- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); -- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, -- MAP_PRIVATE | MAP_FIXED, fd, 0L)) -- return 1; -- for (i = 0; i < pagesize; ++i) -- if (*(data + i) != *(data2 + i)) -- return 1; - -- /* Finally, make sure that changes to the mapped area do not -- percolate back to the file as seen by read(). (This is a bug on -- some variants of i386 svr4.0.) */ -- for (i = 0; i < pagesize; ++i) -- *(data2 + i) = *(data2 + i) + 1; -- data3 = (char *) malloc (pagesize); ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + /* malloc might have been renamed as rpl_malloc. */ +@@ -12806,465 +8046,75 @@ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); - if (!data3) - return 1; - if (read (fd, data3, pagesize) != pagesize) @@ -14291,9 +14767,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - close (fd); - return 0; -} -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_SHORT $ac_cv_sizeof_short - _ACEOF +-_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14317,73 +14791,40 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -+$as_echo_n "checking size of int... " >&6; } -+if test "${ac_cv_sizeof_int+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else +-else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - +- -( exit $ac_status ) -ac_cv_func_mmap_fixed_mapped=no -+else -+ if test "$ac_cv_type_int" = yes; then -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (int) -+See \`config.log' for more details." "$LINENO" 5; }; } -+ else -+ ac_cv_sizeof_int=0 -+ fi - fi +-fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -+$as_echo "$ac_cv_sizeof_int" >&6; } - - +-fi +- +- -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP 1 -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_INT $ac_cv_sizeof_int - _ACEOF - +-_ACEOF +- -fi -rm -f conftest.mmap - - +- -for ac_func in vprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -+$as_echo_n "checking size of long... " >&6; } -+if test "${ac_cv_sizeof_long+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -14393,35 +14834,20 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -+else -+ if test "$ac_cv_type_long" = yes; then -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (long) -+See \`config.log' for more details." "$LINENO" 5; }; } -+ else -+ ac_cv_sizeof_long=0 -+ fi -+fi - +- -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -+$as_echo "$ac_cv_sizeof_long" >&6; } - +- -#undef $ac_func - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -14435,7 +14861,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +- -int -main () -{ @@ -14443,9 +14869,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - ; - return 0; -} -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_LONG $ac_cv_sizeof_long - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14468,38 +14892,17 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+ -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 -+$as_echo_n "checking size of size_t... " >&6; } -+if test "${ac_cv_sizeof_size_t+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : - +- - eval "$as_ac_var=no" -+else -+ if test "$ac_cv_type_size_t" = yes; then -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (size_t) -+See \`config.log' for more details." "$LINENO" 5; }; } -+ else -+ ac_cv_sizeof_size_t=0 -+ fi - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi +-fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -14510,9 +14913,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -+$as_echo "$ac_cv_sizeof_size_t" >&6; } - +- -{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 -$as_echo_n "checking for _doprnt... " >&6; } -if test "${ac_cv_func__doprnt+set}" = set; then @@ -14527,23 +14928,20 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define _doprnt innocuous__doprnt - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - +- -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t -+_ACEOF - +- -#undef _doprnt - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -14557,51 +14955,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -#if defined __stub__doprnt || defined __stub____doprnt -choke me -#endif - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 -+$as_echo_n "checking for working memcmp... " >&6; } -+if test "${ac_cv_func_memcmp_working+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_memcmp_working=no -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$ac_includes_default - int - main () - { +- +-int +-main () +-{ -return _doprnt (); -+ -+ /* Some versions of memcmp are not 8-bit clean. */ -+ char c0 = '\100', c1 = '\200', c2 = '\201'; -+ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) -+ return 1; -+ -+ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes -+ or more and with at least one buffer not starting on a 4-byte boundary. -+ William Lewis provided this test program. */ -+ { -+ char foo[21]; -+ char bar[21]; -+ int i; -+ for (i = 0; i < 4; i++) -+ { -+ char *a = foo + i; -+ char *b = bar + i; -+ strcpy (a, "--------01111111"); -+ strcpy (b, "--------10000000"); -+ if (memcmp (a, b, 16) >= 0) -+ return 1; -+ } -+ return 0; -+ } -+ - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14624,135 +14986,70 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func__doprnt=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_memcmp_working=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func__doprnt=no -+ ac_cv_func_memcmp_working=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -$as_echo "$ac_cv_func__doprnt" >&6; } -if test "x$ac_cv_func__doprnt" = x""yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 -+$as_echo "$ac_cv_func_memcmp_working" >&6; } -+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in -+ *" memcmp.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" -+ ;; -+esac -+ -+ -+ - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -+ -+ for ac_header in $ac_header_list -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - +-_ACEOF +- -fi - done - - -@@ -12082,205 +7315,222 @@ - - - -+for ac_func in getpagesize -+do : -+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -+if test "x$ac_cv_func_getpagesize" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETPAGESIZE 1 -+_ACEOF - -+fi -+done - +- +-fi +-done +- +- +- +- +- +- +- +- +- +- -for ac_func in strchr strrchr memcpy memmove snprintf vsnprintf getopt_long -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -+$as_echo_n "checking for working mmap... " >&6; } -+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_mmap_fixed_mapped=no -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -+$ac_includes_default -+/* malloc might have been renamed as rpl_malloc. */ -+#undef malloc - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -+/* Thanks to Mike Haertel and Jim Avera for this test. -+ Here is a matrix of mmap possibilities: -+ mmap private not fixed -+ mmap private fixed at somewhere currently unmapped -+ mmap private fixed at somewhere already mapped -+ mmap shared not fixed -+ mmap shared fixed at somewhere currently unmapped -+ mmap shared fixed at somewhere already mapped -+ For private mappings, we should verify that changes cannot be read() -+ back from the file, nor mmap's back from the file at a different -+ address. (There have been systems where private was not correctly -+ implemented like the infamous i386 svr4.0, and systems where the -+ VM page cache was not coherent with the file system buffer cache -+ like early versions of FreeBSD and possibly contemporary NetBSD.) -+ For shared mappings, we should conversely verify that changes get -+ propagated back to all the places they're supposed to be. - +- -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -+ Grep wants private fixed already mapped. -+ The main things grep needs to know about mmap are: -+ * does it exist and is it safe to write into the mmap'd area -+ * how to use it (BSD variants) */ - +- -#undef $ac_func -+#include <fcntl.h> -+#include <sys/mman.h> - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -14765,112 +15062,20 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -+char *malloc (); - #endif - -+/* This mess was copied from the GNU getpagesize.h. */ -+#ifndef HAVE_GETPAGESIZE -+# ifdef _SC_PAGESIZE -+# define getpagesize() sysconf(_SC_PAGESIZE) -+# else /* no _SC_PAGESIZE */ -+# ifdef HAVE_SYS_PARAM_H -+# include <sys/param.h> -+# ifdef EXEC_PAGESIZE -+# define getpagesize() EXEC_PAGESIZE -+# else /* no EXEC_PAGESIZE */ -+# ifdef NBPG -+# define getpagesize() NBPG * CLSIZE -+# ifndef CLSIZE -+# define CLSIZE 1 -+# endif /* no CLSIZE */ -+# else /* no NBPG */ -+# ifdef NBPC -+# define getpagesize() NBPC -+# else /* no NBPC */ -+# ifdef PAGESIZE -+# define getpagesize() PAGESIZE -+# endif /* PAGESIZE */ -+# endif /* no NBPC */ -+# endif /* no NBPG */ -+# endif /* no EXEC_PAGESIZE */ -+# else /* no HAVE_SYS_PARAM_H */ -+# define getpagesize() 8192 /* punt totally */ -+# endif /* no HAVE_SYS_PARAM_H */ -+# endif /* no _SC_PAGESIZE */ -+ -+#endif /* no HAVE_GETPAGESIZE */ -+ - int - main () - { +-#endif +- +-int +-main () +-{ -return $ac_func (); - ; -+ char *data, *data2, *data3; -+ const char *cdata2; -+ int i, pagesize; -+ int fd, fd2; -+ -+ pagesize = getpagesize (); -+ -+ /* First, make a file with some known garbage in it. */ -+ data = (char *) malloc (pagesize); -+ if (!data) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ *(data + i) = rand (); -+ umask (0); -+ fd = creat ("conftest.mmap", 0600); -+ if (fd < 0) -+ return 2; -+ if (write (fd, data, pagesize) != pagesize) -+ return 3; -+ close (fd); -+ -+ /* Next, check that the tail of a page is zero-filled. File must have -+ non-zero length, otherwise we risk SIGBUS for entire page. */ -+ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); -+ if (fd2 < 0) -+ return 4; -+ cdata2 = ""; -+ if (write (fd2, cdata2, 1) != 1) -+ return 5; -+ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); -+ if (data2 == MAP_FAILED) -+ return 6; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data2 + i)) -+ return 7; -+ close (fd2); -+ if (munmap (data2, pagesize)) -+ return 8; -+ -+ /* Next, try to mmap the file at a fixed address which already has -+ something else allocated at it. If we can, also make sure that -+ we see the same garbage. */ -+ fd = open ("conftest.mmap", O_RDWR); -+ if (fd < 0) -+ return 9; -+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_FIXED, fd, 0L)) -+ return 10; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data2 + i)) -+ return 11; -+ -+ /* Finally, make sure that changes to the mapped area do not -+ percolate back to the file as seen by read(). (This is a bug on -+ some variants of i386 svr4.0.) */ -+ for (i = 0; i < pagesize; ++i) -+ *(data2 + i) = *(data2 + i) + 1; -+ data3 = (char *) malloc (pagesize); + if (!data3) -+ return 12; ++ return 1; + if (read (fd, data3, pagesize) != pagesize) -+ return 13; ++ return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) -+ return 14; ++ return 1; + close (fd); return 0; } @@ -14933,7 +15138,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure +$as_echo "#define HAVE_MMAP 1" >>confdefs.h +fi -+rm -f conftest.mmap conftest.txt ++rm -f conftest.mmap +for ac_func in vprintf +do : @@ -15061,7 +15266,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -12298,9 +7548,9 @@ +@@ -13282,9 +8132,9 @@ @@ -15073,7 +15278,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -12311,7 +7561,7 @@ +@@ -13295,7 +8145,7 @@ acl_cv_rpath=done fi @@ -15082,7 +15287,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" libext="$acl_cv_libext" -@@ -12321,7 +7571,7 @@ +@@ -13305,7 +8155,7 @@ hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. @@ -15091,7 +15296,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_rpath; : else enable_rpath=yes -@@ -12331,7 +7581,7 @@ +@@ -13315,7 +8165,7 @@ # Check whether --enable-transactions was given. @@ -15100,7 +15305,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_transactions; if test "$enableval" = no; then USE_TRANSACTIONS=NO fi -@@ -12350,7 +7600,7 @@ +@@ -13334,7 +8184,7 @@ fi # Check whether --enable-dummy was given. @@ -15109,7 +15314,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_dummy; fi -@@ -12374,22 +7624,18 @@ +@@ -13358,22 +8208,18 @@ if test x$USE_TRANSACTIONS = xNO ; then @@ -15135,7 +15340,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_dbshared_test; fi -@@ -12421,13 +7667,13 @@ +@@ -13405,13 +8251,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -15151,7 +15356,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac ;; esac done -@@ -12435,8 +7681,8 @@ +@@ -13419,8 +8265,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -15162,7 +15367,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -12459,180 +7705,42 @@ +@@ -13443,11 +8289,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -15176,26 +15381,26 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi --rm -f confcache -- --WITH_DB_ENGINE=db -- --# Check whether --with-database was given. +@@ -13456,7 +8302,7 @@ + WITH_DB_ENGINE=db + + # Check whether --with-database was given. -if test "${with_database+set}" = set; then -- withval=$with_database; WITH_DB_ENGINE=$withval -- --fi -- -- --case "x$WITH_DB_ENGINE" in -- xsqlite|xsqlite3) -- ++if test "${with_database+set}" = set; then : + withval=$with_database; WITH_DB_ENGINE=$withval + + fi +@@ -13465,158 +8311,20 @@ + case "x$WITH_DB_ENGINE" in + xsqlite|xsqlite3) + -cat >>confdefs.h <<\_ACEOF -#define ENABLE_SQLITE_DATASTORE 1 -_ACEOF -- -- DB_TYPE=sqlite -- DB_EXT=.db ++$as_echo "#define ENABLE_SQLITE_DATASTORE 1" >>confdefs.h + + DB_TYPE=sqlite + DB_EXT=.db - -for ac_header in sqlite3.h -do @@ -15248,13 +15453,11 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - - ac_header_compiler=no -fi -+rm -f confcache - +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+WITH_DB_ENGINE=db - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -15287,17 +15490,14 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+# Check whether --with-database was given. -+if test "${with_database+set}" = set; then : -+ withval=$with_database; WITH_DB_ENGINE=$withval - +- - ac_header_preproc=no - fi - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - +- -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -15320,9 +15520,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+case "x$WITH_DB_ENGINE" in -+ xsqlite|xsqlite3) - +- - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -15336,14 +15534,11 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+$as_echo "#define ENABLE_SQLITE_DATASTORE 1" >>confdefs.h - +- -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ DB_TYPE=sqlite -+ DB_EXT=.db + for ac_header in sqlite3.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default" @@ -15361,7 +15556,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi done -@@ -12642,9 +7750,9 @@ +@@ -13626,9 +8334,9 @@ @@ -15373,7 +15568,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -12665,7 +7773,7 @@ +@@ -13649,7 +8357,7 @@ # Check whether --with-libsqlite3-prefix was given. @@ -15382,7 +15577,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_libsqlite3_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -13031,7 +8139,7 @@ +@@ -14015,7 +8723,7 @@ ac_cv_libsqlite3_cppflags="$INCSQLITE3" fi @@ -15391,7 +15586,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_libsqlite3_libs" >&6; } LIBSQLITE3="$ac_cv_libsqlite3_libs" LTLIBSQLITE3="$ac_cv_libsqlite3_ltlibs" -@@ -13069,98 +8177,12 @@ +@@ -14053,98 +8761,12 @@ WITH_DB_ENGINE="sqlite3" saveLIBS="$LIBS" LIBS="$LIBDB $LIBS" @@ -15493,7 +15688,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi -@@ -13168,9 +8190,7 @@ +@@ -14152,9 +8774,7 @@ ;; xtokyocabinet) @@ -15504,7 +15699,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure DB_TYPE=tokyocabinet DB_EXT=.tc -@@ -13179,9 +8199,9 @@ +@@ -14163,9 +8783,9 @@ @@ -15516,7 +15711,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -13202,7 +8222,7 @@ +@@ -14186,7 +8806,7 @@ # Check whether --with-libtokyocabinet-prefix was given. @@ -15525,7 +15720,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_libtokyocabinet_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -13568,7 +8588,7 @@ +@@ -14552,7 +9172,7 @@ ac_cv_libtokyocabinet_cppflags="$INCTOKYOCABINET" fi @@ -15534,7 +15729,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_libtokyocabinet_libs" >&6; } LIBTOKYOCABINET="$ac_cv_libtokyocabinet_libs" LTLIBTOKYOCABINET="$ac_cv_libtokyocabinet_ltlibs" -@@ -13605,11 +8625,7 @@ +@@ -14589,11 +9209,7 @@ LIBDB="$LIBTOKYOCABINET" saveLIBS="$LIBS" LIBS="$LIBS $LIBDB" @@ -15547,7 +15742,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <tcutil.h> -@@ -13630,47 +8646,18 @@ +@@ -14614,47 +9230,18 @@ return 0; } _ACEOF @@ -15601,7 +15796,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure DB_TYPE=qdbm DB_EXT=.qdbm -@@ -13679,9 +8666,9 @@ +@@ -14663,9 +9250,9 @@ @@ -15613,7 +15808,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -13702,7 +8689,7 @@ +@@ -14686,7 +9273,7 @@ # Check whether --with-libqdbm-prefix was given. @@ -15622,7 +15817,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_libqdbm_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -14068,7 +9055,7 @@ +@@ -15052,7 +9639,7 @@ ac_cv_libqdbm_cppflags="$INCQDBM" fi @@ -15631,7 +15826,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_libqdbm_libs" >&6; } LIBQDBM="$ac_cv_libqdbm_libs" LTLIBQDBM="$ac_cv_libqdbm_ltlibs" -@@ -14105,11 +9092,7 @@ +@@ -15089,60 +9676,29 @@ LIBDB="$LIBQDBM" saveLIBS="$LIBS" LIBS="$LIBS $LIBDB" @@ -15644,10 +15839,18 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdlib.h> -@@ -14125,40 +9108,13 @@ - return 0; - } - _ACEOF + #include <depot.h> + +-int +-main () +-{ +- +- DEPOT *d = dpopen("", 0, 0); +- +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -15673,24 +15876,34 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_link "$LINENO"; then : ++int ++main () ++{ - { { $as_echo "$as_me:$LINENO: error: Cannot link to qdbm library." >&5 -$as_echo "$as_me: error: Cannot link to qdbm library." >&2;} - { (exit 1); exit 1; }; } -+else -+ as_fn_error "Cannot link to qdbm library." "$LINENO" 5 - fi -- +-fi ++ DEPOT *d = dpopen("", 0, 0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext ++else ++ as_fn_error "Cannot link to qdbm library." "$LINENO" 5 ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$saveLIBS" ;; xdb*) -@@ -14169,9 +9125,9 @@ +@@ -15153,9 +9709,9 @@ @@ -15702,7 +15915,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else -@@ -14192,7 +9148,7 @@ +@@ -15176,7 +9732,7 @@ # Check whether --with-libdb-prefix was given. @@ -15711,7 +15924,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_libdb_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -14558,7 +9514,7 @@ +@@ -15542,7 +10098,7 @@ ac_cv_libdb_cppflags="$INCDB" fi @@ -15720,58 +15933,32 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_libdb_libs" >&6; } LIBDB="$ac_cv_libdb_libs" LTLIBDB="$ac_cv_libdb_ltlibs" -@@ -14569,383 +9525,112 @@ - for x in $CPPFLAGS; do +@@ -15576,7 +10132,7 @@ + + - acl_save_prefix="$prefix" -- prefix="$acl_final_prefix" -- acl_save_exec_prefix="$exec_prefix" -- exec_prefix="$acl_final_exec_prefix" -- eval x=\"$x\" -- exec_prefix="$acl_save_exec_prefix" -- prefix="$acl_save_prefix" -- -- if test "X$x" = "X$element"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" -- fi -- done -- -- -- -- HAVE_LIBDB=yes -- -- -- - { $as_echo "$as_me:$LINENO: checking db and dependent libraries" >&5 --$as_echo_n "checking db and dependent libraries... " >&6; } -- saveLIBS="$LIBS" -- havelib=0 -- for dblibs in "" "$LIBDB" ; do -- for addlibs in "" -lpthread -lthread ; do -- LIBDB="$dblibs $addlibs" -- export LIBDB -- LIBS="$saveLIBS $LIBDB" -- export LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking db and dependent libraries" >&5 + $as_echo_n "checking db and dependent libraries... " >&6; } + saveLIBS="$LIBS" + havelib=0 +@@ -15586,11 +10142,7 @@ + export LIBDB + LIBS="$saveLIBS $LIBDB" + export LIBS - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <db.h> --int --main () --{ --int r, s, t; db_version(&r, &s, &t); -- ; -- return 0; --} --_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <db.h> + int +@@ -15601,55 +10153,19 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -15793,24 +15980,28 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- havelib=1 ; break 2 ++if ac_fn_c_try_link "$LINENO"; then : + havelib=1 ; break 2 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - --fi + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- done -- done -- LIBS="$saveLIBS" -- export LIBS -- if test $havelib = 0 ; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + done + done + LIBS="$saveLIBS" + export LIBS + if test $havelib = 0 ; then - { $as_echo "$as_me:$LINENO: result: error" >&5 --$as_echo "error" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 + $as_echo "error" >&6; } - { { $as_echo "$as_me:$LINENO: error: -===================================================================== -Cannot link against libdb? Try these steps to solve the problem: @@ -15821,28 +16012,32 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -===================================================================== - " >&5 -$as_echo "$as_me: error: --===================================================================== --Cannot link against libdb? Try these steps to solve the problem: --1. Be sure that the Berkeley DB developer package is installed. --2. Type: rm -f config.cache then re-run configure. --3. If the problem persists, report it to the bogofilter mailing list. -- Remember to include your config.log. --===================================================================== ++ as_fn_error " + ===================================================================== + Cannot link against libdb? Try these steps to solve the problem: + 1. Be sure that the Berkeley DB developer package is installed. +@@ -15657,35 +10173,20 @@ + 3. If the problem persists, report it to the bogofilter mailing list. + Remember to include your config.log. + ===================================================================== - " >&2;} - { (exit 1); exit 1; }; } -- fi ++ " "$LINENO" 5 + fi - { $as_echo "$as_me:$LINENO: result: $LIBDB" >&5 --$as_echo "$LIBDB" >&6; } -- LIBS="$saveLIBS" -- export LIBS -- -- -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBDB" >&5 + $as_echo "$LIBDB" >&6; } + LIBS="$saveLIBS" + export LIBS + + + - -- saveLIBS="$LIBS" -- LIBS="$LIBS $LIBDB" + saveLIBS="$LIBS" + LIBS="$LIBS $LIBDB" - { $as_echo "$as_me:$LINENO: checking if a program can be linked against Berkeley DB and run" >&5 --$as_echo_n "checking if a program can be linked against Berkeley DB and run... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if a program can be linked against Berkeley DB and run" >&5 + $as_echo_n "checking if a program can be linked against Berkeley DB and run... " >&6; } - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -15857,23 +16052,14 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#ifdef HAVE_INTTYPES_H --#include <inttypes.h> --#endif --#include <db.h> -- --int --main () --{ -- --return 0; -- -- ; -- return 0; --} --_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #ifdef HAVE_INTTYPES_H +@@ -15703,69 +10204,24 @@ + return 0; + } + _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -15901,43 +16087,37 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ prefix="$acl_final_prefix" -+ acl_save_exec_prefix="$exec_prefix" -+ exec_prefix="$acl_final_exec_prefix" -+ eval x=\"$x\" -+ exec_prefix="$acl_save_exec_prefix" -+ prefix="$acl_save_prefix" ++if ac_fn_c_try_link "$LINENO"; then : -( exit $ac_status ) -{ $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: Cannot run a program linked against libdb. -Did you adjust your library search path to include your libdb?" >&5 -$as_echo "$as_me: error: Cannot run a program linked against libdb. -Did you adjust your library search path to include your libdb?" >&2;} - { (exit 1); exit 1; }; } --fi ++ as_fn_error "Cannot run a program linked against libdb. ++Did you adjust your library search path to include your libdb?" "$LINENO" 5 + fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -+ if test "X$x" = "X$element"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" -+ fi -+ done - - +- +- - { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking if Berkeley DB header and library versions match" >&5 --$as_echo_n "checking if Berkeley DB header and library versions match... " >&6; } -- rm -r -f bfadtestdir -- mkdir bfadtestdir ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Berkeley DB header and library versions match" >&5 + $as_echo_n "checking if Berkeley DB header and library versions match... " >&6; } + rm -r -f bfadtestdir + mkdir bfadtestdir - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -15952,44 +16132,11 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ HAVE_LIBDB=yes - -- #include <stdlib.h> -- #include <stdio.h> --#ifdef HAVE_INTTYPES_H --#include <inttypes.h> --#endif -- #include <db.h> ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking db and dependent libraries" >&5 -+$as_echo_n "checking db and dependent libraries... " >&6; } -+ saveLIBS="$LIBS" -+ havelib=0 -+ for dblibs in "" "$LIBDB" ; do -+ for addlibs in "" -lpthread -lthread ; do -+ LIBDB="$dblibs $addlibs" -+ export LIBDB -+ LIBS="$saveLIBS $LIBDB" -+ export LIBS -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <db.h> - int - main () - { -- -- int maj, min; -- (void)db_version(&maj, &min, 0); -- (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", -- DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); -- if (maj != DB_VERSION_MAJOR) exit(1); -- if (min != DB_VERSION_MINOR) exit(1); -- exit(0); -- -+int r, s, t; db_version(&r, &s, &t); - ; + #include <stdlib.h> +@@ -15791,145 +10247,44 @@ return 0; } _ACEOF @@ -16020,46 +16167,28 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++if ac_fn_c_try_link "$LINENO"; then : + -( exit $ac_status ) -{ $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: db.h header file and db library version do not match." >&5 -$as_echo "$as_me: error: db.h header file and db library version do not match." >&2;} - { (exit 1); exit 1; }; } --fi ++ as_fn_error "db.h header file and db library version do not match." "$LINENO" 5 + fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+if ac_fn_c_try_link "$LINENO"; then : -+ havelib=1 ; break 2 - fi +-fi +- +- +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+ done -+ done -+ LIBS="$saveLIBS" -+ export LIBS -+ if test $havelib = 0 ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 -+$as_echo "error" >&6; } -+ as_fn_error " -+===================================================================== -+Cannot link against libdb? Try these steps to solve the problem: -+1. Be sure that the Berkeley DB developer package is installed. -+2. Type: rm -f config.cache then re-run configure. -+3. If the problem persists, report it to the bogofilter mailing list. -+ Remember to include your config.log. -+===================================================================== -+ " "$LINENO" 5 -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBDB" >&5 -+$as_echo "$LIBDB" >&6; } -+ LIBS="$saveLIBS" -+ export LIBS - - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether db_create is declared" >&5 -$as_echo_n "checking whether db_create is declared... " >&6; } -if test "${ac_cv_have_decl_db_create+set}" = set; then @@ -16072,7 +16201,6 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef HAVE_INTTYPES_H -+ + ac_fn_c_check_decl "$LINENO" "db_create" "ac_cv_have_decl_db_create" "#ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif @@ -16117,15 +16245,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_db_create=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_have_decl=0 fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_db_create" >&5 -$as_echo "$ac_cv_have_decl_db_create" >&6; } -if test "x$ac_cv_have_decl_db_create" = x""yes; then -- + cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_DB_CREATE 1 +#define HAVE_DECL_DB_CREATE $ac_have_decl @@ -16139,11 +16267,11 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -_ACEOF - -{ { $as_echo "$as_me:$LINENO: error: Can not locate a suitable Berkeley DB db.h header file. --Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. --You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&5 --$as_echo "$as_me: error: Can not locate a suitable Berkeley DB db.h header file. + as_fn_error "Can not locate a suitable Berkeley DB db.h header file. Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. +-You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&5 +-$as_echo "$as_me: error: Can not locate a suitable Berkeley DB db.h header file. +-Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. -You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&2;} - { (exit 1); exit 1; }; } +You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" "$LINENO" 5 @@ -16156,27 +16284,23 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ if test "$cross_compiling" = yes; then : -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+as_fn_error "cannot run test program while cross compiling -+See \`config.log' for more details." "$LINENO" 5; } - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_INTTYPES_H -@@ -14976,80 +9661,40 @@ +@@ -15960,80 +10315,38 @@ return 0; } _ACEOF @@ -16207,7 +16331,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : ++if ac_fn_c_try_link "$LINENO"; then : -( exit $ac_status ) -{ $as_echo "$as_me:$LINENO: result: no" >&5 @@ -16233,15 +16357,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure Packagers, if you are absolutely sure that the target system supports -shared environments, you can use --disable-dbshared-test." >&2;} - { (exit 1); exit 1; }; } -+shared environments, you can use --disable-dbshared-test." "$LINENO" 5 - fi +-fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ++shared environments, you can use --disable-dbshared-test." "$LINENO" 5 fi - - +- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext rm -r -f bfadtestdir - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -16268,7 +16392,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ;; esac -@@ -15109,36 +9754,28 @@ +@@ -16093,36 +10406,28 @@ if test "$BF_FORCE_TRIO" = "yes" ; then needtrio=1 ; ac_cv_func_vsnprintf=no ; ac_cv_func_snprintf=no ; fi if test "x$ac_cv_func_snprintf" != "xyes" ; then @@ -16310,7 +16434,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -15153,40 +9790,13 @@ +@@ -16137,40 +10442,13 @@ return 0; } _ACEOF @@ -16353,7 +16477,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -15201,41 +9811,14 @@ +@@ -16185,41 +10463,14 @@ return 0; } _ACEOF @@ -16397,7 +16521,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ int -@@ -15250,46 +9833,21 @@ +@@ -16234,46 +10485,21 @@ return 0; } _ACEOF @@ -16447,7 +16571,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi -@@ -15304,9 +9862,9 @@ +@@ -16288,9 +10514,9 @@ # Extract the first word of "xmlto", so it can be a program name with args. set dummy xmlto; ac_word=$2 @@ -16459,7 +16583,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_cv_enable_xmlto"; then -@@ -15317,14 +9875,14 @@ +@@ -16301,14 +10527,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16477,7 +16601,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS test -z "$ac_cv_prog_ac_cv_enable_xmlto" && ac_cv_prog_ac_cv_enable_xmlto="no" -@@ -15332,17 +9890,17 @@ +@@ -16316,17 +10542,17 @@ fi ac_cv_enable_xmlto=$ac_cv_prog_ac_cv_enable_xmlto if test -n "$ac_cv_enable_xmlto"; then @@ -16499,7 +16623,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$ac_cv_enable_xmlto" >&6; } if test x$ac_cv_enable_xmlto = xyes; then -@@ -15354,9 +9912,9 @@ +@@ -16338,9 +10564,9 @@ fi @@ -16511,7 +16635,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else case "$host" in -@@ -15370,13 +9928,11 @@ +@@ -16354,13 +10580,11 @@ *) ac_cv_c_extended_fp=unknown ;; esac fi @@ -16527,7 +16651,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi -@@ -15384,7 +9940,6 @@ +@@ -16368,7 +10592,6 @@ @@ -16535,7 +16659,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -@@ -15412,13 +9967,13 @@ +@@ -16396,13 +10619,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -16551,7 +16675,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac ;; esac done -@@ -15426,8 +9981,8 @@ +@@ -16410,8 +10633,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -16562,7 +16686,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -15450,11 +10005,11 @@ +@@ -16434,11 +10657,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -16576,7 +16700,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -15469,25 +10024,25 @@ +@@ -16453,25 +10676,25 @@ ( prefix=$ac_default_prefix sysconfdir=`eval echo "$sysconfdir"` @@ -16610,7 +16734,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: -------------------------------------------------------------" >&6;} PATH_SAVED="$PATH" -@@ -15497,7 +10052,7 @@ +@@ -16481,7 +10704,7 @@ need_my_gsl=1 # Check whether --with-included-gsl was given. @@ -16619,7 +16743,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_included_gsl; if test "x$withval" = "xyes" ; then need_my_gsl=2 ; fi fi -@@ -15506,7 +10061,7 @@ +@@ -16490,7 +10713,7 @@ # Check whether --with-gsl-prefix was given. @@ -16628,7 +16752,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_gsl_prefix; gsl_prefix="$withval" else gsl_prefix="" -@@ -15514,14 +10069,14 @@ +@@ -16498,14 +10721,14 @@ # Check whether --with-gsl-exec-prefix was given. @@ -16645,7 +16769,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_gsltest; else enable_gsltest=yes -@@ -15539,9 +10094,9 @@ +@@ -16523,9 +10746,9 @@ # Extract the first word of "gsl-config", so it can be a program name with args. set dummy gsl-config; ac_word=$2 @@ -16657,7 +16781,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else case $GSL_CONFIG in -@@ -15554,14 +10109,14 @@ +@@ -16538,14 +10761,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16675,7 +16799,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS test -z "$ac_cv_path_GSL_CONFIG" && ac_cv_path_GSL_CONFIG="no" -@@ -15570,16 +10125,16 @@ +@@ -16554,16 +10777,16 @@ fi GSL_CONFIG=$ac_cv_path_GSL_CONFIG if test -n "$GSL_CONFIG"; then @@ -16695,7 +16819,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "checking for GSL - version >= $min_gsl_version... " >&6; } no_gsl="" if test "$GSL_CONFIG" = "no" ; then -@@ -15613,14 +10168,10 @@ +@@ -16597,14 +10820,10 @@ LIBS="$LIBS $GSL_LIBS" rm -f conf.gsltest @@ -16712,7 +16836,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdio.h> -@@ -15677,57 +10228,28 @@ +@@ -16661,57 +10880,28 @@ _ACEOF @@ -16778,7 +16902,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } if test "$GSL_CONFIG" != "no" ; then if test -f conf.gsltest ; then -@@ -15736,11 +10258,7 @@ +@@ -16720,11 +10910,7 @@ echo "*** Could not run GSL test program, checking why..." CFLAGS="$CFLAGS $GSL_CFLAGS" LIBS="$LIBS $GSL_LIBS" @@ -16791,7 +16915,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdio.h> -@@ -15753,27 +10271,7 @@ +@@ -16737,27 +10923,7 @@ return 0; } _ACEOF @@ -16820,7 +16944,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GSL or finding the wrong" echo "*** version of GSL. If it is not finding GSL, you'll need to set your" -@@ -15784,18 +10282,13 @@ +@@ -16768,18 +10934,13 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else @@ -16842,7 +16966,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi -@@ -15811,7 +10304,7 @@ +@@ -16795,7 +10956,7 @@ # Check whether --with-gsl-prefix was given. @@ -16851,7 +16975,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure withval=$with_gsl_prefix; gsl_prefix="$withval" else gsl_prefix="" -@@ -15819,14 +10312,14 @@ +@@ -16803,14 +10964,14 @@ # Check whether --with-gsl-exec-prefix was given. @@ -16868,7 +16992,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure enableval=$enable_gsltest; else enable_gsltest=yes -@@ -15844,9 +10337,9 @@ +@@ -16828,9 +10989,9 @@ # Extract the first word of "gsl-config", so it can be a program name with args. set dummy gsl-config; ac_word=$2 @@ -16880,7 +17004,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "(cached) " >&6 else case $GSL_CONFIG in -@@ -15859,14 +10352,14 @@ +@@ -16843,14 +11004,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16898,7 +17022,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS test -z "$ac_cv_path_GSL_CONFIG" && ac_cv_path_GSL_CONFIG="no" -@@ -15875,16 +10368,16 @@ +@@ -16859,16 +11020,16 @@ fi GSL_CONFIG=$ac_cv_path_GSL_CONFIG if test -n "$GSL_CONFIG"; then @@ -16918,7 +17042,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo_n "checking for GSL - version >= $min_gsl_version... " >&6; } no_gsl="" if test "$GSL_CONFIG" = "no" ; then -@@ -15918,14 +10411,10 @@ +@@ -16902,14 +11063,10 @@ LIBS="$LIBS $GSL_LIBS" rm -f conf.gsltest @@ -16935,7 +17059,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdio.h> -@@ -15977,62 +10466,33 @@ +@@ -16961,62 +11118,33 @@ else { exit(1); @@ -17011,7 +17135,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "no" >&6; } if test "$GSL_CONFIG" != "no" ; then if test -f conf.gsltest ; then -@@ -16041,11 +10501,7 @@ +@@ -17025,11 +11153,7 @@ echo "*** Could not run GSL test program, checking why..." CFLAGS="$CFLAGS $GSL_CFLAGS" LIBS="$LIBS $GSL_LIBS" @@ -17024,7 +17148,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure /* end confdefs.h. */ #include <stdio.h> -@@ -16058,27 +10514,7 @@ +@@ -17042,27 +11166,7 @@ return 0; } _ACEOF @@ -17053,7 +17177,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GSL or finding the wrong" echo "*** version of GSL. If it is not finding GSL, you'll need to set your" -@@ -16089,18 +10525,13 @@ +@@ -17073,18 +11177,13 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else @@ -17075,7 +17199,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi -@@ -16117,13 +10548,9 @@ +@@ -17101,13 +11200,9 @@ if test "$need_my_gsl" != 0 ; then GSL_LIBS="libbf_gsl.a" @@ -17091,7 +17215,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi -@@ -16173,35 +10600,23 @@ +@@ -17157,35 +11252,23 @@ # Note the \\\\ for backslashes. Autoconf eats one layer, leaving \\ @@ -17133,7 +17257,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi -@@ -16234,13 +10649,13 @@ +@@ -17218,13 +11301,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -17149,7 +17273,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac ;; esac done -@@ -16248,8 +10663,8 @@ +@@ -17232,8 +11315,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -17160,7 +17284,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -16272,11 +10687,11 @@ +@@ -17256,11 +11339,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -17174,7 +17298,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -16296,148 +10711,103 @@ +@@ -17280,8 +11363,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -17185,17 +17309,9 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure done LIBOBJS=$ac_libobjs - LTLIBOBJS=$ac_ltlibobjs +@@ -17289,139 +11372,94 @@ -+ if test -n "$EXEEXT"; then -+ am__EXEEXT_TRUE= -+ am__EXEEXT_FALSE='#' -+else -+ am__EXEEXT_TRUE='#' -+ am__EXEEXT_FALSE= -+fi -+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 @@ -17213,7 +17329,15 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= fi ++ if test -z "${USE_GCC4_TRUE}" && test -z "${USE_GCC4_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GCC4\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 @@ -17372,7 +17496,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -16447,17 +10817,18 @@ +@@ -17431,17 +11469,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -17398,7 +17522,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 -@@ -16465,23 +10836,15 @@ +@@ -17449,23 +11488,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -17427,7 +17551,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure as_nl=' ' export as_nl -@@ -16489,7 +10852,13 @@ +@@ -17473,7 +11504,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 @@ -17442,7 +17566,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 -@@ -16500,7 +10869,7 @@ +@@ -17484,7 +11521,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -17451,7 +17575,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\\(.*\\)"`;; -@@ -16523,13 +10892,6 @@ +@@ -17507,13 +11544,6 @@ } fi @@ -17465,7 +17589,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 -@@ -16539,15 +10901,15 @@ +@@ -17523,15 +11553,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -17484,7 +17608,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure IFS=$as_save_IFS ;; -@@ -16559,12 +10921,16 @@ +@@ -17543,12 +11573,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -17505,7 +17629,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure done PS1='$ ' PS2='> ' -@@ -16576,7 +10942,89 @@ +@@ -17560,7 +11594,89 @@ LANGUAGE=C export LANGUAGE @@ -17596,7 +17720,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -16590,8 +11038,12 @@ +@@ -17574,8 +11690,12 @@ as_basename=false fi @@ -17610,7 +17734,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -16611,76 +11063,25 @@ +@@ -17595,76 +11715,25 @@ } s/.*/./; q'` @@ -17698,7 +17822,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 -@@ -16709,8 +11110,56 @@ +@@ -17693,8 +11762,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -17756,7 +17880,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -16729,10 +11178,10 @@ +@@ -17713,10 +11830,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -17769,7 +17893,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -16747,13 +11196,19 @@ +@@ -17731,13 +11848,19 @@ exec 6>&1 @@ -17785,13 +17909,13 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" - This file was extended by bogofilter $as_me 1.2.0, which was + This file was extended by bogofilter $as_me 1.2.1, which was -generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -16785,13 +11240,15 @@ +@@ -17769,10 +11892,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -17806,11 +17930,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files -@@ -16810,16 +11267,17 @@ +@@ -17794,16 +11918,16 @@ Configuration commands: $config_commands @@ -17819,29 +17939,18 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ - bogofilter config.status 1.2.0 + bogofilter config.status 1.2.1 -configured by $0, generated by GNU Autoconf 2.63, -- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.65, -+ with options \\"\$ac_cs_config\\" ++configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -16855,6 +11313,8 @@ - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) -@@ -16862,20 +11322,19 @@ +@@ -17846,20 +11970,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -17866,7 +17975,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -16883,11 +11342,10 @@ +@@ -17867,11 +11990,10 @@ ac_cs_silent=: ;; # This is an error. @@ -17881,7 +17990,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ac_need_defaults=false ;; esac -@@ -16950,9 +11408,7 @@ +@@ -17934,9 +12056,7 @@ "src/bf_copy") CONFIG_FILES="$CONFIG_FILES src/bf_copy" ;; "src/bf_tar") CONFIG_FILES="$CONFIG_FILES src/bf_tar" ;; @@ -17892,7 +18001,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac done -@@ -16979,7 +11435,7 @@ +@@ -17963,7 +12083,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -17901,7 +18010,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure } # Create a (secure) tmp directory for tmp files. -@@ -16990,11 +11446,7 @@ +@@ -17974,11 +12094,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -17914,7 +18023,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -17002,10 +11454,16 @@ +@@ -17986,10 +12102,16 @@ if test -n "$CONFIG_FILES"; then @@ -17933,7 +18042,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure else ac_cs_awk_cr=$ac_cr fi -@@ -17019,24 +11477,18 @@ +@@ -18003,24 +12125,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -17961,25 +18070,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -17058,7 +11510,7 @@ - t delim - :nl - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more1 - s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ - p -@@ -17072,7 +11524,7 @@ - t nl - :delim - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more2 - s/["\\]/\\&/g; s/^/"/; s/$/"/ - p -@@ -17125,9 +11577,7 @@ +@@ -18109,9 +12225,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -17990,7 +18081,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -17168,9 +11618,7 @@ +@@ -18152,9 +12266,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -18001,7 +18092,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -17255,9 +11703,7 @@ +@@ -18239,9 +12351,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -18012,7 +18103,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi # test -n "$CONFIG_HEADERS" -@@ -17270,9 +11716,7 @@ +@@ -18254,9 +12364,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -18023,7 +18114,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -17300,12 +11744,10 @@ +@@ -18284,12 +12392,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -18038,7 +18129,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -17316,7 +11758,7 @@ +@@ -18300,7 +12406,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -18047,7 +18138,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -17329,9 +11771,7 @@ +@@ -18313,9 +12419,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -18058,7 +18149,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac ;; esac -@@ -17359,47 +11799,7 @@ +@@ -18343,47 +12447,7 @@ q } s/.*/./; q'` @@ -18107,7 +18198,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ac_builddir=. case "$ac_dir" in -@@ -17456,7 +11856,6 @@ +@@ -18440,7 +12504,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -18115,7 +18206,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -17466,12 +11865,11 @@ +@@ -18450,12 +12513,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -18130,7 +18221,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -17481,7 +11879,7 @@ +@@ -18465,7 +12527,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -18139,7 +18230,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure esac _ACEOF -@@ -17510,14 +11908,12 @@ +@@ -18494,14 +12556,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -18156,7 +18247,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} -@@ -17527,9 +11923,7 @@ +@@ -18511,9 +12571,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -18167,7 +18258,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure ;; :H) # -@@ -17540,25 +11934,19 @@ +@@ -18524,25 +12582,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -18197,7 +18288,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -17596,34 +11984,35 @@ +@@ -18580,34 +12632,35 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -18255,7 +18346,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ -@@ -17646,28 +12035,28 @@ +@@ -18630,28 +12683,28 @@ q } s/.*/./; q'` @@ -18306,7 +18397,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ -@@ -17690,66 +12079,24 @@ +@@ -18674,66 +12727,24 @@ q } s/.*/./; q'` @@ -18379,7 +18470,7 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure # configure is writing to config.log, and then calls config.status. -@@ -17770,29 +12117,29 @@ +@@ -18754,29 +12765,29 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -18420,62 +18511,39 @@ diff -Nur bogofilter-1.2.0.orig/configure bogofilter-1.2.0/configure -{ $as_echo "$as_me:$LINENO: LIBICONV=$LIBICONV" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: LIBICONV=$LIBICONV" >&5 $as_echo "$as_me: LIBICONV=$LIBICONV" >&6;} -diff -Nur bogofilter-1.2.0.orig/configure.ac bogofilter-1.2.0/configure.ac ---- bogofilter-1.2.0.orig/configure.ac 2009-02-21 21:41:43.000000000 +0100 -+++ bogofilter-1.2.0/configure.ac 2010-02-18 20:48:43.572858045 +0100 -@@ -550,49 +550,6 @@ - AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header]) - AC_SUBST(LIBDB) - -- dnl check if run-time link works -- saveLIBS="$LIBS" -- LIBS="$LIBS $LIBDB" -- AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) +diff -Nur bogofilter-1.2.1.orig/configure.ac bogofilter-1.2.1/configure.ac +--- bogofilter-1.2.1.orig/configure.ac 2009-08-01 13:15:14.000000000 +0200 ++++ bogofilter-1.2.1/configure.ac 2010-04-02 14:08:16.980975757 +0200 +@@ -554,7 +554,7 @@ + saveLIBS="$LIBS" + LIBS="$LIBS $LIBDB" + AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) - AC_RUN_IFELSE( -- AC_LANG_PROGRAM([[ --#ifdef HAVE_INTTYPES_H --#include <inttypes.h> --#endif --#include <db.h> -- ]], [[ --return 0; -- ]]),, -- [AC_MSG_RESULT(no) -- AC_MSG_ERROR([Cannot run a program linked against libdb. --Did you adjust your library search path to include your libdb?])],) -- AC_MSG_RESULT(yes) -- -- dnl check if header and library of DB library match -- dnl ignore if cross compiling -- AC_MSG_CHECKING(if Berkeley DB header and library versions match) -- rm -r -f bfadtestdir -- mkdir bfadtestdir ++ AC_LINK_IFELSE( + AC_LANG_PROGRAM([[ + #ifdef HAVE_INTTYPES_H + #include <inttypes.h> +@@ -573,7 +573,7 @@ + AC_MSG_CHECKING(if Berkeley DB header and library versions match) + rm -r -f bfadtestdir + mkdir bfadtestdir - AC_RUN_IFELSE( -- AC_LANG_PROGRAM([[ -- #include <stdlib.h> -- #include <stdio.h> --#ifdef HAVE_INTTYPES_H --#include <inttypes.h> --#endif -- #include <db.h> -- ]], [[ -- int maj, min; -- (void)db_version(&maj, &min, 0); -- (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", -- DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); -- if (maj != DB_VERSION_MAJOR) exit(1); -- if (min != DB_VERSION_MINOR) exit(1); -- exit(0); -- ]]),, -- [AC_MSG_RESULT(no) -- AC_MSG_ERROR(db.h header file and db library version do not match.)],) -- AC_MSG_RESULT(yes) - AC_CHECK_DECLS(db_create,, - AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file. - Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. -diff -Nur bogofilter-1.2.0.orig/depcomp bogofilter-1.2.0/depcomp ---- bogofilter-1.2.0.orig/depcomp 2009-01-11 15:22:24.000000000 +0100 -+++ bogofilter-1.2.0/depcomp 2010-02-18 20:48:43.572858045 +0100 ++ AC_LINK_IFELSE( + AC_LANG_PROGRAM([[ + #include <stdlib.h> + #include <stdio.h> +@@ -604,7 +604,7 @@ + ) + AC_MSG_CHECKING(if Berkeley DB supports shared environments) + if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then +- AC_RUN_IFELSE( ++ AC_LINK_IFELSE( + AC_LANG_PROGRAM([[ + #ifdef HAVE_INTTYPES_H + #include <inttypes.h> +diff -Nur bogofilter-1.2.1.orig/depcomp bogofilter-1.2.1/depcomp +--- bogofilter-1.2.1.orig/depcomp 2009-01-11 15:22:24.000000000 +0100 ++++ bogofilter-1.2.1/depcomp 2009-08-14 11:32:22.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects @@ -18677,12 +18745,12 @@ diff -Nur bogofilter-1.2.0.orig/depcomp bogofilter-1.2.0/depcomp +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in ---- bogofilter-1.2.0.orig/doc/Makefile.in 2009-02-21 21:41:48.000000000 +0100 -+++ bogofilter-1.2.0/doc/Makefile.in 2010-02-18 20:49:12.724857566 +0100 +diff -Nur bogofilter-1.2.1.orig/doc/Makefile.in bogofilter-1.2.1/doc/Makefile.in +--- bogofilter-1.2.1.orig/doc/Makefile.in 2009-08-01 21:00:51.000000000 +0200 ++++ bogofilter-1.2.1/doc/Makefile.in 2010-04-02 14:08:26.003474529 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18703,7 +18771,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -@@ -46,8 +48,30 @@ +@@ -45,8 +47,30 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = @@ -18734,7 +18802,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff -@@ -116,6 +140,7 @@ +@@ -115,6 +139,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18742,7 +18810,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -@@ -245,9 +270,9 @@ +@@ -240,9 +265,9 @@ exit 1;; \ esac; \ done; \ @@ -18755,7 +18823,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -265,51 +290,45 @@ +@@ -260,51 +285,45 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -18841,7 +18909,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in tags: TAGS TAGS: -@@ -318,6 +337,19 @@ +@@ -313,6 +332,19 @@ distdir: $(DISTFILES) @@ -18861,7 +18929,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ -@@ -333,13 +365,17 @@ +@@ -328,13 +360,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -18883,7 +18951,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in || exit 1; \ fi; \ done -@@ -374,6 +410,7 @@ +@@ -369,6 +405,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -18891,7 +18959,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -392,6 +429,8 @@ +@@ -387,6 +424,8 @@ html: html-am @@ -18900,7 +18968,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in info: info-am info-am: -@@ -400,18 +439,28 @@ +@@ -395,18 +434,28 @@ install-dvi: install-dvi-am @@ -18929,7 +18997,7 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -511,6 +560,7 @@ +@@ -506,6 +555,7 @@ set +e ; fail=0 ; for i in $(HTML_DOCS) ; do if $(NSGMLS) -s $(srcdir)/$$i ; then echo PASS: $$i ; else echo FAIL: $$i: ; fail=1 ; fi ; done ; \ else echo >&2 "*** Not validating HTML, nsgmls/HTML DTDs improperly installed ***" ; fi ; \ if test "$$fail" = "1" ; then echo >&2 "*** HTML document invalid ***" ; false ; fi @@ -18937,9 +19005,9 @@ diff -Nur bogofilter-1.2.0.orig/doc/Makefile.in bogofilter-1.2.0/doc/Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -Nur bogofilter-1.2.0.orig/install-sh bogofilter-1.2.0/install-sh ---- bogofilter-1.2.0.orig/install-sh 2009-01-11 15:22:24.000000000 +0100 -+++ bogofilter-1.2.0/install-sh 2010-02-18 20:48:43.572858045 +0100 +diff -Nur bogofilter-1.2.1.orig/install-sh bogofilter-1.2.1/install-sh +--- bogofilter-1.2.1.orig/install-sh 2009-01-11 15:22:24.000000000 +0100 ++++ bogofilter-1.2.1/install-sh 2009-08-14 11:32:22.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile @@ -18957,12 +19025,12 @@ diff -Nur bogofilter-1.2.0.orig/install-sh bogofilter-1.2.0/install-sh +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in ---- bogofilter-1.2.0.orig/Makefile.in 2009-02-21 21:41:48.000000000 +0100 -+++ bogofilter-1.2.0/Makefile.in 2010-02-18 20:49:13.836851995 +0100 +diff -Nur bogofilter-1.2.1.orig/Makefile.in bogofilter-1.2.1/Makefile.in +--- bogofilter-1.2.1.orig/Makefile.in 2009-08-01 21:00:51.000000000 +0200 ++++ bogofilter-1.2.1/Makefile.in 2010-04-02 14:08:26.384093670 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18983,7 +19051,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -@@ -56,6 +58,7 @@ +@@ -55,6 +57,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = bogofilter.spec @@ -18991,7 +19059,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in @ENABLE_STATIC_TRUE@am__EXEEXT_1 = bogogrep_static$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_bogogrep_OBJECTS = bogogrep.$(OBJEXT) -@@ -70,6 +73,7 @@ +@@ -69,6 +72,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -18999,7 +19067,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -@@ -88,12 +92,29 @@ +@@ -87,12 +91,29 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; @@ -19031,7 +19099,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) -@@ -101,9 +122,34 @@ +@@ -100,9 +121,34 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ @@ -19069,7 +19137,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print -@@ -171,6 +217,7 @@ +@@ -170,6 +216,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19077,7 +19145,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -@@ -327,15 +374,15 @@ +@@ -322,15 +369,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -19098,7 +19166,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -351,9 +398,10 @@ +@@ -346,9 +393,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) @@ -19111,7 +19179,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in bogofilter.spec: $(top_builddir)/config.status $(srcdir)/bogofilter.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ -@@ -376,48 +424,51 @@ +@@ -371,48 +419,51 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -19176,16 +19244,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. -@@ -426,7 +477,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -443,7 +494,7 @@ +@@ -438,7 +489,7 @@ else \ local_target="$$target"; \ fi; \ @@ -19194,16 +19253,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ -@@ -451,7 +502,7 @@ - fi; test -z "$$fail" - - $(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -477,16 +528,16 @@ +@@ -472,16 +523,16 @@ else \ local_target="$$target"; \ fi; \ @@ -19223,7 +19273,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -501,7 +552,7 @@ +@@ -496,7 +547,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -19232,7 +19282,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ -@@ -513,7 +564,7 @@ +@@ -508,7 +559,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ @@ -19241,7 +19291,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in fi; \ done; \ list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ -@@ -522,36 +573,41 @@ +@@ -517,36 +568,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ @@ -19292,7 +19342,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ -@@ -567,29 +623,44 @@ +@@ -562,29 +618,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -19347,14 +19397,13 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -597,11 +668,13 @@ +@@ -592,11 +663,12 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -19363,7 +19412,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) -@@ -613,6 +686,10 @@ +@@ -608,6 +680,10 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) @@ -19374,29 +19423,16 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) -@@ -637,15 +714,17 @@ - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +@@ -637,6 +713,8 @@ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ -- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -@@ -653,9 +732,11 @@ +@@ -648,9 +726,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -19409,7 +19445,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ -@@ -677,13 +758,15 @@ +@@ -672,13 +752,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ @@ -19427,7 +19463,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ -@@ -728,6 +811,7 @@ +@@ -723,6 +805,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -19435,7 +19471,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -749,6 +833,8 @@ +@@ -744,6 +827,8 @@ html: html-recursive @@ -19444,7 +19480,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in info: info-recursive info-am: -@@ -757,18 +843,28 @@ +@@ -752,18 +837,28 @@ install-dvi: install-dvi-recursive @@ -19473,7 +19509,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -792,14 +888,14 @@ +@@ -787,14 +882,14 @@ uninstall-am: uninstall-sysconfDATA @@ -19491,7 +19527,7 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in distclean-generic distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ -@@ -867,6 +963,7 @@ +@@ -862,6 +957,7 @@ cd $(distdir) && find doc gnugetopt gsl -name '.#*' -type f -exec rm '{}' ';' rm -f $(distdir)/doc/.cvsignore $(distdir)/ChangeLog # --------------------------------------------------------------------- @@ -19499,9 +19535,9 @@ diff -Nur bogofilter-1.2.0.orig/Makefile.in bogofilter-1.2.0/Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -Nur bogofilter-1.2.0.orig/missing bogofilter-1.2.0/missing ---- bogofilter-1.2.0.orig/missing 2009-01-11 15:22:24.000000000 +0100 -+++ bogofilter-1.2.0/missing 2010-02-18 20:48:43.576867215 +0100 +diff -Nur bogofilter-1.2.1.orig/missing bogofilter-1.2.1/missing +--- bogofilter-1.2.1.orig/missing 2009-01-11 15:22:24.000000000 +0100 ++++ bogofilter-1.2.1/missing 2009-08-14 11:32:22.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. @@ -19657,9 +19693,9 @@ diff -Nur bogofilter-1.2.0.orig/missing bogofilter-1.2.0/missing +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -diff -Nur bogofilter-1.2.0.orig/mkinstalldirs bogofilter-1.2.0/mkinstalldirs ---- bogofilter-1.2.0.orig/mkinstalldirs 2009-01-11 15:22:24.000000000 +0100 -+++ bogofilter-1.2.0/mkinstalldirs 2010-02-18 20:48:43.580869680 +0100 +diff -Nur bogofilter-1.2.1.orig/mkinstalldirs bogofilter-1.2.1/mkinstalldirs +--- bogofilter-1.2.1.orig/mkinstalldirs 2009-01-11 15:22:24.000000000 +0100 ++++ bogofilter-1.2.1/mkinstalldirs 2009-08-14 11:32:22.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy @@ -19677,9 +19713,9 @@ diff -Nur bogofilter-1.2.0.orig/mkinstalldirs bogofilter-1.2.0/mkinstalldirs +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -diff -Nur bogofilter-1.2.0.orig/src/bf_compact bogofilter-1.2.0/src/bf_compact ---- bogofilter-1.2.0.orig/src/bf_compact 2009-02-21 21:42:01.000000000 +0100 -+++ bogofilter-1.2.0/src/bf_compact 1970-01-01 01:00:00.000000000 +0100 +diff -Nur bogofilter-1.2.1.orig/src/bf_compact bogofilter-1.2.1/src/bf_compact +--- bogofilter-1.2.1.orig/src/bf_compact 2009-08-01 21:01:04.000000000 +0200 ++++ bogofilter-1.2.1/src/bf_compact 1970-01-01 01:00:00.000000000 +0100 @@ -1,98 +0,0 @@ -#! /bin/sh - @@ -19779,9 +19815,9 @@ diff -Nur bogofilter-1.2.0.orig/src/bf_compact bogofilter-1.2.0/src/bf_compact -rm -rf "$BOGOHOME.old" -mv "$BOGOHOME" "$BOGOHOME.old" -mv "$BOGOTEMP" "$BOGOHOME" -diff -Nur bogofilter-1.2.0.orig/src/bf_copy bogofilter-1.2.0/src/bf_copy ---- bogofilter-1.2.0.orig/src/bf_copy 2009-02-21 21:42:01.000000000 +0100 -+++ bogofilter-1.2.0/src/bf_copy 1970-01-01 01:00:00.000000000 +0100 +diff -Nur bogofilter-1.2.1.orig/src/bf_copy bogofilter-1.2.1/src/bf_copy +--- bogofilter-1.2.1.orig/src/bf_copy 2009-08-01 21:01:04.000000000 +0200 ++++ bogofilter-1.2.1/src/bf_copy 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -#! /bin/sh - @@ -19844,9 +19880,9 @@ diff -Nur bogofilter-1.2.0.orig/src/bf_copy bogofilter-1.2.0/src/bf_copy -if test "$LOGS" ; then $BOGOUTIL --db-recover="$DST" ; fi -rm -f $TMP -trap - 0 -diff -Nur bogofilter-1.2.0.orig/src/bf_tar bogofilter-1.2.0/src/bf_tar ---- bogofilter-1.2.0.orig/src/bf_tar 2009-02-21 21:42:01.000000000 +0100 -+++ bogofilter-1.2.0/src/bf_tar 1970-01-01 01:00:00.000000000 +0100 +diff -Nur bogofilter-1.2.1.orig/src/bf_tar bogofilter-1.2.1/src/bf_tar +--- bogofilter-1.2.1.orig/src/bf_tar 2009-08-01 21:01:04.000000000 +0200 ++++ bogofilter-1.2.1/src/bf_tar 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -#! /bin/sh - @@ -19920,262 +19956,9 @@ diff -Nur bogofilter-1.2.0.orig/src/bf_tar bogofilter-1.2.0/src/bf_tar - -# remove if requested -if [ $REMOVEAFT -eq 1 ] ; then nukelogs ; fi -diff -Nur bogofilter-1.2.0.orig/src/bogoupgrade bogofilter-1.2.0/src/bogoupgrade ---- bogofilter-1.2.0.orig/src/bogoupgrade 2009-02-21 21:42:01.000000000 +0100 -+++ bogofilter-1.2.0/src/bogoupgrade 1970-01-01 01:00:00.000000000 +0100 -@@ -1,249 +0,0 @@ --#! /usr/local/bin/perl -w -- --=pod -- --=head1 NAME -- --bogoupgrade -- upgrade a bogofilter database to current version. -- --=cut -- --# bogofilter-0.3 through bogofilter-0.6.3 --# --# HEADER "# bogofilter email-count (format version A): %lu" --# -- --# bogofilter-0.7.x --# --# HEADER "# bogofilter email-count (format version B): %lu" --# -- --# bogofilter-0.8 to bogofilter-0.13.x --# --# BerkeleyDB with double wordlists --# spamlist.db and goodlist.db -- --# bogofilter-0.14 and later --# --# BerkeleyDB with single wordlist --# wordlist.db -- --require 5.005_03; --use strict; --use filetest 'access'; --use Pod::Usage; -- --sub convert_double_to_single(); --sub convert_format_A(); --sub convert_format_B(); --sub db_verify($); -- --my $VERSION = '0.5.0'; -- --my ($in, $out, $dir, $yday, $msg_count_token); -- --my $bogoutil = 'bogoutil'; -- --for (my $i = 0; $i < @ARGV; $i++){ -- my $arg = $ARGV[$i]; -- -- if ($arg eq '-d'){ -- $dir = $ARGV[++$i]; -- } elsif ($arg eq '-i'){ -- $in = $ARGV[++$i]; -- } elsif ($arg eq '-o'){ -- $out = $ARGV[++$i]; -- } elsif ($arg eq '-b'){ -- $bogoutil = $ARGV[++$i]; -- } elsif ($arg eq '-y'){ -- $yday = "-y $ARGV[++$i]"; -- } elsif ($arg eq '-h' or $arg eq '--help'){ -- pod2usage(-verbose => 1, -exitstatus => 0); -- } else { -- pod2usage(-verbose => 0, -exitstatus => 1); -- } --} -- --my $db_ext = $ENV{DB_EXT} || 'db'; -- --if ($dir) { -- if ($in || $out) { -- pod2usage("Cannot use -d at the same time as -i or -o!"); -- } -- convert_double_to_single(); --} else { -- pod2usage("Missing input filename.\nAborting") unless $in; -- pod2usage("Missing output filename.\nAborting") unless $out; -- -- my $msg_count_token = '.MSG_COUNT'; -- -- open(F, "< $in") or die "Cannot open input file [$in]. $!.\nAborting"; -- my $sig = <F>; -- chomp($sig); -- if ($sig =~ m/^\# bogofilter wordlist \(format version A\):\s(\d+)$/){ -- convert_format_A(); -- } -- elsif ($sig =~ m/^\# bogofilter email-count \(format version B\):\s(\d+)/){ -- convert_format_B(); -- } -- else { -- $sig =~ y/[\040-\177]/_/cs; -- warn "Cannot recognize signature [$sig].\n"; -- exit(2); -- } --} -- --sub db_verify($) { -- my ($f) = shift; -- if (!-r $f) { -- die "Database $f is not readable: $!\nAborting"; -- } -- my $ret = system ($bogoutil, '--db-verify', $f); -- die "Database $f is corrupt.\nAborting" if $ret; --} -- --sub convert_format_A() { -- my $msg_count = $1; -- my $cmd = "$bogoutil $yday -l $out"; -- open(OUT, "| $cmd") or die "Cannot run command \"$cmd\": $!\nAborting"; -- while(<F>){ -- print OUT $_; -- } -- print OUT "$msg_count_token $msg_count\n"; -- close(OUT) or die "Error executing command \"$cmd\": $!\nAborting"; -- close(F); --} -- --sub convert_format_B() { -- my $msg_count = $1; -- my $in_db = $in; -- -- $in_db =~ s/count$/$db_ext/; -- -- unless (-f $in_db){ -- warn("Cannot find database file [$in_db]\n corresponding to input file [$in]\n"); -- exit; -- } -- -- my $cmd = "$bogoutil $yday -l $out"; -- open(OUT, "| $cmd") or die "Cannot run command \"$cmd\": $!\nAborting"; -- -- close(F); -- db_verify($in_db); -- $cmd = "$bogoutil $yday -d $in_db"; -- open(F, "$cmd |") or die "Cannot run command \"$cmd\": $!\nAborting"; -- -- while(<F>){ -- if (m/^\.count\s+(\d+)$/){ -- warn("Found a message count of [$1] in db.\nThrowing away text file count of [$msg_count]\n"); -- $msg_count = $1; -- next; -- } -- elsif (/^$msg_count_token\s(\d+)$/){ -- warn("This database appears to have been upgraded already.\nBut there's no harm in doing it again.\n"); -- $msg_count = $1; -- next; -- } -- print OUT $_; -- } -- print OUT "$msg_count_token $msg_count\n"; -- -- close(F); -- close(OUT); --} -- --# args: filename format --sub cvt2to1_get($$) { -- my ($filename, $format) = @_; -- my @tmp; -- my $cmd; -- -- die "need array context in cvs2to1_get.\nAborting" unless wantarray; -- db_verify($filename); -- $cmd = "$bogoutil -d $filename"; -- open(I, "$cmd |") or die "cannot run \"$cmd\": $!\nAborting"; -- while (<I>) { -- chomp; -- my @a = split; -- push @tmp, sprintf($format, $a[0], $a[1], $a[2]); -- } -- close I or die "error running \"$cmd\": $!\nAborting"; -- return @tmp; --} -- --sub convert_double_to_single() { -- my @tmp; -- -- my $word = "$dir/wordlist.$db_ext"; -- my $spam = "$dir/spamlist.$db_ext"; -- my $good = "$dir/goodlist.$db_ext"; -- -- if (-e $word) { die "$word already exists.\nAborting"; } -- -- push @tmp, cvt2to1_get($spam, "%s %d 0 %d"); -- push @tmp, cvt2to1_get($good, "%s 0 %d %d"); -- my $cmd = "$bogoutil -l $word"; -- open(O, "| $cmd") or die "cannot run \"$cmd\": $!\nAborting"; -- print O join("\n", sort @tmp), "\n"; -- close O or die "error executing \"$cmd\": $!\nAborting"; --} -- --exit(0); -- --__END__ --=pod -- --=head1 SYNOPSIS -- -- bogoupgrade [options] -d <bogofilter directory> -- bogoupgrade [options] -i <input text file> -o <output db file> -- bogoupgrade {-h|--help} -- -- Options: -- -b <path to bogoutil> -- --=head1 DESCRIPTION -- --B<bogoupgrade> updates bogofilter databases from older formats to the current --format. -- --=head1 OPTIONS -- --=over 8 -- --=item B<-d <directory>> -- --Name of directory containing database files. Old files will be read and new --files will be written. -- --=item B<-i <input file>> -- --Text file containing message count, and possibly wordlist data records. If the --file only contains a message count but no word list records, there must be a --database file, in the same directory as the text file, which contains the word --list data. -- --=item B<-o <output file>> -- --Output database file. Use the appropriate file extension for your version of --bogofilter, i.e. '.db' for Berkeley DB and SQLite3, or '.qdbm' for QDBM. -- --=item B<-b <path to bogoutil program>> -- --Defaults to 'bogoutil', in the hopes that your shell will find it. -- --=item B<-h> | B<--help> -- --Print the help - you are currently reading it. -- --=back -- --=head1 AUTHORS -- -- Gyepi Sam <gyepi@praxis-sw.com> -- David Relson <relson@osagesoftware.com> -- Matthias Andree <matthias.andree@gmx.de> -- --=cut -- --# vim: set filetype=perl ai: -diff -Nur bogofilter-1.2.0.orig/src/lexer_v3.c bogofilter-1.2.0/src/lexer_v3.c ---- bogofilter-1.2.0.orig/src/lexer_v3.c 2009-02-21 21:42:01.000000000 +0100 -+++ bogofilter-1.2.0/src/lexer_v3.c 2010-02-18 20:49:48.668852113 +0100 +diff -Nur bogofilter-1.2.1.orig/src/lexer_v3.c bogofilter-1.2.1/src/lexer_v3.c +--- bogofilter-1.2.1.orig/src/lexer_v3.c 2009-08-01 21:01:07.000000000 +0200 ++++ bogofilter-1.2.1/src/lexer_v3.c 2010-04-02 14:08:47.954716335 +0200 @@ -80,7 +80,6 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; @@ -20209,16 +19992,16 @@ diff -Nur bogofilter-1.2.0.orig/src/lexer_v3.c bogofilter-1.2.0/src/lexer_v3.c #endif /* The state buf must be large enough to hold one state per character in the main buffer. -@@ -2048,7 +2057,7 @@ +@@ -2243,7 +2252,7 @@ --#line 2050 "lexer_v3.c" -+#line 2059 "lexer_v3.c" +-#line 2245 "lexer_v3.c" ++#line 2254 "lexer_v3.c" #define INITIAL 0 #define TEXT 1 -@@ -2168,7 +2177,12 @@ +@@ -2363,7 +2372,12 @@ /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE @@ -20231,7 +20014,7 @@ diff -Nur bogofilter-1.2.0.orig/src/lexer_v3.c bogofilter-1.2.0/src/lexer_v3.c #endif /* Copy whatever the last rule matched to the standard output. */ -@@ -2177,7 +2191,7 @@ +@@ -2372,7 +2386,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ @@ -20240,7 +20023,7 @@ diff -Nur bogofilter-1.2.0.orig/src/lexer_v3.c bogofilter-1.2.0/src/lexer_v3.c /* %endif */ /* %if-c++-only C++ definition */ /* %endif */ -@@ -2192,7 +2206,7 @@ +@@ -2387,7 +2401,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ @@ -20249,25 +20032,25 @@ diff -Nur bogofilter-1.2.0.orig/src/lexer_v3.c bogofilter-1.2.0/src/lexer_v3.c for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ -@@ -2305,7 +2319,7 @@ - #line 215 "./lexer_v3.l" +@@ -2500,7 +2514,7 @@ + #line 222 "./lexer_v3.l" --#line 2307 "lexer_v3.c" -+#line 2321 "lexer_v3.c" +-#line 2502 "lexer_v3.c" ++#line 2516 "lexer_v3.c" if ( !(yy_init) ) { -@@ -2711,7 +2725,7 @@ - #line 319 "./lexer_v3.l" +@@ -2912,7 +2926,7 @@ + #line 336 "./lexer_v3.l" ECHO; YY_BREAK --#line 2713 "lexer_v3.c" -+#line 2727 "lexer_v3.c" +-#line 2914 "lexer_v3.c" ++#line 2928 "lexer_v3.c" case YY_END_OF_BUFFER: { -@@ -3573,8 +3587,8 @@ +@@ -3773,8 +3787,8 @@ /* %if-c-only */ /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. @@ -20278,12 +20061,12 @@ diff -Nur bogofilter-1.2.0.orig/src/lexer_v3.c bogofilter-1.2.0/src/lexer_v3.c * * @return the newly allocated buffer state object. */ -diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in ---- bogofilter-1.2.0.orig/src/Makefile.in 2009-02-21 21:41:48.000000000 +0100 -+++ bogofilter-1.2.0/src/Makefile.in 2010-02-18 20:49:13.388856110 +0100 +diff -Nur bogofilter-1.2.1.orig/src/Makefile.in bogofilter-1.2.1/src/Makefile.in +--- bogofilter-1.2.1.orig/src/Makefile.in 2009-08-01 21:00:51.000000000 +0200 ++++ bogofilter-1.2.1/src/Makefile.in 2010-04-02 14:08:26.233530816 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20304,7 +20087,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -@@ -73,6 +75,7 @@ +@@ -72,6 +74,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = bf_compact bf_copy bf_tar @@ -20312,7 +20095,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libbf_gsl_a_AR = $(AR) $(ARFLAGS) -@@ -211,7 +214,6 @@ +@@ -210,7 +213,6 @@ @ENABLE_QDBM_DATASTORE_TRUE@am__EXEEXT_2 = bogoQDBMupgrade$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(bindir)" @@ -20320,7 +20103,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in @NEEDTRIO_TRUE@am__EXEEXT_3 = regression$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am__bogoQDBMupgrade_SOURCES_DIST = bogoQDBMupgrade.c \ -@@ -302,12 +304,32 @@ +@@ -301,12 +303,32 @@ wordhash_LDADD = $(LDADD) wordhash_DEPENDENCIES = libbogofilter.a $(am__append_8) \ $(am__DEPENDENCIES_1) $(am__append_11) @LIBOBJS@ @@ -20355,7 +20138,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -@@ -346,10 +368,40 @@ +@@ -345,10 +367,40 @@ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -20396,7 +20179,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ -@@ -413,6 +465,7 @@ +@@ -412,6 +464,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -20404,7 +20187,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -@@ -680,9 +733,9 @@ +@@ -674,9 +727,9 @@ exit 1;; \ esac; \ done; \ @@ -20417,7 +20200,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -700,6 +753,7 @@ +@@ -694,6 +747,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -20425,7 +20208,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in config.h: stamp-h1 @if test ! -f $@; then \ -@@ -711,7 +765,7 @@ +@@ -705,7 +759,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status src/config.h $(top_srcdir)/config.in: $(am__configure_deps) @@ -20434,7 +20217,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in rm -f stamp-h1 touch $@ -@@ -745,23 +799,37 @@ +@@ -739,23 +793,37 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -20486,7 +20269,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -@@ -819,41 +887,71 @@ +@@ -813,41 +881,71 @@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -20582,7 +20365,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -981,364 +1079,364 @@ +@@ -975,364 +1073,364 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -20999,16 +20782,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../trio/regression.c' object='regression.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regression.obj `if test -f '../trio/regression.c'; then $(CYGPATH_W) '../trio/regression.c'; else $(CYGPATH_W) '$(srcdir)/../trio/regression.c'; fi` -@@ -1353,7 +1451,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -1370,7 +1468,7 @@ +@@ -1364,7 +1462,7 @@ else \ local_target="$$target"; \ fi; \ @@ -21017,16 +20791,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ -@@ -1378,7 +1476,7 @@ - fi; test -z "$$fail" - - $(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -1404,16 +1502,16 @@ +@@ -1398,16 +1496,16 @@ else \ local_target="$$target"; \ fi; \ @@ -21046,7 +20811,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -1428,7 +1526,7 @@ +@@ -1422,7 +1520,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -21055,7 +20820,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ -@@ -1440,7 +1538,7 @@ +@@ -1434,7 +1532,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ @@ -21064,7 +20829,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -1449,29 +1547,34 @@ +@@ -1443,29 +1541,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ @@ -21107,7 +20872,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -1480,6 +1583,7 @@ +@@ -1474,6 +1577,7 @@ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ @@ -21115,7 +20880,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1491,10 +1595,10 @@ +@@ -1485,10 +1589,10 @@ *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ @@ -21128,7 +20893,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in ;; \ esac; \ elif test $$? -ne 77; then \ -@@ -1502,17 +1606,18 @@ +@@ -1496,17 +1600,18 @@ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ @@ -21150,7 +20915,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in done; \ if test "$$all" -eq 1; then \ tests="test"; \ -@@ -1554,11 +1659,15 @@ +@@ -1548,11 +1653,15 @@ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ @@ -21168,7 +20933,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in test "$$failed" -eq 0; \ else :; fi -@@ -1578,29 +1687,44 @@ +@@ -1572,29 +1681,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -21223,7 +20988,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -1638,6 +1762,7 @@ +@@ -1632,6 +1756,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -21231,7 +20996,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1661,6 +1786,8 @@ +@@ -1655,6 +1780,8 @@ html: html-recursive @@ -21240,7 +21005,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in info: info-recursive info-am: -@@ -1669,19 +1796,29 @@ +@@ -1663,19 +1790,29 @@ install-dvi: install-dvi-recursive @@ -21270,7 +21035,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -1704,8 +1841,9 @@ +@@ -1698,8 +1835,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-dist_binSCRIPTS @@ -21282,7 +21047,7 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-TESTS check-am clean clean-binPROGRAMS \ -@@ -1764,6 +1902,7 @@ +@@ -1758,6 +1896,7 @@ @PATCH_FLEX_254_TRUE@ patch $@ < $(srcdir)/patch.lexer.254.txt @PATCH_FLEX_253X_TRUE@ patch $@ < $(srcdir)/patch.lexer.253x.txt rm -f lex.yy.c @@ -21290,12 +21055,12 @@ diff -Nur bogofilter-1.2.0.orig/src/Makefile.in bogofilter-1.2.0/src/Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests/Makefile.in ---- bogofilter-1.2.0.orig/src/tests/Makefile.in 2009-02-21 21:41:48.000000000 +0100 -+++ bogofilter-1.2.0/src/tests/Makefile.in 2010-02-18 20:49:13.580866607 +0100 +diff -Nur bogofilter-1.2.1.orig/src/tests/Makefile.in bogofilter-1.2.1/src/tests/Makefile.in +--- bogofilter-1.2.1.orig/src/tests/Makefile.in 2009-08-01 21:00:51.000000000 +0200 ++++ bogofilter-1.2.1/src/tests/Makefile.in 2010-04-02 14:08:26.290972563 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -21306,7 +21071,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,8 +18,9 @@ - # $Id: Makefile.am 6802 2009-02-16 19:48:23Z m-a $ + # $Id: Makefile.am 6848 2009-07-31 19:18:32Z m-a $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ @@ -21349,7 +21114,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -@@ -342,9 +349,9 @@ +@@ -343,9 +350,9 @@ exit 1;; \ esac; \ done; \ @@ -21362,7 +21127,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -362,6 +369,7 @@ +@@ -363,6 +370,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -21370,7 +21135,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) -@@ -419,14 +427,14 @@ +@@ -420,14 +428,14 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -21387,7 +21152,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -@@ -443,7 +451,7 @@ +@@ -444,7 +452,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -21396,7 +21161,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ -@@ -451,29 +459,34 @@ +@@ -452,29 +460,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ @@ -21439,7 +21204,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -482,6 +495,7 @@ +@@ -483,6 +496,7 @@ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ @@ -21447,7 +21212,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -493,10 +507,10 @@ +@@ -494,10 +508,10 @@ *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ @@ -21460,7 +21225,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests ;; \ esac; \ elif test $$? -ne 77; then \ -@@ -504,17 +518,18 @@ +@@ -505,17 +519,18 @@ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ @@ -21482,7 +21247,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests done; \ if test "$$all" -eq 1; then \ tests="test"; \ -@@ -556,11 +571,15 @@ +@@ -557,11 +572,15 @@ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ @@ -21500,7 +21265,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests test "$$failed" -eq 0; \ else :; fi -@@ -580,13 +599,17 @@ +@@ -581,13 +600,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -21522,7 +21287,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests || exit 1; \ fi; \ done -@@ -619,6 +642,7 @@ +@@ -620,6 +643,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -21530,7 +21295,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -640,6 +664,8 @@ +@@ -641,6 +665,8 @@ html: html-am @@ -21539,7 +21304,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests info: info-am info-am: -@@ -648,18 +674,28 @@ +@@ -649,18 +675,28 @@ install-dvi: install-dvi-am @@ -21568,7 +21333,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests installcheck-am: maintainer-clean: maintainer-clean-am -@@ -681,7 +717,7 @@ +@@ -682,7 +718,7 @@ uninstall-am: @@ -21577,7 +21342,7 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic ctags distclean \ -@@ -710,6 +746,7 @@ +@@ -711,6 +747,7 @@ sed 's/[@]ENCODING[@]/@ENCODING@/' | \ sed 's/[@]DEFAULT_CHARSET[@]/@DEFAULT_CHARSET@/' > $@ || rm -f $@ chmod +x t.query.config @@ -21585,69 +21350,18 @@ diff -Nur bogofilter-1.2.0.orig/src/tests/Makefile.in bogofilter-1.2.0/src/tests # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -Nur bogofilter-1.2.0.orig/src/tests/t.query.config bogofilter-1.2.0/src/tests/t.query.config ---- bogofilter-1.2.0.orig/src/tests/t.query.config 2009-02-21 21:42:02.000000000 +0100 -+++ bogofilter-1.2.0/src/tests/t.query.config 1970-01-01 01:00:00.000000000 +0100 -@@ -1,47 +0,0 @@ --#!/bin/sh -- --. ${srcdir=.}/t.frame -- -- --cat <<EOF > "$TMPDIR"/reference --# bogofilter version ... -- --robx = 0.520000 # (5.20e-01) --robs = 0.017800 # (1.78e-02) --min_dev = 0.375000 # (3.75e-01) --ham_cutoff = 0.450000 # (4.50e-01) --spam_cutoff = 0.990000 # (9.90e-01) --ns_esf = 1.000000 # (1.00e+00) --sp_esf = 1.000000 # (1.00e+00) -- --block-on-subnets = No --encoding = utf-8 --charset-default = iso-8859-1 --replace-nonascii-characters = No --stats-in-header = Yes --thresh-update = 0.000000 --timestamp = Yes -- --spam-header-name = X-Bogosity --spam-header-place = '' --spam-subject-tag = '' --unsure-subject-tag = '' --header-format = %h: %c, tests=bogofilter, spamicity=%p, version=%v --terse-format = %1.1c %f --log-header-format = %h: %c, spamicity=%p, version=%v --log-update-format = register-%r, %w words, %m messages --spamicity-tags = Spam, Ham, Unsure --spamicity-formats = %0.6f, %0.6f, %0.6f --EOF -- --$BOGOFILTER -C -Q | sed "s/# bogofilter version .*/# bogofilter version .../" > "$TMPDIR"/output -- --CORRECT="$TMPDIR"/reference -- --for OUT in "$TMPDIR"/output ; do -- if [ $verbose -eq 0 ]; then -- cmp "$CORRECT" "$OUT" -- else -- diff $DIFF_BRIEF "$CORRECT" "$OUT" -- fi --done -diff -Nur bogofilter-1.2.0.orig/src/version.c bogofilter-1.2.0/src/version.c ---- bogofilter-1.2.0.orig/src/version.c 2009-02-21 22:13:50.000000000 +0100 -+++ bogofilter-1.2.0/src/version.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur bogofilter-1.2.1.orig/src/version.c bogofilter-1.2.1/src/version.c +--- bogofilter-1.2.1.orig/src/version.c 2009-08-01 13:15:43.000000000 +0200 ++++ bogofilter-1.2.1/src/version.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -#include "globals.h" --const char * const version = "1.2.0"; -diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile.in ---- bogofilter-1.2.0.orig/trio/Makefile.in 2009-02-21 21:41:48.000000000 +0100 -+++ bogofilter-1.2.0/trio/Makefile.in 2010-02-18 20:49:13.672851505 +0100 +-const char * const version = "1.2.1"; +diff -Nur bogofilter-1.2.1.orig/trio/Makefile.in bogofilter-1.2.1/trio/Makefile.in +--- bogofilter-1.2.1.orig/trio/Makefile.in 2009-08-01 21:00:51.000000000 +0200 ++++ bogofilter-1.2.1/trio/Makefile.in 2010-04-02 14:08:26.323100049 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -21668,7 +21382,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -@@ -45,6 +47,7 @@ +@@ -44,6 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = @@ -21676,7 +21390,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -111,6 +114,7 @@ +@@ -110,6 +113,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -21684,7 +21398,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ -@@ -196,9 +200,9 @@ +@@ -191,9 +195,9 @@ exit 1;; \ esac; \ done; \ @@ -21697,7 +21411,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -216,6 +220,7 @@ +@@ -211,6 +215,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -21705,7 +21419,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. tags: TAGS TAGS: -@@ -239,13 +244,17 @@ +@@ -234,13 +239,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -21727,7 +21441,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. || exit 1; \ fi; \ done -@@ -273,6 +282,7 @@ +@@ -268,6 +277,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -21735,7 +21449,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -291,6 +301,8 @@ +@@ -286,6 +296,8 @@ html: html-am @@ -21744,7 +21458,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. info: info-am info-am: -@@ -299,18 +311,28 @@ +@@ -294,18 +306,28 @@ install-dvi: install-dvi-am @@ -21773,7 +21487,7 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. installcheck-am: maintainer-clean: maintainer-clean-am -@@ -343,6 +365,7 @@ +@@ -338,6 +360,7 @@ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am @@ -21781,9 +21495,9 @@ diff -Nur bogofilter-1.2.0.orig/trio/Makefile.in bogofilter-1.2.0/trio/Makefile. # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -Nur bogofilter-1.2.0.orig/ylwrap bogofilter-1.2.0/ylwrap ---- bogofilter-1.2.0.orig/ylwrap 2009-01-11 15:22:24.000000000 +0100 -+++ bogofilter-1.2.0/ylwrap 2010-02-18 20:48:43.592865901 +0100 +diff -Nur bogofilter-1.2.1.orig/ylwrap bogofilter-1.2.1/ylwrap +--- bogofilter-1.2.1.orig/ylwrap 2009-01-11 15:22:24.000000000 +0100 ++++ bogofilter-1.2.1/ylwrap 2009-08-14 11:32:22.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. |