diff -ur fetchmail-5.2.8/configure fetchmail_pcre-5.2.8/configure --- fetchmail-5.2.8/configure Sun Jan 16 18:07:09 2000 +++ fetchmail_pcre-5.2.8/configure Fri Feb 18 16:03:03 2000 @@ -49,6 +49,8 @@ --with-hesiod=DIR point fetchmail compilation at a HESIOD directory" ac_help="$ac_help --with-gssapi[=DIR] compile in GSSAPI support using libraries in DIR" +ac_help="$ac_help + --with-pcre[=DIR] compile in PCRE support using libraries in DIR" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -589,7 +591,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:593: checking host system type" >&5 +echo "configure:595: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -612,7 +614,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:616: checking for $ac_word" >&5 +echo "configure:618: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -642,7 +644,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:646: checking for $ac_word" >&5 +echo "configure:648: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -693,7 +695,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:697: checking for $ac_word" >&5 +echo "configure:699: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -725,7 +727,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:731: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -736,12 +738,12 @@ cat > conftest.$ac_ext << EOF -#line 740 "configure" +#line 742 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -767,12 +769,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:773: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:776: checking whether we are using GNU C" >&5 +echo "configure:778: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -781,7 +783,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -800,7 +802,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:804: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:806: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -843,7 +845,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:847: checking for a BSD compatible install" >&5 +echo "configure:849: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -896,7 +898,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:900: checking how to run the C preprocessor" >&5 +echo "configure:902: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -911,13 +913,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -928,13 +930,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -945,13 +947,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -976,10 +978,10 @@ echo "$ac_t""$CPP" 1>&6 if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:980: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:982: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:983: checking whether cc understands -c and -o together" >&5 +echo "configure:985: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -991,16 +993,16 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:1003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -1027,9 +1029,9 @@ fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1031: checking for AIX" >&5 +echo "configure:1033: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1055: checking for POSIXized ISC" >&5 +echo "configure:1057: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1073,17 +1075,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1077: checking for minix/config.h" >&5 +echo "configure:1079: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1121,12 +1123,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1125: checking for ANSI C header files" >&5 +echo "configure:1127: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1134,7 +1136,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1151,7 +1153,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1169,7 +1171,7 @@ 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 < EOF @@ -1190,7 +1192,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1201,7 +1203,7 @@ exit (0); } EOF -if { (eval echo configure:1205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1225,12 +1227,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1229: checking for size_t" >&5 +echo "configure:1231: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1258,12 +1260,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1262: checking for pid_t" >&5 +echo "configure:1264: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1291,12 +1293,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1295: checking return type of signal handlers" >&5 +echo "configure:1297: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1313,7 +1315,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:1317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1335,17 +1337,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1339: checking for $ac_hdr" >&5 +echo "configure:1341: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1373,12 +1375,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1377: checking for working const" >&5 +echo "configure:1379: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1450,7 +1452,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1454: checking for $ac_word" >&5 +echo "configure:1456: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1484,7 +1486,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1488: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1490: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1492,7 +1494,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1530,7 +1532,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1534: checking for $ac_word" >&5 +echo "configure:1536: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1612,7 +1614,7 @@ ALL_LINGUAS="cs es fr pl pt_BR" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1616: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1618: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1641,7 +1643,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1645: checking for $ac_word" >&5 +echo "configure:1647: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1669,21 +1671,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1673: checking for inline" >&5 +echo "configure:1675: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1709,12 +1711,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1713: checking for off_t" >&5 +echo "configure:1715: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1744,19 +1746,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1748: checking for working alloca.h" >&5 +echo "configure:1750: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1777,12 +1779,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1781: checking for alloca" >&5 +echo "configure:1783: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1842,12 +1844,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1846: checking whether alloca needs Cray hooks" >&5 +echo "configure:1848: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1876: checking for $ac_func" >&5 +echo "configure:1878: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1927,7 +1929,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1931: checking stack direction for C alloca" >&5 +echo "configure:1933: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1935,7 +1937,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1979,17 +1981,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1983: checking for $ac_hdr" >&5 +echo "configure:1985: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2018,12 +2020,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2022: checking for $ac_func" >&5 +echo "configure:2024: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2071,7 +2073,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2075: checking for working mmap" >&5 +echo "configure:2077: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2079,7 +2081,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2247,17 +2249,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2251: checking for $ac_hdr" >&5 +echo "configure:2253: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2287,12 +2289,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2291: checking for $ac_func" >&5 +echo "configure:2293: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2344,12 +2346,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2348: checking for $ac_func" >&5 +echo "configure:2350: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2406,19 +2408,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2410: checking for LC_MESSAGES" >&5 +echo "configure:2412: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2439,7 +2441,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2443: checking whether NLS is requested" >&5 +echo "configure:2445: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2459,7 +2461,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2463: checking whether included gettext is requested" >&5 +echo "configure:2465: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2478,17 +2480,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2482: checking for libintl.h" >&5 +echo "configure:2484: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2505,19 +2507,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2509: checking for gettext in libc" >&5 +echo "configure:2511: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2533,7 +2535,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2537: checking for bindtextdomain in -lintl" >&5 +echo "configure:2539: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2541,7 +2543,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2568,12 +2570,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2572: checking for gettext in libintl" >&5 +echo "configure:2574: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2577: checking for gettext in -lintl" >&5 +echo "configure:2579: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2581,7 +2583,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2631,7 +2633,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2635: checking for $ac_word" >&5 +echo "configure:2637: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2665,12 +2667,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2669: checking for $ac_func" >&5 +echo "configure:2671: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2720,7 +2722,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2724: checking for $ac_word" >&5 +echo "configure:2726: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2756,7 +2758,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2760: checking for $ac_word" >&5 +echo "configure:2762: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2788,7 +2790,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2819,7 +2821,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2823: checking whether catgets can be used" >&5 +echo "configure:2825: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -2832,7 +2834,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2836: checking for main in -li" >&5 +echo "configure:2838: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2840,14 +2842,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2875,12 +2877,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2879: checking for catgets" >&5 +echo "configure:2881: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -2925,7 +2927,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2929: checking for $ac_word" >&5 +echo "configure:2931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2961,7 +2963,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2965: checking for $ac_word" >&5 +echo "configure:2967: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2998,7 +3000,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3002: checking for $ac_word" >&5 +echo "configure:3004: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3033,7 +3035,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3037: checking for $ac_word" >&5 +echo "configure:3039: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3091,7 +3093,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3095: checking for $ac_word" >&5 +echo "configure:3097: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3125,7 +3127,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3129: checking for $ac_word" >&5 +echo "configure:3131: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3161,7 +3163,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3165: checking for $ac_word" >&5 +echo "configure:3167: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3254,7 +3256,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3258: checking for catalogs to be installed" >&5 +echo "configure:3260: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3282,17 +3284,17 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3286: checking for linux/version.h" >&5 +echo "configure:3288: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3364,12 +3366,12 @@ # errors at link-time. It is thus better to only use the C library. # So don't add -linet to the link list unless it's necessary echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:3368: checking for socket" >&5 +echo "configure:3370: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -3410,7 +3412,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3414: checking for socket in -lsocket" >&5 +echo "configure:3416: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3418,7 +3420,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3457,7 +3459,7 @@ fi echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:3461: checking for socket in -linet" >&5 +echo "configure:3463: checking for socket in -linet" >&5 ac_lib_var=`echo inet'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3465,7 +3467,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3508,12 +3510,12 @@ # If gettext isn't in the C library, maybe there's a -lintl. echo $ac_n "checking for gettext""... $ac_c" 1>&6 -echo "configure:3512: checking for gettext" >&5 +echo "configure:3514: checking for gettext" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -3554,7 +3556,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3558: checking for gettext in -lintl" >&5 +echo "configure:3560: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3562,7 +3564,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3605,12 +3607,12 @@ # The condition in this test copes with the presence of inet_addr in libc6. echo $ac_n "checking for inet_addr""... $ac_c" 1>&6 -echo "configure:3609: checking for inet_addr" >&5 +echo "configure:3611: checking for inet_addr" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_addr=yes" else @@ -3651,7 +3653,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:3655: checking for inet_addr in -lnsl" >&5 +echo "configure:3657: checking for inet_addr in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3659,7 +3661,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3701,7 +3703,7 @@ echo $ac_n "checking for strchr in -lcposix""... $ac_c" 1>&6 -echo "configure:3705: checking for strchr in -lcposix" >&5 +echo "configure:3707: checking for strchr in -lcposix" >&5 ac_lib_var=`echo cposix'_'strchr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3709,7 +3711,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3743,12 +3745,12 @@ echo $ac_n "checking for strstr""... $ac_c" 1>&6 -echo "configure:3747: checking for strstr" >&5 +echo "configure:3749: checking for strstr" >&5 if eval "test \"`echo '$''{'ac_cv_func_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strstr=yes" else @@ -3797,12 +3799,12 @@ echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:3801: checking for strcasecmp" >&5 +echo "configure:3803: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -3851,12 +3853,12 @@ echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:3855: checking for memmove" >&5 +echo "configure:3857: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_memmove=yes" else @@ -3905,12 +3907,12 @@ echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3909: checking for getopt_long" >&5 +echo "configure:3911: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -3959,12 +3961,12 @@ echo $ac_n "checking for MD5Init""... $ac_c" 1>&6 -echo "configure:3963: checking for MD5Init" >&5 +echo "configure:3965: checking for MD5Init" >&5 if eval "test \"`echo '$''{'ac_cv_func_MD5Init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_MD5Init=yes" else @@ -4013,12 +4015,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4017: checking for vprintf" >&5 +echo "configure:4019: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4065,12 +4067,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4069: checking for _doprnt" >&5 +echo "configure:4071: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4120,19 +4122,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:4124: checking for working alloca.h" >&5 +echo "configure:4126: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4153,12 +4155,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4157: checking for alloca" >&5 +echo "configure:4159: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4218,12 +4220,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4222: checking whether alloca needs Cray hooks" >&5 +echo "configure:4224: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:4252: checking for $ac_func" >&5 +echo "configure:4254: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4303,7 +4305,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4307: checking stack direction for C alloca" >&5 +echo "configure:4309: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4311,7 +4313,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -4368,12 +4370,12 @@ atexit inet_aton strftime setrlimit socketpair sigprocmask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4372: checking for $ac_func" >&5 +echo "configure:4374: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4426,12 +4428,12 @@ # library. So don't add -lresolv to the link list unless it's necessary # (It will be necessary when using GNU libc6). echo $ac_n "checking for res_search""... $ac_c" 1>&6 -echo "configure:4430: checking for res_search" >&5 +echo "configure:4432: checking for res_search" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_search=yes" else @@ -4472,7 +4474,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:4476: checking for res_search in -lresolv" >&5 +echo "configure:4478: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4480,7 +4482,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4519,7 +4521,7 @@ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:4523: checking for crypt in -lcrypt" >&5 +echo "configure:4525: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4527,7 +4529,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4568,9 +4570,9 @@ echo $ac_n "checking use of void pointer type""... $ac_c" 1>&6 -echo "configure:4572: checking use of void pointer type" >&5 +echo "configure:4574: checking use of void pointer type" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_VOIDPOINTER 1 @@ -4595,16 +4597,16 @@ rm -f conftest* echo $ac_n "checking for ANSI volatile""... $ac_c" 1>&6 -echo "configure:4599: checking for ANSI volatile" >&5 +echo "configure:4601: checking for ANSI volatile" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_VOLATILE 1 @@ -4621,12 +4623,12 @@ for ac_func in waitpid wait3 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4625: checking for $ac_func" >&5 +echo "configure:4627: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4674,9 +4676,9 @@ done echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:4678: checking for union wait" >&5; +echo "configure:4680: checking for union wait" >&5; cat > conftest.$ac_ext < #include @@ -4695,7 +4697,7 @@ ; return 0; } EOF -if { (eval echo configure:4699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UNION_WAIT 1 @@ -4710,9 +4712,9 @@ rm -f conftest* echo $ac_n "checking sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:4714: checking sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:4716: checking sys_siglist declaration in signal.h or unistd.h" >&5 cat > conftest.$ac_ext < /* NetBSD declares sys_siglist in . */ @@ -4723,7 +4725,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SYS_SIGLIST_DECLARED 1 @@ -4752,7 +4754,7 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4756: checking size of short" >&5 +echo "configure:4758: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4760,7 +4762,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4771,7 +4773,7 @@ exit(0); } EOF -if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -4791,7 +4793,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4795: checking size of int" >&5 +echo "configure:4797: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4799,7 +4801,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4810,7 +4812,7 @@ exit(0); } EOF -if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -4830,7 +4832,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4834: checking size of long" >&5 +echo "configure:4836: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4838,7 +4840,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4849,7 +4851,7 @@ exit(0); } EOF -if { (eval echo configure:4853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -4987,17 +4989,17 @@ enableval="$enable_opie" ac_safe=`echo "opie.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for opie.h""... $ac_c" 1>&6 -echo "configure:4991: checking for opie.h" >&5 +echo "configure:4993: checking for opie.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5020,7 +5022,7 @@ fi echo $ac_n "checking for opiegenerator in -lopie""... $ac_c" 1>&6 -echo "configure:5024: checking for opiegenerator in -lopie" >&5 +echo "configure:5026: checking for opiegenerator in -lopie" >&5 ac_lib_var=`echo opie'_'opiegenerator | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5028,7 +5030,7 @@ ac_save_LIBS="$LIBS" LIBS="-lopie $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5081,12 +5083,12 @@ if test "${enable_inet6+set}" = set; then enableval="$enable_inet6" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:5085: checking for getaddrinfo" >&5 +echo "configure:5087: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -5128,7 +5130,7 @@ echo "$ac_t""no" 1>&6 LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6 -echo "configure:5132: checking for getaddrinfo in -linet6" >&5 +echo "configure:5134: checking for getaddrinfo in -linet6" >&5 ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5136,7 +5138,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet6 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5185,12 +5187,12 @@ for ac_func in inner_connect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5189: checking for $ac_func" >&5 +echo "configure:5191: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5242,7 +5244,7 @@ if test "${enable_netsec+set}" = set; then enableval="$enable_netsec" unset ac_cv_lib_inet6_net_security_strtorequest; echo $ac_n "checking for net_security_strtorequest in -linet6""... $ac_c" 1>&6 -echo "configure:5246: checking for net_security_strtorequest in -linet6" >&5 +echo "configure:5248: checking for net_security_strtorequest in -linet6" >&5 ac_lib_var=`echo inet6'_'net_security_strtorequest | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5250,7 +5252,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet6 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5289,7 +5291,7 @@ unset ac_cv_lib_inet6_net_security_strtorequest; LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; echo $ac_n "checking for net_security_strtorequest in -linet6""... $ac_c" 1>&6 -echo "configure:5293: checking for net_security_strtorequest in -linet6" >&5 +echo "configure:5295: checking for net_security_strtorequest in -linet6" >&5 ac_lib_var=`echo inet6'_'net_security_strtorequest | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5297,7 +5299,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet6 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5343,17 +5345,17 @@ unset ac_cv_header_net_security_h; ac_safe=`echo "net/security.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for net/security.h""... $ac_c" 1>&6 -echo "configure:5347: checking for net/security.h" >&5 +echo "configure:5349: checking for net/security.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5376,17 +5378,17 @@ CPPFLAGS="$CPPFLAGS -I/usr/inet6/include"; CFLAGS="$CFLAGS -I/usr/inet6/include"; ac_safe=`echo "net/security.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for net/security.h""... $ac_c" 1>&6 -echo "configure:5380: checking for net/security.h" >&5 +echo "configure:5382: checking for net/security.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5614,7 +5616,7 @@ LDEFLAGS="$LDEFLAGS -L$with_socks" else echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6 -echo "configure:5618: checking for Rconnect in -lsocks" >&5 +echo "configure:5620: checking for Rconnect in -lsocks" >&5 ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5622,7 +5624,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocks $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5722,7 +5724,7 @@ then LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl" echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6 -echo "configure:5726: checking for gss_init_sec_context in -lgssapi" >&5 +echo "configure:5728: checking for gss_init_sec_context in -lgssapi" >&5 ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5730,7 +5732,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgssapi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5768,7 +5770,7 @@ else echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6 -echo "configure:5772: checking for gss_init_sec_context in -lgssapi_krb5" >&5 +echo "configure:5774: checking for gss_init_sec_context in -lgssapi_krb5" >&5 ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5776,7 +5778,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgssapi_krb5 -lkrb5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5819,17 +5821,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5823: checking for $ac_hdr" >&5 +echo "configure:5825: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5857,7 +5859,7 @@ if test "$ac_cv_header_gssapi_h" = "yes"; then cat > conftest.$ac_ext < EOF @@ -5873,7 +5875,7 @@ else cat > conftest.$ac_ext < EOF @@ -5890,6 +5892,25 @@ fi fi fi + + + +### use option --use-pcre to compile in the PCRE support +# Check whether --with-pcre or --without-pcre was given. +if test "${with_pcre+set}" = set; then + withval="$with_pcre" + +if test "$with_pcre" != "no" +then + if test "$with_pcre" != "yes" -a -n "$with_pcre" + then + CFLAGS="$CFLAGS -I$with_pcre -DUSE_PCRE" + LDFLAGS="$LDFLAGS -L$with_pcre" + fi + LIBS="$LIBS $with_pcre/libpcre.a" +fi +fi + trap '' 1 2 15 diff -ur fetchmail-5.2.8/configure.in fetchmail_pcre-5.2.8/configure.in --- fetchmail-5.2.8/configure.in Sun Jan 16 18:07:01 2000 +++ fetchmail_pcre-5.2.8/configure.in Fri Feb 18 15:54:12 2000 @@ -559,6 +559,22 @@ fi fi]) + +### use option --use-pcre to compile in the PCRE support +AC_ARG_WITH(pcre, + [ --with-pcre[=DIR] compile in PCRE support using libraries in DIR], +[ +if test "$with_pcre" != "no" +then + if test "$with_pcre" != "yes" -a -n "$with_pcre" + then + CFLAGS="$CFLAGS -I$with_pcre -DUSE_PCRE" + LDFLAGS="$LDFLAGS -L$with_pcre" + fi + LIBS="$LIBS $with_pcre/libpcre.a" +fi]) + + AC_OUTPUT([Makefile intl/Makefile po/Makefile.in], [ # The reason for this odd makedepend line is that we want # to have all dependencies evaluated relative to the source directory diff -ur fetchmail-5.2.8/driver.c fetchmail_pcre-5.2.8/driver.c --- fetchmail-5.2.8/driver.c Mon Feb 7 02:39:49 2000 +++ fetchmail_pcre-5.2.8/driver.c Fri Feb 18 15:54:12 2000 @@ -436,6 +436,12 @@ flag no_local_matches = FALSE; flag headers_ok, has_nuls; int olderrs, good_addresses, bad_addresses; + +#ifdef USE_PCRE + int pcre_retain_match, pcre_invretain_match, pcre_length; + int pcre_offsets[99]; + char pcre_buffer[65535]; +#endif /* USE_PCRE */ sizeticker = 0; has_nuls = headers_ok = FALSE; @@ -451,6 +457,10 @@ msglen = 0; skipcount = 0; ctl->mimemsg = 0; + +#ifdef USE_PCRE + pcre_retain_match = pcre_invretain_match = 0; +#endif /* USE_PCRE */ for (remaining = fetchlen; remaining > 0 || protocol->delimited; remaining -= linelen) { @@ -593,6 +603,34 @@ free(msgblk.headers); return(PS_RETAINED); } + +#ifdef USE_PCRE + strcpy(pcre_buffer, line); + pcre_length = (int)strlen(pcre_buffer); + if (pcre_length > 0 && pcre_buffer[pcre_length-1] == '\n') + pcre_buffer[--pcre_length] = 0; + + if (ctl->pcre_retain == 1) { + pcre_retain_match = pcre_exec(ctl->pcre_retain_pattern, + ctl->pcre_retain_hints, + pcre_buffer, pcre_length, + 0, 0, pcre_offsets, 99) + >= 0; + if (pcre_retain_match) { + free(line); + free(msgblk.headers); + return(PS_RETAINED); + } + } + if (ctl->pcre_invretain == 1) { + pcre_invretain_match += pcre_exec(ctl->pcre_invretain_pattern, + ctl->pcre_invretain_hints, + pcre_buffer, pcre_length, + 0, 0, pcre_offsets, 99) + >= 0; + } +#endif /* USE_PCRE */ + /* * This code prevents fetchmail from becoming an accessory after @@ -947,6 +985,14 @@ free_str_list(&msgblk.recipients); return(PS_TRANSIENT); } +#ifdef USE_PCRE + else if (pcre_invretain_match == 0 && ctl->pcre_invretain) + { + free(msgblk.headers); + free_str_list(&msgblk.recipients); + return(PS_RETAINED); + } +#endif /* USE_PCRE */ else { /* set up stuffline() so we can deliver the message body through it */ diff -ur fetchmail-5.2.8/fetchmail.c fetchmail_pcre-5.2.8/fetchmail.c --- fetchmail-5.2.8/fetchmail.c Tue Feb 15 00:04:48 2000 +++ fetchmail_pcre-5.2.8/fetchmail.c Fri Feb 18 15:54:12 2000 @@ -934,6 +934,16 @@ FLAG_MERGE(expunge); FLAG_MERGE(properties); + +#ifdef USE_PCRE + FLAG_MERGE(pcre_retain); + FLAG_MERGE(pcre_retain_pattern); + FLAG_MERGE(pcre_retain_hints); + FLAG_MERGE(pcre_invretain); + FLAG_MERGE(pcre_invretain_pattern); + FLAG_MERGE(pcre_invretain_hints); +#endif /* USE_PCRE */ + #undef FLAG_MERGE } @@ -961,6 +971,11 @@ def_opts.warnings = WARNING_INTERVAL; def_opts.remotename = user; def_opts.listener = SMTP_MODE; + +#ifdef USE_PCRE + def_opts.pcre_retain = 0; + def_opts.pcre_invretain = 0; +#endif /* USE_PCRE */ /* note the parse time, so we can pick up on modifications */ parsetime = 0; /* foil compiler warnings */ @@ -1819,6 +1834,14 @@ if (ctl->properties) printf(_(" Pass-through properties \"%s\".\n"), visbuf(ctl->properties)); + +#ifdef USE_PCRE + if (ctl->pcre_retain == 1 && outlevel >= O_VERBOSE) + printf(" Retain pattern specified.\n"); + if (ctl->pcre_invretain == 1 && outlevel >= O_VERBOSE) + printf(" Inverse retain pattern specified.\n"); +#endif /* USE_PCRE */ + } } diff -ur fetchmail-5.2.8/fetchmail.h fetchmail_pcre-5.2.8/fetchmail.h --- fetchmail-5.2.8/fetchmail.h Sat Feb 5 05:07:13 2000 +++ fetchmail_pcre-5.2.8/fetchmail.h Fri Feb 18 15:54:12 2000 @@ -5,6 +5,12 @@ /* We need this for HAVE_STDARG_H, etc */ #include "config.h" +#ifdef USE_PCRE +/* We need this for Perl Compatible Regular Expressions library */ +#include "pcre.h" +#endif /* USE_PCRE */ + + /* constants designating the various supported protocols */ #define P_AUTO 1 #define P_POP2 2 @@ -286,6 +292,15 @@ /* internal use -- per-message state */ int mimemsg; /* bitmask indicating MIME body-type */ char digest [DIGESTLEN]; /* md5 digest buffer */ + +#ifdef USE_PCRE + int pcre_retain; + pcre *pcre_retain_pattern; + pcre_extra *pcre_retain_hints; + int pcre_invretain; + pcre *pcre_invretain_pattern; + pcre_extra *pcre_invretain_hints; +#endif /* USE_PCRE */ /* internal use -- housekeeping */ struct query *next; /* next query control block in chain */ diff -ur fetchmail-5.2.8/fetchmail.lsm fetchmail_pcre-5.2.8/fetchmail.lsm --- fetchmail-5.2.8/fetchmail.lsm Tue Feb 15 01:20:33 2000 +++ fetchmail_pcre-5.2.8/fetchmail.lsm Sat Feb 19 00:01:59 2000 @@ -1,19 +1,22 @@ Begin3 -Title: fetchmail -Version: 5.2.7 -Entered-date: 6FEB20100 +Title: fetchmail_pcre +Version: 5.2.8 +Entered-date: 18FEB2000 Description: Full-featured IMAP/POP2/POP3/APOP/RPOP/KPOP client with GUI configuration, daemon mode, forwarding via SMTP or local MDA, superior reply handling, support for multidrop mailboxes. Not a mail user agent, rather a pipe-fitting that seamlessly forwards fetched mail to your local delivery system. - Your one-stop solution for intermittent email connections. - Home page and FAQ at http://www.tuxedo.org/~esr/fetchmail. -Keywords: mail, client, POP, POP2, POP3, APOP, RPOP, KPOP, IMAP, ETRN, - SMTP, RPA, NTLM. -Author: esr@snark.thyrsus.com (Eric S. Raymond) -Primary-site: locke.ccil.org /pub/esr/fetchmail - 744K fetchmail-5.2.7.tar.gz + This version has filtering features using the pcre library + from ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/ + for perl-ish regular expression matching. +Keywords: mail, client, POP, POP2, POP3, APOP, RPOP, KPOP, IMAP, SMTP, + ETRN, RPA, NTLM, filter, pcre, regex +Author: esr@snark.thyrsus.com (Eric S. Raymond) + Soenke J. Peters + (for the pcre stuff) +Primary-site: metalab.unc.edu /pub/Linux/system/mail/pop (pcre version) + locke.ccil.org /pub/esr/fetchmail (original version) Platforms: All Copying-policy: GPL End diff -ur fetchmail-5.2.8/fetchmail.man fetchmail_pcre-5.2.8/fetchmail.man --- fetchmail-5.2.8/fetchmail.man Sat Feb 12 07:53:51 2000 +++ fetchmail_pcre-5.2.8/fetchmail.man Fri Feb 18 16:11:01 2000 @@ -1290,6 +1290,12 @@ properties \& T{ String value is ignored by fetchmail (may be used by extension scripts) T} +retain -X T{ +Perl compatible regex which specifies which mail should be retained. +T} +invretain -x T{ +Perl compatible regex which specifies which mail should be retrieved. +T} .TE .PP Remember that all user options must \fIfollow\fR all server options. diff -ur fetchmail-5.2.8/intl/Makefile fetchmail_pcre-5.2.8/intl/Makefile --- fetchmail-5.2.8/intl/Makefile Sat Feb 12 07:39:32 2000 +++ fetchmail_pcre-5.2.8/intl/Makefile Fri Feb 18 16:20:42 2000 @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. PACKAGE = fetchmail -VERSION = 5.2.7 +VERSION = 5.2.8 SHELL = /bin/sh @@ -51,8 +51,8 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DHAVE_CONFIG_H CPPFLAGS = -CFLAGS = -O -LDFLAGS = -s +CFLAGS = -O -I/tmp/pcre-3.0 -DUSE_PCRE +LDFLAGS = -s -L/tmp/pcre-3.0 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) diff -ur fetchmail-5.2.8/options.c fetchmail_pcre-5.2.8/options.c --- fetchmail-5.2.8/options.c Sat Feb 5 05:07:47 2000 +++ fetchmail_pcre-5.2.8/options.c Fri Feb 18 15:57:46 2000 @@ -77,9 +77,20 @@ #define LA_SSLCERT 51 #endif -/* options still left: CDgGhHjJoORwWxXYz */ +#ifdef USE_PCRE +#define LA_RETAIN 52 +#define LA_INVRETAIN 53 +#endif /* USE_PCRE */ + +#ifdef USE_PCRE +/* options still left: CDgGhHjJoORwWYz */ static const char *shortoptions = + "?Vcsvd:NqL:f:i:p:UP:A:t:E:Q:u:akKFnl:r:S:Z:b:B:e:m:T:I:M:yw:X:x:"; +#else /* USE_PCRE */ +/* options still left: CDgGhHjJoORwWxXYz */ +static const char *shortoptions = "?Vcsvd:NqL:f:i:p:UP:A:t:E:Q:u:akKFnl:r:S:Z:b:B:e:m:T:I:M:yw:"; +#endif /* USE_PCRE */ static const struct option longoptions[] = { /* this can be const because all flag fields are 0 and will never get set */ @@ -152,6 +163,11 @@ {"configdump",no_argument, (int *) 0, LA_CONFIGDUMP }, {"yydebug", no_argument, (int *) 0, LA_YYDEBUG }, + +#ifdef USE_PCRE + {"retain", required_argument, (int *) 0, LA_RETAIN }, + {"invretain", required_argument, (int *) 0, LA_INVRETAIN }, +#endif /* USE_PCRE */ {(char *) 0, no_argument, (int *) 0, 0 } }; @@ -248,6 +264,11 @@ int helpflag = 0; /* TRUE when option help was explicitly requested */ int option_index; char *buf, *cp; + +#ifdef USE_PCRE + int pcre_errptr = 0; + const char *pcre_error = NULL; +#endif /* USE_PCRE */ rctl->poll_interval = -1; @@ -570,6 +591,38 @@ case LA_NOSYSLOG: rctl->use_syslog = FLAG_FALSE; break; + +#ifdef USE_PCRE + case 'X': + case LA_RETAIN: + /* Compile the regular expression. */ + ctl->pcre_retain_pattern = pcre_compile(optarg, PCRE_CASELESS, &pcre_error, &pcre_errptr, NULL); + /* Study the regular expression, as we will be running it many times */ + ctl->pcre_retain_hints = pcre_study(ctl->pcre_retain_pattern, 0, &pcre_error); + if (pcre_error != NULL) { + fprintf(stderr, "pcre: error while studing regex %s: %s\n",optarg, pcre_error); + ctl->pcre_retain_pattern = NULL; + } + else { + ctl->pcre_retain = 1; + } + break; + + case 'x': + case LA_INVRETAIN: + /* Compile the regular expression. */ + ctl->pcre_invretain_pattern = pcre_compile(optarg, PCRE_CASELESS, &pcre_error, &pcre_errptr, NULL); + /* Study the regular expression, as we will be running it many times */ + ctl->pcre_invretain_hints = pcre_study(ctl->pcre_invretain_pattern, 0, &pcre_error); + if (pcre_error != NULL) { + fprintf(stderr, "pcre: error while studing regex %s: %s\n",optarg, pcre_error); + ctl->pcre_invretain_pattern = NULL; + } + else { + ctl->pcre_invretain = 1; + } + break; +#endif /* USE_PCRE */ case '?': case LA_HELP: @@ -641,6 +694,12 @@ P(_(" --bsmtp set output BSMTP file\n")); P(_(" --lmtp use LMTP (RFC2033) for delivery\n")); P(_(" -r, --folder specify remote folder name\n")); + +#ifdef USE_PCRE + P(_(" -X, --retain specify keep-pattern\n")); + P(_(" -x, --invretain specify inverse keep-pattern\n")); +#endif /* USE_PCRE */ + #undef P if (helpflag) diff -ur fetchmail-5.2.8/po/Makefile fetchmail_pcre-5.2.8/po/Makefile --- fetchmail-5.2.8/po/Makefile Sat Feb 12 07:39:35 2000 +++ fetchmail_pcre-5.2.8/po/Makefile Fri Feb 18 16:20:45 2000 @@ -8,7 +8,7 @@ # Please note that the actual code is *not* freely available. PACKAGE = fetchmail -VERSION = 5.2.7 +VERSION = 5.2.8 SHELL = /bin/sh @@ -36,7 +36,7 @@ MSGMERGE = PATH=../src:$$PATH msgmerge DEFS = -DHAVE_CONFIG_H -CFLAGS = -O +CFLAGS = -O -I/tmp/pcre-3.0 -DUSE_PCRE CPPFLAGS = INCLUDES = -I.. -I$(top_srcdir)/intl diff -ur fetchmail-5.2.8/po/Makefile.in fetchmail_pcre-5.2.8/po/Makefile.in --- fetchmail-5.2.8/po/Makefile.in Sat Feb 12 07:39:32 2000 +++ fetchmail_pcre-5.2.8/po/Makefile.in Fri Feb 18 16:20:43 2000 @@ -8,7 +8,7 @@ # Please note that the actual code is *not* freely available. PACKAGE = fetchmail -VERSION = 5.2.7 +VERSION = 5.2.8 SHELL = /bin/sh @@ -36,7 +36,7 @@ MSGMERGE = PATH=../src:$$PATH msgmerge DEFS = -DHAVE_CONFIG_H -CFLAGS = -O +CFLAGS = -O -I/tmp/pcre-3.0 -DUSE_PCRE CPPFLAGS = INCLUDES = -I.. -I$(top_srcdir)/intl diff -ur fetchmail-5.2.8/rcfile_l.l fetchmail_pcre-5.2.8/rcfile_l.l --- fetchmail-5.2.8/rcfile_l.l Sat Feb 5 05:08:24 2000 +++ fetchmail_pcre-5.2.8/rcfile_l.l Fri Feb 18 16:00:25 2000 @@ -174,6 +174,16 @@ (apop)|(APOP) { yylval.proto = P_APOP; return PROTO; } (etrn)|(ETRN) { yylval.proto = P_ETRN; return PROTO; } (kpop)|(KPOP) { return KPOP; } +(invretain)|(INVRETAIN) { +#ifdef USE_PCRE + return INVRETAIN; +#endif /* USE_PCRE */ + } +(retain)|(RETAIN) { +#ifdef USE_PCRE + return RETAIN; +#endif /* USE_PCRE */ + } (#.*)?\\?\n { prc_lineno++; } /* newline is ignored */ diff -ur fetchmail-5.2.8/rcfile_y.y fetchmail_pcre-5.2.8/rcfile_y.y --- fetchmail-5.2.8/rcfile_y.y Sat Feb 5 05:08:46 2000 +++ fetchmail_pcre-5.2.8/rcfile_y.y Fri Feb 18 16:21:01 2000 @@ -35,6 +35,11 @@ /* parser sets these */ struct query *querylist; /* head of server list (globally visible) */ +#ifdef USE_PCRE +int pcre_errptr = 0; +const char *pcre_error = NULL; +#endif /* USE_PCRE */ + int yydebug; /* in case we didn't generate with -- debug */ static struct query current; /* current server record */ @@ -70,6 +75,7 @@ %token NUMBER %token NO KEEP FLUSH FETCHALL REWRITE FORCECR STRIPCR PASS8BITS DROPSTATUS %token DNS SERVICE PORT UIDL INTERVAL MIMEDECODE CHECKALIAS SSL SSLKEY SSLCERT +%token RETAIN INVRETAIN %% @@ -341,6 +347,50 @@ | EXPUNGE NUMBER {current.expunge = NUM_VALUE_IN($2);} | PROPERTIES STRING {current.properties = xstrdup($2);} + | RETAIN STRING + { +#ifdef USE_PCRE + current.pcre_retain = 1; + /* Compile the regular expression. */ + current.pcre_retain_pattern = + pcre_compile(xstrdup($2), PCRE_CASELESS, + &pcre_error, &pcre_errptr, NULL); + /* Study the regular expression, + as we will be running it many times */ + current.pcre_retain_hints = + pcre_study(current.pcre_retain_pattern, + 0, &pcre_error); + if (pcre_error != NULL) { + current.pcre_retain_pattern = NULL; + } + else { + current.pcre_retain = 1; + } +#endif /* USE_PCRE */ + } + | INVRETAIN STRING + { +#ifdef USE_PCRE + current.pcre_invretain = 1; + /* Compile the regular expression. */ + current.pcre_invretain_pattern = + pcre_compile(xstrdup($2), PCRE_CASELESS, + &pcre_error, &pcre_errptr, NULL); + /* Study the regular expression, + as we will be running it many times */ + current.pcre_invretain_hints = + pcre_study(current.pcre_invretain_pattern, + 0, &pcre_error); + if (pcre_error != NULL) { + current.pcre_invretain_pattern = NULL; + } + else { + current.pcre_invretain = 1; + } +#endif /* USE_PCRE */ + } + + ; %%