\1<\/a>/g'
}
# ===
@@ -444,8 +473,7 @@ Cat "${file}" | \
Elide "dd" | \
Elide "pre" | \
Decorate dt "![](\"graphics/bullet.gif\")
\\\ " | \
- Decorate dd "" | \
+ Decorate dd "
" "
" | \
Anchorise_1 | \
- Anchorise_2 | \
MoveIndex
diff --git a/config.h.in b/config.h.in
index 41cf175..adf4128 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,44 +1,43 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both and . */
-#undef TIME_WITH_SYS_TIME
-
-/* Define if you have the glob function. */
-#undef HAVE_GLOB
-
-/* Define if you have the header file. */
+/* Define if you have the header file, and it defines `DIR'. */
#undef HAVE_DIRENT_H
-/* Define if you have the header file. */
+/* Define if you have the `glob' function. */
+#undef HAVE_GLOB
+
+/* have reentrant gmtime */
+#undef HAVE_GMTIME_R
+
+/* have reentrant localtime */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
-/* Define if you have the header file. */
+/* auto_ptr assignment has non-const rhs */
+#undef HAVE_NONCONST_AUTOPTR
+
+/* Define if you have the header file, and it defines `DIR'. */
#undef HAVE_SYS_DIR_H
-/* Define if you have the header file. */
+/* Define if you have the header file, and it defines `DIR'. */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the header file. */
+/* Define if you have the header file. */
#undef HAVE_SYS_TIME_H
-/* Define if you have the header file. */
+/* Define if you have the header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both and . */
+#undef TIME_WITH_SYS_TIME
+
/* Version number of package */
#undef VERSION
-
-/* auto_ptr assignment has non-const rhs */
-#undef HAVE_NONCONST_AUTOPTR
-
-/* have reentrant localtime */
-#undef HAVE_LOCALTIME_R
-
-/* have reentrant gmtime */
-#undef HAVE_GMTIME_R
-
diff --git a/configure b/configure
index 573c0fb..914e6ea 100755
--- a/configure
+++ b/configure
@@ -1,26 +1,119 @@
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by Autoconf 2.52.
#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-# Defaults:
-ac_help=
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
+fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
+ as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
ac_default_prefix=/usr/local
-# Any additions from configure.in:
+cross_compiling=no
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+ac_unique_file="src/main/gsmtp.h"
# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
# The variables have the same names as the options, with
# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
exec_prefix=NONE
-host=NONE
no_create=
-nonopt=NONE
no_recursion=
prefix=NONE
program_prefix=NONE
@@ -29,10 +122,15 @@ program_transform_name=s,x,x,
silent=
site=
srcdir=
-target=NONE
verbose=
x_includes=NONE
x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
@@ -46,17 +144,16 @@ oldincludedir='/usr/include'
infodir='${prefix}/info'
mandir='${prefix}/man'
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
ac_prev=
for ac_option
do
-
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
eval "$ac_prev=\$ac_option"
@@ -64,59 +161,59 @@ do
continue
fi
- case "$ac_option" in
- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) ac_optarg= ;;
- esac
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
# Accept the important Cygnus configure options, so we can diagnose typos.
- case "$ac_option" in
+ case $ac_option in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir="$ac_optarg" ;;
+ bindir=$ac_optarg ;;
-build | --build | --buil | --bui | --bu)
- ac_prev=build ;;
+ ac_prev=build_alias ;;
-build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build="$ac_optarg" ;;
+ build_alias=$ac_optarg ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ac_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file="$ac_optarg" ;;
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
-datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
-datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
| --da=*)
- datadir="$ac_optarg" ;;
+ datadir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- eval "enable_${ac_feature}=no" ;;
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
-enable-* | --enable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
*) ac_optarg=yes ;;
esac
- eval "enable_${ac_feature}='$ac_optarg'" ;;
+ eval "enable_$ac_feature='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -125,95 +222,47 @@ do
-exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
| --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
| --exec=* | --exe=* | --ex=*)
- exec_prefix="$ac_optarg" ;;
+ exec_prefix=$ac_optarg ;;
-gas | --gas | --ga | --g)
# Obsolete; use --with-gas.
with_gas=yes ;;
- -help | --help | --hel | --he)
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
- --cache-file=FILE cache test results in FILE
- --help print this message
- --no-create do not create output files
- --quiet, --silent do not print \`checking...' messages
- --version print the version of autoconf that created configure
-Directory and file names:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [same as prefix]
- --bindir=DIR user executables in DIR [EPREFIX/bin]
- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data in DIR
- [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data in DIR
- [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
- --includedir=DIR C header files in DIR [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
- --infodir=DIR info documentation in DIR [PREFIX/info]
- --mandir=DIR man documentation in DIR [PREFIX/man]
- --srcdir=DIR find the sources in DIR [configure dir or ..]
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM
- run sed PROGRAM on installed program names
-EOF
- cat << EOF
-Host type:
- --build=BUILD configure for building on BUILD [BUILD=HOST]
- --host=HOST configure for HOST [guessed]
- --target=TARGET configure for TARGET [TARGET=HOST]
-Features and packages:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
-EOF
- if test -n "$ac_help"; then
- echo "--enable and --with options recognized:$ac_help"
- fi
- exit 0 ;;
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
-host | --host | --hos | --ho)
- ac_prev=host ;;
+ ac_prev=host_alias ;;
-host=* | --host=* | --hos=* | --ho=*)
- host="$ac_optarg" ;;
+ host_alias=$ac_optarg ;;
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
| --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir="$ac_optarg" ;;
+ includedir=$ac_optarg ;;
-infodir | --infodir | --infodi | --infod | --info | --inf)
ac_prev=infodir ;;
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir="$ac_optarg" ;;
+ infodir=$ac_optarg ;;
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir="$ac_optarg" ;;
+ libdir=$ac_optarg ;;
-libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
| --libexe | --libex | --libe)
ac_prev=libexecdir ;;
-libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
| --libexe=* | --libex=* | --libe=*)
- libexecdir="$ac_optarg" ;;
+ libexecdir=$ac_optarg ;;
-localstatedir | --localstatedir | --localstatedi | --localstated \
| --localstate | --localstat | --localsta | --localst \
@@ -222,12 +271,12 @@ EOF
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
| --localstate=* | --localstat=* | --localsta=* | --localst=* \
| --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir="$ac_optarg" ;;
+ localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
ac_prev=mandir ;;
-mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir="$ac_optarg" ;;
+ mandir=$ac_optarg ;;
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
@@ -248,26 +297,26 @@ EOF
-oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
| --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
| --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir="$ac_optarg" ;;
+ oldincludedir=$ac_optarg ;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix="$ac_optarg" ;;
+ prefix=$ac_optarg ;;
-program-prefix | --program-prefix | --program-prefi | --program-pref \
| --program-pre | --program-pr | --program-p)
ac_prev=program_prefix ;;
-program-prefix=* | --program-prefix=* | --program-prefi=* \
| --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix="$ac_optarg" ;;
+ program_prefix=$ac_optarg ;;
-program-suffix | --program-suffix | --program-suffi | --program-suff \
| --program-suf | --program-su | --program-s)
ac_prev=program_suffix ;;
-program-suffix=* | --program-suffix=* | --program-suffi=* \
| --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix="$ac_optarg" ;;
+ program_suffix=$ac_optarg ;;
-program-transform-name | --program-transform-name \
| --program-transform-nam | --program-transform-na \
@@ -284,7 +333,7 @@ EOF
| --program-transfo=* | --program-transf=* \
| --program-trans=* | --program-tran=* \
| --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name="$ac_optarg" ;;
+ program_transform_name=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
@@ -294,7 +343,7 @@ EOF
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
| --sbi=* | --sb=*)
- sbindir="$ac_optarg" ;;
+ sbindir=$ac_optarg ;;
-sharedstatedir | --sharedstatedir | --sharedstatedi \
| --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -305,58 +354,57 @@ EOF
| --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
| --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
| --sha=* | --sh=*)
- sharedstatedir="$ac_optarg" ;;
+ sharedstatedir=$ac_optarg ;;
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
- site="$ac_optarg" ;;
+ site=$ac_optarg ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir="$ac_optarg" ;;
+ srcdir=$ac_optarg ;;
-sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
| --syscon | --sysco | --sysc | --sys | --sy)
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir="$ac_optarg" ;;
+ sysconfdir=$ac_optarg ;;
-target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target ;;
+ ac_prev=target_alias ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target="$ac_optarg" ;;
+ target_alias=$ac_optarg ;;
-v | -verbose | --verbose | --verbos | --verbo | --verb)
verbose=yes ;;
- -version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.13"
- exit 0 ;;
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
*) ac_optarg=yes ;;
esac
- eval "with_${ac_package}='$ac_optarg'" ;;
+ eval "with_$ac_package='$ac_optarg'" ;;
-without-* | --without-*)
- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- eval "with_${ac_package}=no" ;;
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
--x)
# Obsolete; use --with-x.
@@ -367,98 +415,98 @@ EOF
ac_prev=x_includes ;;
-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes="$ac_optarg" ;;
+ x_includes=$ac_optarg ;;
-x-libraries | --x-libraries | --x-librarie | --x-librari \
| --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
ac_prev=x_libraries ;;
-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries="$ac_optarg" ;;
+ x_libraries=$ac_optarg ;;
- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
;;
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
+ export $ac_envvar ;;
+
*)
- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" 1>&2
- fi
- if test "x$nonopt" != xNONE; then
- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
- fi
- nonopt="$ac_option"
+ # FIXME: should be removed in autoconf 3.0.
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
done
if test -n "$ac_prev"; then
- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
fi
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
- exec 6>/dev/null
-else
- exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
do
- case "$ac_arg" in
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c) ;;
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+ *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+build=$build_alias
+host=$host_alias
+target=$target_alias
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=src/main/gsmtp.h
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then its parent.
ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+ ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
srcdir=$ac_confdir
if test ! -r $srcdir/$ac_unique_file; then
@@ -469,13 +517,315 @@ else
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+ { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+ { (exit 1); exit 1; }; }
else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ { echo "$as_me: error: cannot find sources in $srcdir" >&2
+ { (exit 1); exit 1; }; }
fi
fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat < if you have libraries in a
+ nonstandard directory
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have
+ headers in a nonstandard directory
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+ CPP C preprocessor
+ CXXCPP C++ preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
+ for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+ cd $ac_subdir
+ # A "../" for each directory in /$ac_subdir.
+ ac_dots=`echo $ac_subdir |
+ sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+
+ case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_sub_srcdir=$srcdir ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_sub_srcdir=$srcdir/$ac_subdir ;;
+ *) # Relative path.
+ ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+ esac
+
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_sub_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_sub_srcdir/configure; then
+ echo
+ $SHELL $ac_sub_srcdir/configure --help=recursive
+ elif test -f $ac_sub_srcdir/configure.ac ||
+ test -f $ac_sub_srcdir/configure.in; then
+ echo
+ $ac_configure --help
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+ fi
+ cd $ac_popdir
+ done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+ cat <<\EOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+ exit 0
+fi
+exec 5>config.log
+cat >&5 </dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+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`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/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`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <\?\"\']*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ ac_sep=" " ;;
+ *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+ ac_sep=" " ;;
+ esac
+ # Get rid of the leading space.
+done
+
+# 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.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ echo >&5
+ echo "## ----------------- ##" >&5
+ echo "## Cache variables. ##" >&5
+ echo "## ----------------- ##" >&5
+ echo >&5
+ # The following way of writing the cache mishandles newlines in values,
+{
+ (set) 2>&1 |
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ sed -n \
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
+ *)
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+} >&5
+ sed "/^$/d" confdefs.h >conftest.log
+ if test -s conftest.log; then
+ echo >&5
+ echo "## ------------ ##" >&5
+ echo "## confdefs.h. ##" >&5
+ echo "## ------------ ##" >&5
+ echo >&5
+ cat conftest.log >&5
+ fi
+ (echo; echo) >&5
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal" >&5
+ echo "$as_me: exit $exit_status" >&5
+ rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+ exit $exit_status
+ ' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
@@ -486,40 +836,107 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- echo "loading site script $ac_site_file"
+ { echo "$as_me:839: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+ cat "$ac_site_file" >&5
. "$ac_site_file"
fi
done
if test -r "$cache_file"; then
- echo "loading cache $cache_file"
- . $cache_file
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+ { echo "$as_me:850: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+ *) . ./$cache_file;;
+ esac
+ fi
else
- echo "creating cache $cache_file"
- > $cache_file
+ { echo "$as_me:858: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:874: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { echo "$as_me:878: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ { echo "$as_me:884: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:886: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:888: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status. It doesn't matter if
+ # we pass some twice (in addition to the command line arguments).
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
+ ac_configure_args="$ac_configure_args '$ac_arg'"
+ ;;
+ *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
+ ;;
+ esac
+ fi
+done
+if $ac_cache_corrupted; then
+ { echo "$as_me:907: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:909: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
fi
ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ac_n= ac_c='
-' ac_t=' '
- else
- ac_n=-n ac_c= ac_t=
- fi
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+echo "#! $SHELL" >conftest.sh
+echo "exit 0" >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:929: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+ echo "$as_me:932: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ ac_path_separator=';'
else
- ac_n= ac_c='\c' ac_t=
+ ac_path_separator=:
fi
-
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -531,14 +948,20 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
+ elif test -f $ac_dir/shtool; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
fi
done
if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+ { { echo "$as_me:958: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { (exit 1); exit 1; }; }
fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -547,31 +970,39 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# 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:556: checking for a BSD compatible install" >&5
+echo "$as_me:978: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
for ac_dir in $PATH; do
+ IFS=$ac_save_IFS
# Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ case $ac_dir/ in
+ / | ./ | .// | /cC/* \
+ | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+ | /usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
+ if $as_executable_p "$ac_dir/$ac_prog"; then
if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
+ elif test $ac_prog = install &&
+ grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
break 2
@@ -581,31 +1012,31 @@ else
;;
esac
done
- IFS="$ac_save_IFS"
fi
if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
- INSTALL="$ac_install_sh"
+ INSTALL=$ac_install_sh
fi
fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:1027: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:609: checking whether build environment is sane" >&5
+echo "$as_me:1038: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -627,8 +1058,11 @@ if (
# 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".
- { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+ { { echo "$as_me:1061: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
fi
test "$2" = conftestfile
@@ -637,354 +1071,727 @@ then
# Ok.
:
else
- { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
+ { { echo "$as_me:1074: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
- program_transform_name=
-else
- # Double any \ or $. echo might interpret backslashes.
- cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
- program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
- rm -f conftestsed
-fi
+echo "$as_me:1081: result: yes" >&5
+echo "${ECHO_T}yes" >&6
test "$program_prefix" != NONE &&
- program_transform_name="s,^,${program_prefix},; $program_transform_name"
+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $. echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:666: 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
+echo "$as_me:1096: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftestmake <<\EOF
+ cat >conftest.make <<\EOF
all:
@echo 'ac_maketemp="${MAKE}"'
EOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
fi
-rm -f conftestmake
+rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ echo "$as_me:1116: result: yes" >&5
+echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1120: result: no" >&5
+echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
-
PACKAGE=emailrelay
-VERSION=0.9.5
+VERSION=0.9.6
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+ { { echo "$as_me:1130: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
fi
-cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <&6
-echo "configure:712: checking for working aclocal" >&5
+echo "$as_me:1144: checking for working aclocal" >&5
+echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (aclocal --version) < /dev/null > /dev/null 2>&1; then
ACLOCAL=aclocal
- echo "$ac_t""found" 1>&6
+ echo "$as_me:1151: result: found" >&5
+echo "${ECHO_T}found" >&6
else
ACLOCAL="$missing_dir/missing aclocal"
- echo "$ac_t""missing" 1>&6
+ echo "$as_me:1155: result: missing" >&5
+echo "${ECHO_T}missing" >&6
fi
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:725: checking for working autoconf" >&5
+echo "$as_me:1159: checking for working autoconf" >&5
+echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (autoconf --version) < /dev/null > /dev/null 2>&1; then
AUTOCONF=autoconf
- echo "$ac_t""found" 1>&6
+ echo "$as_me:1166: result: found" >&5
+echo "${ECHO_T}found" >&6
else
AUTOCONF="$missing_dir/missing autoconf"
- echo "$ac_t""missing" 1>&6
+ echo "$as_me:1170: result: missing" >&5
+echo "${ECHO_T}missing" >&6
fi
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:738: checking for working automake" >&5
+echo "$as_me:1174: checking for working automake" >&5
+echo $ECHO_N "checking for working automake... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (automake --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake
- echo "$ac_t""found" 1>&6
+ echo "$as_me:1181: result: found" >&5
+echo "${ECHO_T}found" >&6
else
AUTOMAKE="$missing_dir/missing automake"
- echo "$ac_t""missing" 1>&6
+ echo "$as_me:1185: result: missing" >&5
+echo "${ECHO_T}missing" >&6
fi
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:751: checking for working autoheader" >&5
+echo "$as_me:1189: checking for working autoheader" >&5
+echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (autoheader --version) < /dev/null > /dev/null 2>&1; then
AUTOHEADER=autoheader
- echo "$ac_t""found" 1>&6
+ echo "$as_me:1196: result: found" >&5
+echo "${ECHO_T}found" >&6
else
AUTOHEADER="$missing_dir/missing autoheader"
- echo "$ac_t""missing" 1>&6
+ echo "$as_me:1200: result: missing" >&5
+echo "${ECHO_T}missing" >&6
fi
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:764: checking for working makeinfo" >&5
+echo "$as_me:1204: checking for working makeinfo" >&5
+echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
MAKEINFO=makeinfo
- echo "$ac_t""found" 1>&6
+ echo "$as_me:1211: result: found" >&5
+echo "${ECHO_T}found" >&6
else
MAKEINFO="$missing_dir/missing makeinfo"
- echo "$ac_t""missing" 1>&6
+ echo "$as_me:1215: result: missing" >&5
+echo "${ECHO_T}missing" >&6
fi
+ac_config_headers="$ac_config_headers config.h"
+ac_config_commands="$ac_config_commands default-1"
-
-
-
-# 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:784: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&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
+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
+echo "$as_me:1231: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="${ac_tool_prefix}gcc"
+echo "$as_me:1246: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:1254: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1257: result: no" >&5
+echo "${ECHO_T}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
+echo "$as_me:1266: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1281: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:1289: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:1292: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
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
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:814: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ 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
+echo "$as_me:1305: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="${ac_tool_prefix}cc"
+echo "$as_me:1320: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:1328: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+ echo "$as_me:1331: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:1340: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1355: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:1363: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:1366: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
+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
+echo "$as_me:1379: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+fi
+ac_cv_prog_CC="cc"
+echo "$as_me:1399: found $ac_dir/$ac_word" >&5
+break
+done
+
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 $# -gt 0; then
+ 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
- set dummy "$ac_dir/$ac_word" "$@"
+ set dummy "$ac_dir/$ac_word" ${1+"$@"}
shift
ac_cv_prog_CC="$@"
fi
fi
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:1421: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:1424: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
- if test -z "$CC"; then
- case "`uname -s`" in
- *win32* | *WIN32*)
- # 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:865: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl
+ 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
+echo "$as_me:1435: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="cl"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+echo "$as_me:1450: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:1458: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
-fi
- ;;
- esac
- fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ echo "$as_me:1461: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:1474: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&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
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="$ac_prog"
+echo "$as_me:1489: found $ac_dir/$ac_word" >&5
+break
+done
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:1497: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:1500: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-cat > conftest.$ac_ext << EOF
+ test -n "$ac_ct_CC" && break
+done
-#line 908 "configure"
+ CC=$ac_ct_CC
+fi
+
+fi
+
+test -z "$CC" && { { echo "$as_me:1512: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:1517:" \
+ "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1520: \"$ac_compiler --version &5\"") >&5
+ (eval $ac_compiler --version &5) 2>&5
+ ac_status=$?
+ echo "$as_me:1523: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:1525: \"$ac_compiler -v &5\"") >&5
+ (eval $ac_compiler -v &5) 2>&5
+ ac_status=$?
+ echo "$as_me:1528: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:1530: \"$ac_compiler -V &5\"") >&5
+ (eval $ac_compiler -V &5) 2>&5
+ ac_status=$?
+ echo "$as_me:1533: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 1537 "configure"
#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:913: \"$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
- ac_cv_prog_cc_cross=no
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe"
+# 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.
+echo "$as_me:1553: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:1556: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+ echo "$as_me:1559: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Find the output, starting from the most likely. This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+for ac_file in `ls a.exe conftest.exe 2>/dev/null;
+ ls a.out conftest 2>/dev/null;
+ ls a.* conftest.* 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ a.out ) # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+ export ac_cv_exeext
+ break;;
+ * ) break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1582: error: C compiler cannot create executables" >&5
+echo "$as_me: error: C compiler cannot create executables" >&2;}
+ { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:1588: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:1593: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&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'
+ { (eval echo "$as_me:1599: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1602: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
else
- ac_cv_prog_cc_cross=yes
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { echo "$as_me:1609: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_prog_cc_works=no
fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+echo "$as_me:1617: result: yes" >&5
+echo "${ECHO_T}yes" >&6
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
- { 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:939: 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
+rm -f a.out a.exe conftest$ac_cv_exeext
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:1624: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1626: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:944: 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
+echo "$as_me:1629: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1631: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:1634: \$? = $ac_status" >&5
+ (exit $ac_status); }; 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
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ export ac_cv_exeext
+ break;;
+ * ) break;;
+ esac
+done
else
- cat > conftest.c <&5
+echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1656: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:1662: checking for object suffix" >&5
+echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1668 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1680: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1683: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:1695: error: cannot compute OBJEXT: cannot compile" >&5
+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:1702: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1706: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1712 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:953: \"$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
-fi
-fi
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1727: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1730: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1733: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1736: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_compiler_gnu=yes
else
- GCC=
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:972: 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
+fi
+echo "$as_me:1748: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:1754: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1760 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1772: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1775: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1778: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1781: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
- ac_cv_prog_cc_g=no
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "$as_me:1791: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
+ CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
CFLAGS="-g -O2"
@@ -998,136 +1805,312 @@ else
CFLAGS=
fi
fi
-
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+# Some people use a C++ compiler to compile C. Since we use `exit',
+# in C++ we need to declare it. In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+ choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1818: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1821: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1824: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1827: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
+ ''\
+ '#include ' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
do
-# 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:1008: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1839 "configure"
+#include "confdefs.h"
+#include
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1852: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1855: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1858: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1861: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+#line 1871 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:1886: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:1889: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:1892: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+ echo '#ifdef __cplusplus' >>confdefs.h
+ echo $ac_declaration >>confdefs.h
+ echo '#endif' >>confdefs.h
+fi
+
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+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_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ 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
+echo "$as_me:1929: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CXX="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
- echo "$ac_t""$CXX" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-test -n "$CXX" && break
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+echo "$as_me:1944: found $ac_dir/$ac_word" >&5
+break
done
-test -n "$CXX" || CXX="gcc"
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ echo "$as_me:1952: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
+else
+ echo "$as_me:1955: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1040: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:1968: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CXX="$ac_prog"
+echo "$as_me:1983: found $ac_dir/$ac_word" >&5
+break
+done
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ echo "$as_me:1991: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
+else
+ echo "$as_me:1994: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-cat > conftest.$ac_ext << EOF
+ test -n "$ac_ct_CXX" && break
+done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-#line 1051 "configure"
+ CXX=$ac_ct_CXX
+fi
+
+# Provide some information about the compiler.
+echo "$as_me:2006:" \
+ "checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:2009: \"$ac_compiler --version &5\"") >&5
+ (eval $ac_compiler --version &5) 2>&5
+ ac_status=$?
+ echo "$as_me:2012: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:2014: \"$ac_compiler -v &5\"") >&5
+ (eval $ac_compiler -v &5) 2>&5
+ ac_status=$?
+ echo "$as_me:2017: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:2019: \"$ac_compiler -V &5\"") >&5
+ (eval $ac_compiler -V &5) 2>&5
+ ac_status=$?
+ echo "$as_me:2022: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+echo "$as_me:2025: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2031 "configure"
#include "confdefs.h"
-int main(){return(0);}
-EOF
-if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cxx_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
- ac_cv_prog_cxx_cross=no
- else
- ac_cv_prog_cxx_cross=yes
- fi
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_prog_cxx_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
- { 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 ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1082: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1087: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gxx=yes
-else
- ac_cv_prog_gxx=no
-fi
-fi
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-
-if test $ac_cv_prog_gxx = yes; then
- GXX=yes
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2049: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2052: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2055: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_compiler_gnu=yes
else
- GXX=
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1115: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+fi
+echo "$as_me:2067: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:2073: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2079 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2091: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2094: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2097: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2100: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
- ac_cv_prog_cxx_g=no
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cxx_g=no
fi
-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+echo "$as_me:2110: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS="$ac_save_CXXFLAGS"
+ CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
if test "$GXX" = yes; then
CXXFLAGS="-g -O2"
@@ -1141,35 +2124,163 @@ else
CXXFLAGS=
fi
fi
+for ac_declaration in \
+ ''\
+ '#include ' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
+do
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2137 "configure"
+#include "confdefs.h"
+#include
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2150: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2153: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2156: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2159: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2169 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2181: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:2184: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:2187: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2190: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+ echo '#ifdef __cplusplus' >>confdefs.h
+ echo $ac_declaration >>confdefs.h
+ echo '#endif' >>confdefs.h
+fi
-# 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:1149: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&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
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo "$as_me:2215: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+echo "$as_me:2230: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
+ echo "$as_me:2238: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2241: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ 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
+echo "$as_me:2250: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:2265: found $ac_dir/$ac_word" >&5
+break
+done
+
+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ echo "$as_me:2274: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
+else
+ echo "$as_me:2277: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ RANLIB=$ac_ct_RANLIB
+else
+ RANLIB="$ac_cv_prog_RANLIB"
fi
# Find a good install program. We prefer a C program (faster),
@@ -1179,31 +2290,39 @@ fi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# 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:1188: checking for a BSD compatible install" >&5
+echo "$as_me:2298: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
for ac_dir in $PATH; do
+ IFS=$ac_save_IFS
# Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ case $ac_dir/ in
+ / | ./ | .// | /cC/* \
+ | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+ | /usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
+ if $as_executable_p "$ac_dir/$ac_prog"; then
if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
+ elif test $ac_prog = install &&
+ grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
break 2
@@ -1213,442 +2332,653 @@ else
;;
esac
done
- IFS="$ac_save_IFS"
fi
if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
- INSTALL="$ac_install_sh"
+ INSTALL=$ac_install_sh
fi
fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:2347: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
for ac_prog in mawk gawk nawk awk
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # 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:1245: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2362: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AWK="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:2377: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$ac_t""$AWK" 1>&6
+ echo "$as_me:2385: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2388: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$AWK" && break
+ test -n "$AWK" && break
done
for ac_prog in make gmake
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # 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:1279: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2399: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_MAKE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$MAKE"; then
ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_MAKE="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_MAKE="$ac_prog"
+echo "$as_me:2414: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-MAKE="$ac_cv_prog_MAKE"
+MAKE=$ac_cv_prog_MAKE
if test -n "$MAKE"; then
- echo "$ac_t""$MAKE" 1>&6
+ echo "$as_me:2422: result: $MAKE" >&5
+echo "${ECHO_T}$MAKE" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2425: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$MAKE" && break
+ test -n "$MAKE" && break
done
for ac_prog in ar gar
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # 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:1313: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2436: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AR="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AR="$ac_prog"
+echo "$as_me:2451: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-AR="$ac_cv_prog_AR"
+AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$ac_t""$AR" 1>&6
+ echo "$as_me:2459: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2462: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$AR" && break
+ test -n "$AR" && break
done
# Extract the first word of "doxygen", so it can be a program name with args.
set dummy doxygen; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1345: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_HAVE_DOXYGEN'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2471: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_HAVE_DOXYGEN+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$HAVE_DOXYGEN"; then
ac_cv_prog_HAVE_DOXYGEN="$HAVE_DOXYGEN" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_HAVE_DOXYGEN="yes"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_HAVE_DOXYGEN="yes"
+echo "$as_me:2486: found $ac_dir/$ac_word" >&5
+break
+done
+
fi
fi
-HAVE_DOXYGEN="$ac_cv_prog_HAVE_DOXYGEN"
+HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN
if test -n "$HAVE_DOXYGEN"; then
- echo "$ac_t""$HAVE_DOXYGEN" 1>&6
+ echo "$as_me:2494: result: $HAVE_DOXYGEN" >&5
+echo "${ECHO_T}$HAVE_DOXYGEN" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:2497: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "man2html", so it can be a program name with args.
set dummy man2html; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1374: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_HAVE_MAN2HTML'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2503: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_HAVE_MAN2HTML+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$HAVE_MAN2HTML"; then
ac_cv_prog_HAVE_MAN2HTML="$HAVE_MAN2HTML" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_HAVE_MAN2HTML="yes"
- break
- fi
- done
- IFS="$ac_save_ifs"
-fi
-fi
-HAVE_MAN2HTML="$ac_cv_prog_HAVE_MAN2HTML"
-if test -n "$HAVE_MAN2HTML"; then
- echo "$ac_t""$HAVE_MAN2HTML" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
+ ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+ IFS=$ac_save_IFS
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_HAVE_MAN2HTML="yes"
+echo "$as_me:2518: found $ac_dir/$ac_word" >&5
+break
+done
+fi
+fi
+HAVE_MAN2HTML=$ac_cv_prog_HAVE_MAN2HTML
+if test -n "$HAVE_MAN2HTML"; then
+ echo "$as_me:2526: result: $HAVE_MAN2HTML" >&5
+echo "${ECHO_T}$HAVE_MAN2HTML" >&6
+else
+ echo "$as_me:2529: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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
-
-echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
-echo "configure:1410: checking for library containing gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2539: checking for library containing gethostbyname" >&5
+echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_search_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_gethostbyname="no"
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 2547 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gethostbyname();
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:1428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:2566: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:2569: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:2572: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2575: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_search_gethostbyname="none required"
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
fi
-rm -f conftest*
-test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do
-LIBS="-l$i $ac_func_search_save_LIBS"
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 2587 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gethostbyname();
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_search_gethostbyname="-l$i"
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:2606: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:2609: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:2612: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2615: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_search_gethostbyname="-l$ac_lib"
break
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
fi
-rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ done
fi
-
-echo "$ac_t""$ac_cv_search_gethostbyname" 1>&6
-if test "$ac_cv_search_gethostbyname" != "no"; then
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:2628: result: $ac_cv_search_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
+if test "$ac_cv_search_gethostbyname" != no; then
test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
-
-else :
-
+
fi
-echo $ac_n "checking for library containing connect""... $ac_c" 1>&6
-echo "configure:1472: checking for library containing connect" >&5
-if eval "test \"`echo '$''{'ac_cv_search_connect'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2635: checking for library containing connect" >&5
+echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6
+if test "${ac_cv_search_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_connect="no"
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 2643 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char connect();
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char connect ();
+int
+main ()
+{
+connect ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:2662: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:2665: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:2668: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2671: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_search_connect="none required"
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
fi
-rm -f conftest*
-test "$ac_cv_search_connect" = "no" && for i in socket; do
-LIBS="-l$i $ac_func_search_save_LIBS"
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 2683 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char connect();
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_search_connect="-l$i"
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char connect ();
+int
+main ()
+{
+connect ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:2702: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:2705: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:2708: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:2711: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_search_connect="-l$ac_lib"
break
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
fi
-rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ done
fi
-
-echo "$ac_t""$ac_cv_search_connect" 1>&6
-if test "$ac_cv_search_connect" != "no"; then
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:2724: result: $ac_cv_search_connect" >&5
+echo "${ECHO_T}$ac_cv_search_connect" >&6
+if test "$ac_cv_search_connect" != no; then
test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS"
-
-else :
-
+
fi
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1534: checking how to run the C preprocessor" >&5
+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
+echo "$as_me:2736: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
+ # 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.
# On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 2757 "configure"
#include "confdefs.h"
#include
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1555: \"$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
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2762: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2768: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- 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:1572: \"$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
- :
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 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:1589: \"$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
- :
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP=/lib/cpp
+ # Broken: fails on valid input.
+continue
fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
- ac_cv_prog_CPP="$CPP"
-fi
- CPP="$ac_cv_prog_CPP"
-else
- ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
+rm -f conftest.err conftest.$ac_ext
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1614: 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
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2791 "configure"
+#include "confdefs.h"
+#include
+_ACEOF
+if { (eval echo "$as_me:2795: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2801: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
else
- cat > conftest.$ac_ext <&5
+ cat 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
+echo "$as_me:2838: result: $CPP" >&5
+echo "${ECHO_T}$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.
+ # 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
+#line 2848 "configure"
+#include "confdefs.h"
+#include
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:2853: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2859: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+ cat 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 non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2882 "configure"
+#include "confdefs.h"
+#include
+_ACEOF
+if { (eval echo "$as_me:2886: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2892: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+ cat 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
+ { { echo "$as_me:2920: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&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
+
+echo "$as_me:2931: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2937 "configure"
#include "confdefs.h"
#include
#include
#include
#include
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1627: \"$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*
+
+_ACEOF
+if { (eval echo "$as_me:2945: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2951: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
ac_cv_header_stdc=yes
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -f conftest.err 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 <conftest.$ac_ext <<_ACEOF
+#line 2973 "configure"
#include "confdefs.h"
#include
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "memchr" >/dev/null 2>&1; then
:
else
- rm -rf conftest*
ac_cv_header_stdc=no
fi
rm -f conftest*
@@ -1657,16 +2987,16 @@ fi
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 <conftest.$ac_ext <<_ACEOF
+#line 2991 "configure"
#include "confdefs.h"
#include
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "free" >/dev/null 2>&1; then
:
else
- rm -rf conftest*
ac_cv_header_stdc=no
fi
rm -f conftest*
@@ -1675,433 +3005,711 @@ fi
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 <conftest.$ac_ext <<_ACEOF
+#line 3012 "configure"
#include "confdefs.h"
#include
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
+#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
-EOF
-if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ exit(2);
+ exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:3038: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3041: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:3043: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3046: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
:
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_header_stdc=no
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_header_stdc=no
fi
-rm -fr conftest*
-fi
-
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
+fi
+echo "$as_me:3059: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define STDC_HEADERS 1
EOF
fi
ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1722: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+echo "$as_me:3072: checking for $ac_hdr that defines DIR" >&5
+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3078 "configure"
#include "confdefs.h"
#include
#include <$ac_hdr>
-int main() {
-DIR *dirp = 0;
-; return 0; }
-EOF
-if { (eval echo configure:1735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- eval "ac_cv_header_dirent_$ac_safe=yes"
+
+int
+main ()
+{
+if ((DIR *) 0)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3093: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3096: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3102: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_dirent_$ac_safe=no"
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <&6
+
+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
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1760: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:3125: checking for opendir in -ldir" >&5
+echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+if test "${ac_cv_lib_dir_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3133 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:1779: \"$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"
+ builtin and then its argument prototype would still apply. */
+char opendir ();
+int
+main ()
+{
+opendir ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3152: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3155: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3158: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3161: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dir_opendir=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dir_opendir=no
fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+echo "$as_me:3172: result: $ac_cv_lib_dir_opendir" >&5
+echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+if test $ac_cv_lib_dir_opendir = yes; then
LIBS="$LIBS -ldir"
-else
- echo "$ac_t""no" 1>&6
fi
else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1801: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:3179: checking for opendir in -lx" >&5
+echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+if test "${ac_cv_lib_x_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3187 "configure"
#include "confdefs.h"
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:1820: \"$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"
+ builtin and then its argument prototype would still apply. */
+char opendir ();
+int
+main ()
+{
+opendir ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3206: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3209: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3212: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3215: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_x_opendir=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_x_opendir=no
fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+echo "$as_me:3226: result: $ac_cv_lib_x_opendir" >&5
+echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+if test $ac_cv_lib_x_opendir = yes; then
LIBS="$LIBS -lx"
-else
- echo "$ac_t""no" 1>&6
fi
fi
-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1843: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:3234: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+if test "${ac_cv_header_time+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3240 "configure"
#include "confdefs.h"
#include
#include
#include
-int main() {
-struct tm *tp;
-; return 0; }
-EOF
-if { (eval echo configure:1857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3256: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3259: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3262: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3265: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_header_time=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_header_time=no
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_header_time=no
fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-
-echo "$ac_t""$ac_cv_header_time" 1>&6
+echo "$as_me:3275: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define TIME_WITH_SYS_TIME 1
EOF
fi
-for ac_hdr in unistd.h
+for ac_header in unistd.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1881: 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
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3288: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3294 "configure"
#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1891: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:3298: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:3304: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <&6
+
fi
done
-for ac_hdr in sys/time.h
+for ac_header in sys/time.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1921: 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
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3336: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3342 "configure"
#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1931: \"$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*
- eval "ac_cv_header_$ac_safe=yes"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:3346: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:3352: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <&6
+
fi
done
for ac_func in glob
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1960: 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
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:3384: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3390 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
+ which can conflict with char $ac_func (); below. */
#include
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-
-int main() {
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+char (*f) ();
+int
+main ()
+{
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
-; return 0; }
-EOF
-if { (eval echo configure:1988: \"$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"
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3421: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:3424: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:3427: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3430: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
+echo "$as_me:3440: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <&6
fi
done
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3457 "configure"
#include "confdefs.h"
#include
-int main() {
+int
+main ()
+{
std::auto_ptr lhs ; const std::auto_ptr & rhs = lhs ; lhs = rhs ;
-; return 0; }
-EOF
-if { (eval echo configure:2027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3469: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:3472: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:3475: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:3478: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
:
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- cat >> confdefs.h <<\EOF
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+cat >>confdefs.h <<\EOF
#define HAVE_NONCONST_AUTOPTR 1
EOF
fi
-rm -f conftest*
-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2040: checking how to run the C++ preprocessor" >&5
-if test -z "$CXXCPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
- CXXCPP="${CXX-g++} -E"
- cat > conftest.$ac_ext <&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # 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
+#line 3513 "configure"
#include "confdefs.h"
-#include
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2058: \"$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
+#include
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:3518: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:3524: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- CXXCPP=/lib/cpp
+ # Broken: fails on valid input.
+continue
fi
-rm -f conftest*
- ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-fi
-fi
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
+rm -f conftest.err conftest.$ac_ext
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3547 "configure"
+#include "confdefs.h"
+#include
+_ACEOF
+if { (eval echo "$as_me:3551: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:3557: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+ cat 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_CXXCPP=$CXXCPP
+
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+echo "$as_me:3594: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # 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
+#line 3604 "configure"
+#include "confdefs.h"
+#include
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:3609: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:3615: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+ cat 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 non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+#line 3638 "configure"
+#include "confdefs.h"
+#include
+_ACEOF
+if { (eval echo "$as_me:3642: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:3648: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+ cat 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
+ { { echo "$as_me:3676: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 3688 "configure"
#include "confdefs.h"
#include
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "localtime_r" >/dev/null 2>&1; then
- rm -rf conftest*
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_LOCALTIME_R 1
EOF
fi
rm -f conftest*
-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF
+#line 3704 "configure"
#include "confdefs.h"
#include
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "gmtime_r" >/dev/null 2>&1; then
- rm -rf conftest*
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
#define HAVE_GMTIME_R 1
EOF
@@ -2110,379 +3718,873 @@ rm -f conftest*
SET_MAKE=""
-trap '' 1 2 15
-cat > confcache <<\EOF
+ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile"
+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. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# 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.
#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
#
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden 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, don't put newlines in cache variables' values.
# 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.
-(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- -e "s/'/'\\\\''/g" \
- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
- ;;
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
- ;;
- esac >> confcache
-if cmp -s $cache_file confcache; then
- :
-else
+{
+ (set) 2>&1 |
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
+ *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 \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+} |
+ sed '
+ t clear
+ : clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
if test -w $cache_file; then
- echo "updating cache $cache_file"
- cat confcache > $cache_file
+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+ cat confcache >$cache_file
else
echo "not updating unwritable cache $cache_file"
fi
fi
rm -f confcache
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ ]*$//;
+}'
fi
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
DEFS=-DHAVE_CONFIG_H
-# Without the "./", some shells look in PATH for config.status.
: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
# Generated automatically by configure.
# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
- case "\$ac_option" in
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
- *) echo "\$ac_cs_usage"; exit 1 ;;
- esac
-done
+debug=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+_ACEOF
-trap 'rm -fr `echo "Makefile src/Makefile src/glib/Makefile src/gnet/Makefile src/main/Makefile src/win32/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@RANLIB@%$RANLIB%g
-s%@AWK@%$AWK%g
-s%@MAKE@%$MAKE%g
-s%@AR@%$AR%g
-s%@HAVE_DOXYGEN@%$HAVE_DOXYGEN%g
-s%@HAVE_MAN2HTML@%$HAVE_MAN2HTML%g
-s%@CPP@%$CPP%g
-s%@CXXCPP@%$CXXCPP%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
- else
- sed "${ac_end}q" conftest.subs > conftest.s$ac_file
- fi
- if test ! -s conftest.s$ac_file; then
- ac_more_lines=false
- rm -f conftest.s$ac_file
- else
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f conftest.s$ac_file"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
- fi
- ac_file=`expr $ac_file + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_cmds`
- fi
-done
-if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
fi
+
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
+ as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+as_executable_p="test -f"
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
+exec 6>&1
+
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\EOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number, then exit
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to ."
EOF
-cat >> $CONFIG_STATUS <>$CONFIG_STATUS <> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
+
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value. By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+ case $1 in
+ --*=*)
+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ shift
+ set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+ shift
+ ;;
+ -*);;
+ *) # This is not an option, so the user has probably given explicit
+ # arguments.
+ ac_need_defaults=false;;
esac
- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+ case $1 in
+ # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF
+ --version | --vers* | -V )
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+ { { echo "$as_me:3977: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+ echo "$ac_cs_usage"; exit 0 ;;
+ --debug | --d* | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ shift
+ CONFIG_FILES="$CONFIG_FILES $1"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $1"
+ ac_need_defaults=false;;
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+ # This is an error.
+ -*) { { echo "$as_me:3996: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+ { (exit 1); exit 1; }; } ;;
+
+ *) ac_config_targets="$ac_config_targets $1" ;;
+
+ esac
+ shift
+done
+
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status. ##
+## ----------------------- ##
+
+This file was extended by $as_me 2.52, executed with
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ > $ac_cs_invocation
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+
+_ACEOF
+EOF
+
+cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF
+for ac_config_target in $ac_config_targets
+do
+ case "$ac_config_target" in
+ # Handling of arguments.
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/glib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/glib/Makefile" ;;
+ "src/gnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnet/Makefile" ;;
+ "src/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
+ "src/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile" ;;
+ "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+ "lib/gcc2.95/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/gcc2.95/Makefile" ;;
+ "lib/msvc6.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/msvc6.0/Makefile" ;;
+ "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ *) { { echo "$as_me:4051: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used. Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+} ||
+{
+ tmp=$TMPDIR/cs$$-$RANDOM
+ (umask 077 && mkdir $tmp)
+} ||
+{
+ echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+ { (exit 1); exit 1; }
+}
+
+EOF
+
+cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@AWK@,$AWK,;t t
+s,@MAKE@,$MAKE,;t t
+s,@AR@,$AR,;t t
+s,@HAVE_DOXYGEN@,$HAVE_DOXYGEN,;t t
+s,@HAVE_MAN2HTML@,$HAVE_MAN2HTML,;t t
+s,@CPP@,$CPP,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+CEOF
+
+EOF
+
+ cat >>$CONFIG_STATUS <<\EOF
+ # Split the substitutions into bite-sized pieces for seds with
+ # small command number limits, like on Digital OSF/1 and HP-UX.
+ ac_max_sed_lines=48
+ ac_sed_frag=1 # Number of current file.
+ ac_beg=1 # First line for current file.
+ ac_end=$ac_max_sed_lines # Line after last line for current file.
+ ac_more_lines=:
+ ac_sed_cmds=
+ while $ac_more_lines; do
+ if test $ac_beg -gt 1; then
+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+ else
+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+ fi
+ if test ! -s $tmp/subs.frag; then
+ ac_more_lines=false
+ else
+ # The purpose of the label and of the branching condition is to
+ # speed up the sed processing (if there are no `@' at all, there
+ # is no need to browse any of the substitutions).
+ # These are the two extra sed commands mentioned above.
+ (echo ':t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ else
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ fi
+ ac_sed_frag=`expr $ac_sed_frag + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_lines`
+ fi
+ done
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
+ fi
+fi # test -n "$CONFIG_FILES"
+
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+ case $ac_file in
+ - | *:- | *:-:* ) # input from stdin
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+ { case "$ac_dir" in
+ [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+ *) as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+ case $as_mkdir_dir in
+ # Skip DOS drivespec
+ ?:) as_incr_dir=$as_mkdir_dir ;;
+ *)
+ as_incr_dir=$as_incr_dir/$as_mkdir_dir
+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+ ;;
+ esac
+done; }
+
+ ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
# A "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+ ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
else
ac_dir_suffix= ac_dots=
fi
- case "$ac_given_srcdir" in
- .) srcdir=.
- if test -z "$ac_dots"; then top_srcdir=.
- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+ case $srcdir in
+ .) ac_srcdir=.
+ if test -z "$ac_dots"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* )
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
*) # Relative path.
- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_dots$srcdir ;;
esac
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_dots$INSTALL ;;
esac
- echo creating "$ac_file"
- rm -f "$ac_file"
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
- case "$ac_file" in
- *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
- *) ac_comsub= ;;
- esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:4277: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated automatically by config.status. */
+ configure_input="Generated automatically from `echo $ac_file_in |
+ sed 's,.*/,,'` by configure."
- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
- sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
+ # First look for the input files in the build tree, otherwise in the
+ # src tree.
+ ac_file_inputs=`IFS=:
+ for f in $ac_file_in; do
+ case $f in
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:4295: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+ *) # Relative
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:4308: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+EOF
+cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+ rm -f $tmp/stdin
+ if test x"$ac_file" != x-; then
+ mv $tmp/out $ac_file
+ else
+ cat $tmp/out
+ rm -f $tmp/out
+ fi
+
+done
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+
+#
+# CONFIG_HEADER section.
+#
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='\([ ]\)%\1#\2define\3'
+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='[ ].*$,\1#\2'
+ac_dC=' '
+ac_dD=',;t'
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uB='$,\1#\2define\3'
ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
+ac_uD=',;t'
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
+ case $ac_file in
+ - | *:- | *:-:* ) # input from stdin
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ * ) ac_file_in=$ac_file.in ;;
esac
- echo creating $ac_file
+ test x"$ac_file" != x- && { echo "$as_me:4369: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
- rm -f conftest.frag conftest.in conftest.out
- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
- cat $ac_file_inputs > conftest.in
+ # First look for the input files in the build tree, otherwise in the
+ # src tree.
+ ac_file_inputs=`IFS=:
+ for f in $ac_file_in; do
+ case $f in
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:4380: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+ *) # Relative
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:4393: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+ # Remove the trailing spaces.
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
EOF
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h. And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h. The first handles `#define'
+# templates, and the second `#undef' templates.
+# And first: Protect against being on the right side of a sed subst in
+# config.status. Protect against being in an unquoted here document
+# in config.status.
+rm -f conftest.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\EOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
+t end
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
+# If some macros were called several times there might be several times
+# the same #defines, which is useless. Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed
# This sed command replaces #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+cat >>conftest.undefs <<\EOF
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
EOF
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
+# Break up conftest.defines because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
-while :
+while grep . conftest.defines >/dev/null
do
- ac_lines=`grep -c . conftest.vals`
- # grep -c gives empty output for an empty file on some AIX systems.
- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
- # Write a limited-size here document to conftest.frag.
- echo ' cat > conftest.frag <> $CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+ # Write a limited-size here document to $tmp/defines.sed.
+ echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS
+ # Speed up: don't consider the non `#define' lines.
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ # Work around the forget-to-reset-the-flag bug.
+ echo 't clr' >>$CONFIG_STATUS
+ echo ': clr' >>$CONFIG_STATUS
+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
echo 'CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-' >> $CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
- rm -f conftest.vals
- mv conftest.tail conftest.vals
+ sed -f $tmp/defines.sed $tmp/in >$tmp/out
+ rm -f $tmp/in
+ mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
done
-rm -f conftest.vals
+rm -f conftest.defines
+echo ' fi # egrep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS
-cat >> $CONFIG_STATUS <<\EOF
- rm -f conftest.frag conftest.h
- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
- cat conftest.in >> conftest.h
- rm -f conftest.in
- if cmp -s $ac_file conftest.h 2>/dev/null; then
- echo "$ac_file is unchanged"
- rm -f conftest.h
+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.undefs >/dev/null
+do
+ # Write a limited-size here document to $tmp/undefs.sed.
+ echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS
+ # Speed up: don't consider the non `#undef'
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ # Work around the forget-to-reset-the-flag bug.
+ echo 't clr' >>$CONFIG_STATUS
+ echo ': clr' >>$CONFIG_STATUS
+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+ echo 'CEOF
+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+ rm -f $tmp/in
+ mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+ rm -f conftest.undefs
+ mv conftest.tail conftest.undefs
+done
+rm -f conftest.undefs
+
+cat >>$CONFIG_STATUS <<\EOF
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated automatically by config.status. */
+ if test x"$ac_file" = x-; then
+ echo "/* Generated automatically by configure. */" >$tmp/config.h
else
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- fi
- rm -f $ac_file
- mv conftest.h $ac_file
+ echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h
fi
-fi; done
+ cat $tmp/in >>$tmp/config.h
+ rm -f $tmp/in
+ if test x"$ac_file" != x-; then
+ if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
+ { echo "$as_me:4510: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ { case "$ac_dir" in
+ [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+ *) as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+ case $as_mkdir_dir in
+ # Skip DOS drivespec
+ ?:) as_incr_dir=$as_mkdir_dir ;;
+ *)
+ as_incr_dir=$as_incr_dir/$as_mkdir_dir
+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+ ;;
+ esac
+done; }
+ fi
+ rm -f $ac_file
+ mv $tmp/config.h $ac_file
+ fi
+ else
+ cat $tmp/config.h
+ rm -f $tmp/config.h
+ fi
+done
EOF
-cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ case $ac_dest in
+ default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
+ esac
+done
EOF
-cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-exit 0
+cat >>$CONFIG_STATUS <<\EOF
+
+{ (exit 0); exit 0; }
EOF
chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded. So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status. When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+ ac_cs_success=:
+ exec 5>/dev/null
+ $SHELL $CONFIG_STATUS || ac_cs_success=false
+ 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.
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
diff --git a/configure.in b/configure.in
index d204fbb..a0f32f4 100644
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ dnl ===
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/main/gsmtp.h)
-AM_INIT_AUTOMAKE(emailrelay,0.9.5)
+AM_INIT_AUTOMAKE(emailrelay,0.9.6)
AM_CONFIG_HEADER(config.h)
dnl ===
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4045292..bae1e86 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
-EXTRA_DIST = developer.txt reference.txt userguide.txt index.html emailrelay.1 emailrelay-poke.1 doxygen_header.html graphics/bullet.gif
+EXTRA_DIST = developer.txt reference.txt userguide.txt windows.txt index.html emailrelay.1 emailrelay-poke.1 doxygen_header.html graphics/bullet.gif
noinst_SCRIPTS = .dox
-pkgdata_DATA = readme.html developer.html reference.html userguide.html man.html index.html
+pkgdata_DATA = readme.html developer.html reference.html userguide.html man.html index.html windows.html changelog.html
CLEANFILES = $(noinst_SCRIPTS) html *.ht readme.html developer.html reference.html userguide.html man.html
SUFFIXES = .txt .html .ht
@@ -36,6 +36,9 @@ developer.html reference.html userguide.html: $(converter)
readme.html: $(top_srcdir)/README $(converter)
$(converter) -a "$(AWK)" $(top_srcdir)/README > readme.html
+changelog.html: $(top_srcdir)/ChangeLog $(converter)
+ $(converter) -a "$(AWK)" $(top_srcdir)/ChangeLog > changelog.html
+
install-data-local:
$(mkinstalldirs) $(destdir)$(mandir)/man1
$(INSTALL) $(top_srcdir)/doc/emailrelay.1 $(destdir)$(mandir)/man1/emailrelay.1
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 99af947..c7aa584 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,10 +69,10 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
-EXTRA_DIST = developer.txt reference.txt userguide.txt index.html emailrelay.1 emailrelay-poke.1 doxygen_header.html graphics/bullet.gif
+EXTRA_DIST = developer.txt reference.txt userguide.txt windows.txt index.html emailrelay.1 emailrelay-poke.1 doxygen_header.html graphics/bullet.gif
noinst_SCRIPTS = .dox
-pkgdata_DATA = readme.html developer.html reference.html userguide.html man.html index.html
+pkgdata_DATA = readme.html developer.html reference.html userguide.html man.html index.html windows.html changelog.html
CLEANFILES = $(noinst_SCRIPTS) html *.ht readme.html developer.html reference.html userguide.html man.html
SUFFIXES = .txt .html .ht
@@ -141,7 +141,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -237,6 +237,9 @@ developer.html reference.html userguide.html: $(converter)
readme.html: $(top_srcdir)/README $(converter)
$(converter) -a "$(AWK)" $(top_srcdir)/README > readme.html
+changelog.html: $(top_srcdir)/ChangeLog $(converter)
+ $(converter) -a "$(AWK)" $(top_srcdir)/ChangeLog > changelog.html
+
install-data-local:
$(mkinstalldirs) $(destdir)$(mandir)/man1
$(INSTALL) $(top_srcdir)/doc/emailrelay.1 $(destdir)$(mandir)/man1/emailrelay.1
diff --git a/doc/developer.txt b/doc/developer.txt
index eabf145..e46e921 100644
--- a/doc/developer.txt
+++ b/doc/developer.txt
@@ -21,8 +21,8 @@ to create GUI windows in order to process network events. The extra GUI and
event classes are put into a separate library in the "src/win32" directory,
using the namespace "GGui".
-Class structure overview
-------------------------
+Class structure
+---------------
The message-store functionality uses three abstract interfaces: "MessageStore",
"NewMessage" and "StoredMessage". The "NewMessage" interface is used to create
messages within the store, and the "StoredMessage" interface is used for
@@ -38,6 +38,9 @@ another for immediate forwarding ("ProtocolMessageForward").
The protocol and message-store functionality are brought together by the
high-level "GSmtp::Server" and "GSmtp::Client" classes.
+Simplified class diagrams for the *GNet* [graphics/gnet-classes.png] and
+*GSmtp* [graphics/gsmtp-classes.png] namespaces are available.
+
Directory structure
-------------------
@@ -142,11 +145,27 @@ If porting to a good ANSI C++ compiler then start by removing files from the
review the following header files: "src/glib/gdef.h", "src/gnet/gnet.h",
"src/glib/gmemory.h".
-IPv6
-----
-IPv6 is supported at compile-time by selecting source files in the "src/gnet"
-directory ending "_ipv6.cpp" rather than "_ipv4.cpp". The code has been tested
-to a limited extent on Linux.
+Compile-time features
+---------------------
+The following features are available to source-code hackers:
+
+# IPv6
+
+ IPv6 is supported at compile-time by selecting source files in the "src/gnet"
+ directory ending "_ipv6.cpp" rather than "_ipv4.cpp". The code has been tested
+ to a limited extent on Linux.
+
+# Verbose logging
+
+ Verbose logging can be enabled by defining the pre-processor symbol "_DEBUG".
+ (See "src/glib/glog.h".)
+
+# Multiple listening ports
+
+ Refer to the Server constructor in "src/main/gsmtpserver.cpp". Set "normal"
+ to false and edit the hard-coded address strings. If the addresses
+ need different port numbers then pass them to bind() in the third
+ parameter.
Windows build
-------------
@@ -228,6 +247,11 @@ Other patterns:
- GSmtp::ServerProtocol
+Idioms
+------
+The "<<=" operator defined in "src/glib/gmemory.h" is used idiomatically
+to reassign a std::auto_ptr<>.
+
Copyright (C) 2001 Graeme Walker . All rights reserved.
diff --git a/doc/emailrelay.1 b/doc/emailrelay.1
index 9bdece5..1719e4b 100644
--- a/doc/emailrelay.1
+++ b/doc/emailrelay.1
@@ -29,6 +29,10 @@ emailrelay \- e-mail transfer agent
.B emailrelay
--as-client
.I server-address
+.LP
+.B emailrelay
+--as-proxy
+.I server-address
.SH DESCRIPTION
.I emailrelay
is an simple e-mail message transfer agent. It is intended to be used
@@ -50,90 +54,77 @@ In this mode all messages are forwarded immediately to the downstream
server.
.SH OPTIONS
.TP
-.B \-V,--version
-Displays version information and exits.
-.TP
.B \-a,--admin \fIadmin-port\fR
Enables the administration interface and specifies its listening port number.
.TP
+.B \-q,--as-client \fIhost:port\fR
+Equivalent to \fI--log\fR \fI--no-syslog\fR \fI--no-daemon\fR \fI--dont-serve\fR \fI--forward\fR \fI--forward-to\fR.
+.TP
+.B \-y,--as-proxy \fIhost:port\fR
+Equivalent to \fI--log\fR \fI--close-stderr\fR \fI--immediate\fR \fI--forward-to\fR.
+.TP
.B \-d,--as-server
-Equivalent to \fI--close-stderr\fR \fI--log\fR.
+Equivalent to \fI--log\fR \fI--close-stderr\fR.
+.TP
+.B \-C,--client-auth \fIfile\fR
+Enables authentication with remote server, using the given secrets file.
.TP
.B \-e,--close-stderr
-Closes the standard error stream when daemonising.
+Closes the standard error stream after start-up.
.TP
-.B \-f,--forward
-Forwards stored mail on startup (requires \fI--forward-to\fR).
-.TP
-.B \-h,--help
-Displays help text and exits.
-.TP
-.B \-i,--pid-file \fIpid-file\fR
-Records the daemon process-id in the given file.
-.TP
-.B \-l,--log
-Writes log information on standard error (if open) and syslog (if not disabled).
-.TP
-.B \-m,--immediate
-Forwards each message as soon as it is received (requires \fI--forward-to\fR).
-.TP
-.B \-n,--no-syslog
-Disables syslog output.
-.TP
-.B \-o,--forward-to \fIhost:port\fR
-Specifies the remote smtp server (required by \fI--forward\fR and \fI--admin\fR).
-.TP
-.B \-p,--port \fIport\fR
-Specifies the smtp listening port number.
-.TP
-.B \-q,--as-client \fIhost:port\fR
-Equivalent to \fI--no-syslog\fR \fI--no-daemon\fR \fI--log\fR \fI--dont-serve\fR \fI--forward\fR \fI--forward-to\fR.
-.TP
-.B \-r,--remote-clients
-Allows remote clients to connect.
-.TP
-.B \-s,--spool-dir \fIdir\fR
-Specifies the spool directory (default is \fI/usr/local/var/spool/emailrelay\fR).
-.TP
-.B \-t,--no-daemon
-Does not detach from the terminal.
-.TP
-.B \-v,--verbose
-Generates more verbose logging (if compiled-in and logging enabled and stderr open).
+.B \-U,--connection-timeout \fItime\fR
+Sets the client-side connection timeout in seconds (default is 40).
.TP
.B \-x,--dont-serve
Stops the process acting as a server (usually used with \fI--forward\fR).
.TP
-.B \-y,--as-proxy \fIhost:port\fR
-Equivalent to \fI--close-stderr\fR \fI--log\fR \fI--immediate\fR \fI--forward-to\fR.
-.TP
.B \-z,--filter \fIprogram\fR
-Defines a mail preprocessor (disallowed if running as root).
-.SH "DIAGNOSTICS"
-If the
-.IR --log ,
-.I --as-client
-or
-.I --as-server
-switches are in force then warning and error messages
-are sent to
-.I syslog
-(using the
-.BR LOG_MAIL
-facility) and to
-.IR stderr .
-Output to
-.I syslog
-can be disabled with
-.IR --no-syslog ,
-and output to stderr can be disabled in daemon mode with
-.IR --close-stderr .
-.PP
-Failed e-mail messages are kept in the spool directory and given
-a
-.I .bad
-filename suffix. The failure reason is usually recorded within the
-envelope file itself.
+Defines a mail pre-processor (disallowed if running as root).
+.TP
+.B \-f,--forward
+Forwards stored mail on startup (requires \fI--forward-to\fR).
+.TP
+.B \-o,--forward-to \fIhost:port\fR
+Specifies the remote smtp server (required by \fI--forward\fR and \fI--admin\fR).
+.TP
+.B \-h,--help
+Displays help text and exits.
+.TP
+.B \-m,--immediate
+Forwards each message as soon as it is received (requires \fI--forward-to\fR).
+.TP
+.B \-l,--log
+Writes log information on standard error (if open) and syslog (if not disabled).
+.TP
+.B \-t,--no-daemon
+Does not detach from the terminal.
+.TP
+.B \-n,--no-syslog
+Disables syslog output.
+.TP
+.B \-i,--pid-file \fIpid-file\fR
+Records the daemon process-id in the given file.
+.TP
+.B \-p,--port \fIport\fR
+Specifies the smtp listening port number.
+.TP
+.B \-r,--remote-clients
+Allows remote clients to connect.
+.TP
+.B \-T,--response-timeout \fItime\fR
+Sets the client-side response timeout in seconds (default is 1800).
+.TP
+.B \-S,--server-auth \fIfile\fR
+Enables authentication of remote clients, using the given secrets file.
+.TP
+.B \-s,--spool-dir \fIdir\fR
+Specifies the spool directory (default is \fI/usr/local/var/spool/emailrelay\fR).
+.TP
+.B \-v,--verbose
+Generates more verbose logging (if compiled-in and logging enabled and stderr open).
+.TP
+.B \-V,--version
+Displays version information and exits.
.SH FILES
.IP \(bu 2
/usr/local/sbin/emailrelay
diff --git a/doc/graphics/bullet.gif b/doc/graphics/bullet.gif
index be2c6fa..24b2772 100644
Binary files a/doc/graphics/bullet.gif and b/doc/graphics/bullet.gif differ
diff --git a/doc/index.html b/doc/index.html
index 65643c8..06bb916 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,16 +1,19 @@
+E-MailRelay index
E-MailRelay Documentation
-
+
+
diff --git a/doc/reference.txt b/doc/reference.txt
index 143c6c0..325794b 100644
--- a/doc/reference.txt
+++ b/doc/reference.txt
@@ -14,66 +14,78 @@ The "emailrelay" program supports the following command-line usage:
where is:
-# --version (-V)
- Displays version information and exits.
-
# --admin (-a)
Enables the administration interface and specifies its listening port number.
+# --as-client (-q)
+ Equivalent to "--log --no-syslog --no-daemon --dont-serve --forward --forward-to".
+
+# --as-proxy (-y)
+ Equivalent to "--log --close-stderr --immediate --forward-to".
+
# --as-server (-d)
- Equivalent to "--close-stderr --log".
+ Equivalent to "--log --close-stderr".
+
+# --client-auth (-C)
+ Enables authentication with remote server, using the given secrets file.
# --close-stderr (-e)
- Closes the standard error stream when daemonising.
+ Closes the standard error stream after start-up.
-# --forward (-f)
- Forwards stored mail on startup (requires --forward-to).
-
-# --help (-h)
- Displays help text and exits.
-
-# --pid-file (-i)
- Records the daemon process-id in the given file.
-
-# --log (-l)
- Writes log information on standard error (if open) and syslog (if not disabled).
-
-# --immediate (-m)
- Forwards each message as soon as it is received (requires --forward-to).
-
-# --no-syslog (-n)
- Disables syslog output.
-
-# --forward-to (-o)
- Specifies the remote smtp server (required by --forward and --admin).
-
-# --port (-p)
- Specifies the smtp listening port number.
-
-# --as-client (-q)
- Equivalent to "--no-syslog --no-daemon --log --dont-serve --forward --forward-to".
-
-# --remote-clients (-r)
- Allows remote clients to connect.
-
-# --spool-dir (-s)
- Specifies the spool directory (default is "/usr/local/var/spool/emailrelay").
-
-# --no-daemon (-t)
- Does not detach from the terminal.
-
-# --verbose (-v)
- Generates more verbose logging (if compiled-in and logging enabled and stderr open).
+# --connection-timeout (-U)
+ Sets the client-side connection timeout in seconds (default is 40).
# --dont-serve (-x)
Stops the process acting as a server (usually used with --forward).
-# --as-proxy (-y)
- Equivalent to "--close-stderr --log --immediate --forward-to".
-
# --filter (-z)
Defines a mail pre-processor (disallowed if running as root).
+# --forward (-f)
+ Forwards stored mail on startup (requires --forward-to).
+
+# --forward-to (-o)
+ Specifies the remote smtp server (required by --forward and --admin).
+
+# --help (-h)
+ Displays help text and exits.
+
+# --immediate (-m)
+ Forwards each message as soon as it is received (requires --forward-to).
+
+# --log (-l)
+ Writes log information on standard error (if open) and syslog (if not disabled).
+
+# --no-daemon (-t)
+ Does not detach from the terminal.
+
+# --no-syslog (-n)
+ Disables syslog output.
+
+# --pid-file (-i)
+ Records the daemon process-id in the given file.
+
+# --port (-p)
+ Specifies the smtp listening port number.
+
+# --remote-clients (-r)
+ Allows remote clients to connect.
+
+# --response-timeout (-T)
+ Sets the client-side response timeout in seconds (default is 1800).
+
+# --server-auth (-S)
+ Enables authentication of remote clients, using the given secrets file.
+
+# --spool-dir (-s)
+ Specifies the spool directory (default is "/usr/local/var/spool/emailrelay").
+
+# --verbose (-v)
+ Generates more verbose logging (if compiled-in and logging enabled and stderr open).
+
+# --version (-V)
+ Displays version information and exits.
+
If no command-line switches are supplied at all then the default
behaviour is:
* to run as a daemon, detached from the terminal
@@ -127,6 +139,11 @@ and the failure reason is written into the file.
SMTP issues
-----------
+# Authentication:
+
+ The AUTH extension is supported in V0.9.6, but only with the unofficial LOGIN
+ mechanism.
+
# Local delivery:
E-MailRelay will reject all local recipients, with the exception of
@@ -149,9 +166,9 @@ SMTP issues
# Timeouts:
- Client-side timeouts are not implemented. If the ISP server is very slow then
- in a typical setup the dial-up line will be dropped due to inactivity. This
- will have the desired effect of aborting the message submission.
+ A simple client-side timeout is implemented which will abort the transaction
+ if the server fails to respond to any of the client's SMTP commands within the
+ given time period.
# Message loops:
@@ -200,17 +217,52 @@ forwards the mail on to the system's default MTA (on port 25):
--filter ${HOME}/.emailrelay/filter \
--spool-dir ${HOME}/.emailrelay/spool
+The pre-processor program should terminate with an exit code of zero to indicate
+success. An exit code of 100 can be used to cancel all further processing of the
+message, and any other non-zero exit code is used to indicate an error.
+
+For example, the following pre-processor shell script examines the client's
+IP address and conditionally dumps the message into "sendmail" (using the
+sendmail command-line interface rather than SMTP):
+
+ #!/bin/sh
+ #
+ content="${1}"
+ envelope="`echo \"${content}\" | sed 's/content/envelope/'`"
+ ip="`awk '/MailRelay-Client:/ {print $2;exit}' \"${envelope}\"`"
+ if test "${ip}" = "192.168.0.2"
+ then
+ cat "${content}" | /usr/sbin/sendmail -t
+ rm -f "${envelope}" "${content}"
+ exit 100 # <= cancel further processing by emailrelay
+ fi
+ exit 0
+
+An example pre-processor script which does simple rot-13 masking of messages is
+also provided in the distribution ("share/emailrelay/emailrelay-process.sh").
+This could be used as a template for a more sophisticated message encryption
+system.
+
Security issues
---------------
A major security concern is the use of an external mail pre-processor (using the
---filter switch). In this release this feature is simply disabled if the process
-is running as root (effective userid is zero). The pre-processor will run as the
-same userid as the E-MailRelay program, but with an almost empty set of
-environment variables, and no open file descriptors other than
+"--filter" switch). In this release this feature is simply disabled if the
+process is running as root (effective userid is zero). The pre-processor will
+run as the same userid as the E-MailRelay program, but with an almost empty set
+of environment variables, and no open file descriptors other than
"stdin"/"stdout"/"stderr" open onto "/dev/null". The pre-processor filename has
to be configured using a full path, so there is no dependence on the current
working directory or the PATH variable.
+Security issues which relate to the SMTP protocol itself are beyond the scope of
+this document, but RFC2821 makes the following observation: "SMTP mail is
+inherently insecure in that it is feasible for even [..] casual users to [..]
+create messages that will trick a [..] recipient into believing that they came
+from somewhere else. [..] Real [..] security lies [..] in end-to-end methods [..]
+such as those which use digital signatures."
+
+The "Authentication" section below also relates to security.
+
Some other points are:
* The program runs with a "umask" of 177 so files are created with "-rw-------" permissions.
* Strings are dynamically allocated, so buffer overflow/truncation issues are avoided.
@@ -218,28 +270,85 @@ Some other points are:
* No configuration parameters can be changed through the administrative interface.
* No exec(), system() or popen() calls are used other than execve() to spawn the mail pre-processor.
+Authentication
+--------------
+E-MailRelay has some support for the ESMTP "AUTH" extension, as defined in
+RFC2554, on both the server-side and client-side. The only authentication
+mechanism currently provided is the non-standard (but widely used) "LOGIN"
+mechanism, using plaintext passwords. A future release may add "CRAM-MD5"
+(RFC2195).
+
+Authentication is enabled with the "--auth-client" and "--auth-server"
+command-line switches. The switch parameter is the name of a "secrets" file,
+containing (in the current release) plaintext passwords.
+
+The secrets file has a line-based format: blank lines are ignored and the hash
+character (#) is used for comments. Lines have four white-space delimited
+fields: "mechanism", "client-or-server", "userid", and "secret". The "mechanism"
+field must be "login" (case-insensitive); the "client-or-server" field must be
+"client" or "server"; the "userid" field is xtext-encoded user identifier; and
+the "secret" field is the xtext-encoded plaintext password. (The "xtext"
+encoding scheme is defined in RFC1891.) A client-side secrets file should
+contain at least one "login client" entry, and a server-side secrets file should
+contains zero or more "login server" entries. The same secrets file may be
+specified for both "--auth-client" and "--auth-server" switches.
+
+For example, the following secrets file defines "jsmith" as the username to be
+used when E-MailRelay authenticates with a downstream server, and defines two
+usernames ("user1" and "user2") which can be used by clients when they
+authenticate with the E-MailRelay server:
+
+ #
+ # emailrelay secrets file
+ #
+ login client jsmith my+20password
+ login server user1 secret
+ login server user2 ignorance+3Ddeath
+
+Clearly storing plaintext passwords in a file and then sending them unencypted
+over a network is a bad thing. You should at least make sure that the secrets
+file has tight permissions, and that the passwords in it are not also used for
+anything important (such as root access).
+
+On the server side authentication is advertised in the response to the SMTP
+"EHLO" command, but authentication by the client is optional. If the client does
+authenticate then the authenticated user-id is stored with the message and
+then passed on to a downstream server using an "AUTH=userid" parameter on the
+SMTP "MAIL FROM" command. If the client chooses not to authenticate then the
+submitted messages will be forwarded using "AUTH=<>" on the "MAIL FROM"
+command. Note that any "AUTH=userid" information on incoming submitted messages
+is ignored and discarded: it is the authorised userid from the AUTH command
+which is propogated, not the userid from the incoming "MAIL FROM" command's
+"AUTH=" parameter.
+
+On the client side authentication is performed when the client has connected to
+a server which supports the AUTH extension with the LOGIN mechanism. If client
+authentication is enabled (with the "--auth-client" switch) but the server does not
+support the AUTH extension, or does not support the LOGIN mechanism, then the
+client will fail the first message and terminate with an error message.
+
+Note that some ISPs require separate POP/IMAP authentication before SMTP access
+from a particular IP address is allowed. This type of POP-before-SMTP
+authentication can be done outside the E-MailRelay system by POP/IMAP utilities
+such as "fetchmail".
+
Files
-----
By default "make install" installs files in the following locations:
-* /usr/local/sbin/emailrelay
* /usr/local/libexec/emailrelay-poke
* /usr/local/libexec/emailrelay.sh
+* /usr/local/sbin/emailrelay
* /usr/local/var/spool/emailrelay/empty_file
* /usr/local/share/emailrelay/emailrelay-notify.sh
* /usr/local/share/emailrelay/emailrelay-deliver.sh
* /usr/local/share/emailrelay/emailrelay-process.sh
* /usr/local/share/emailrelay/*.html
+* /usr/local/share/emailrelay/graphics/bullet.gif
+* /usr/local/man/man1/emailrelay.1
+* /usr/local/man/man1/emailrelay-poke.1
-This directory structure is constrained by the "autoconf" and GNU standards.
-Preferred locations for a GNU/Linux distribution would be something like this:
-* /usr/sbin/emailrelay
-* /opt/emailrelay/bin/emailrelay-poke
-* /sbin/init.d/emailrelay.sh
-* /var/spool/emailrelay/
-* /opt/emailrelay/examples/emailrelay-notify.sh
-* /opt/emailrelay/examples/emailrelay-deliver.sh
-* /opt/emailrelay/examples/emailrelay-process.sh
-* /usr/share/doc/packages/emailrelay/*.html
+This directory structure is constrained by the GNU/"autoconf" conventions rather
+than the Filesystem Hierarchy Standard.
diff --git a/doc/userguide.txt b/doc/userguide.txt
index 31b2f81..f2cf0ac 100644
--- a/doc/userguide.txt
+++ b/doc/userguide.txt
@@ -184,6 +184,89 @@ directory may be sufficient:
EOF
+Troubleshooting
+---------------
+A useful technique for troubleshooting SMTP problems is to telnet into the
+remote server and drive the SMTP protocol manually. Telnet can be told to
+connect to the remote SMTP port by putting the port number (25) on the command
+line after the remote hostname, for example: "telnet smtp.myisp.net 25".
+
+Once connected you should get a startup banner from the server, which will
+probably tell you what server software you have connected to. From there you
+should type something like "EHLO myhost.mydomain". The response to the EHLO
+command should contain a list of SMTP extensions which the server software
+supports. If this includes the AUTH extension then the set of supported
+authentication mechanisms (such as LOGIN, CRAM-MD5 etc.) will be listed on the
+same line.
+
+After the EHLO response you should type "MAIL FROM:", retaining
+the angle brackets but substituing your own address. If this is accepted then
+enter a "RCPT TO:" command to say where the e-mail is going.
+(Again, retain the angle brackets but substitute an appropriate address.)
+
+After one or more "RCPT TO" commands you should enter the "DATA" command,
+followed by the message content. The message content should include an RFC822
+header, followed by a blank line, followed by the message text. For testing
+purposes you might get away without having any header/body structure at all, but
+to do things properly you should have at least a "To:" line, a "From:" line and
+a "Subject:" line in the header.
+
+At the end of the message text type a "." on a line of its own. At that point the
+message should get dispatched, and end up in your in-box in the usual way
+(assuming you put your own address in the "RCPT TO" command).
+
+The following is an example SMTP dialogue, with ">>" and "<<" marks added to
+show what was typed and what was received:
+ >> telnet smtp.myisp.net 25
+ << Trying 12.34.56.78...
+ << Connected to smtp.myisp.net.
+ << Escape character is '^]'.
+ << 220 mail12.myisp.net ESMTP Exim 3.13 #0 Sat, 17 Nov 2001 16:22:39 +0000
+ >> EHLO myhost.myisp.net
+ << 250-mail12.myisp.net Hello modem-185.myisp.net [12.34.56.78]
+ << 250-SIZE 104857600
+ << 250-PIPELINING
+ << 250 HELP
+ >> MAIL FROM:
+ << 250 is syntactically correct
+ >> RCPT TO:
+ << 250 verified
+ >> DATA
+ << 354 Enter message, ending with "." on a line by itself
+ >> To: me@myhost.myisp.net
+ >> From: me@myhost.myisp.net
+ >> Subject: test
+ >>
+ >> Test message.
+ >> .
+ << 250 OK id=1658Fp-0000Il-00
+ >> QUIT
+ << 221 mail12.myisp.net closing connection
+ << Connection closed by foreign host.
+
+If you get some sort of "access denied" errors when talking to a server which
+does not support the AUTH extension, then your ISP may be using POP-before-SMTP
+authentication. In this scheme you are required to conduct an authenticated POP
+or IMAP dialogue before you try to use SMTP. The POP/IMAP dialogue is done
+separately from the SMTP connection, but bear in mind that there might be a time
+limit so that your SMTP connection has to be made soon after the POP/IMAP
+authentication. You should be able to use an e-mail front-end program, or
+something like "fetchmail" to do the POP/IMAP authentication.
+
+If you can send mail messages sucessfully using telnet, then you should look at
+the E-MailRelay log output and compare what you do interactively with what
+the program does. Usually when running as a server E-MailRelay logging goes to
+the "syslog" system, and when running as a client it goes to the standard error
+stream ("stderr"). To get the server to log onto stderr, replace the
+"--as-server" command-line switch with "--log --no-syslog". Refer to the
+reference guide for more information.
+
+On Windows things are a bit more difficult because there is no syslog equivalent
+on Win9x, and the standard error stream often gets lost. Starting E-MailRelay
+from cygwin/bash on Win98 keeps stderr open (albeit with dreadful performance),
+whereas the standard command prompt does not. If necessary the environment
+variable "GLOGOUTPUT_FILE" can be defined as the name of a log file.
+
Glossary
--------
diff --git a/doc/windows.txt b/doc/windows.txt
new file mode 100644
index 0000000..f4f4d53
--- /dev/null
+++ b/doc/windows.txt
@@ -0,0 +1,99 @@
+E-MailRelay for Windows
+=======================
+
+Introduction
+------------
+E-MailRelay was originally developed on Linux and so most of the documentation
+relates to Unix-like operating systems rather than Microsoft Windows. This
+document provides some help on Windows installation and setup.
+
+Quick start
+------------
+In summary, the Windows installation process is as follows:
+* Unpack the zip file to "Program Files\emailrelay".
+* Create a shortcut to the E-MailRelay executable in "Start->Programs->StartUp".
+* Add "storage-daemon" configuration options (if any) to the "StartUp" shortcut's command line.
+* Create a shortcut to the executable on the taskbar and/or desktop.
+* Add "forwarding-client" configuration options to the taskbar/desktop shortcut's command line. These configuration options will normally include something like "--as-client smtp.myisp.com:smtp".
+* Create a spool directory under "\spool", eg. "c:\win98\spool\emailrelay".
+* Configure your e-mail client (eg. Outlook) to use SMTP on the local machine for outgoing e-mail.
+* Run the forwarding client from the taskbar/desktop shortcut once connected to the Internet.
+
+These steps are explained in more detail below.
+
+Unpacking
+---------
+To start the installation process you will need to extract the files from
+the "zip" archive. If you have "WinZip" installed then double-clicking on
+the E-MailRelay "zip" file should start WinZip and open the archive.
+
+From WinZip you can press the "Extract" button, or use the "Actions->Extract"
+menu option. In the "Extract to" box you can type the full path of a new
+sub-directory under "Program Files" which will hold the extracted files, eg.
+"C:\Program Files\emailrelay". WinZip will create the sub-directory
+("emailrelay") if necessary.
+
+Server configuration
+--------------------
+Once the files are unpacked you need to create a shortcut to the E-MailRelay
+executable in the Start menu's "StartUp" folder. This will make sure that the
+E-MailRelay server is started automatically when you next boot the machine and
+log in.
+
+One way to do this is to open up the "Program Files\emailrelay" folder using
+Windows Explorer or "My Computer", and open a second folder window for the
+Start menu. To open thes second "Start menu" window: (1) right-click on a
+blank part of the taskbar, (2) select "Properties" from the popup menu, (3)
+select the "Start Menu Programs" tab, and (4) press the "Advanced..."
+button. In the Start menu window go down into the "Programs" folder and then
+into "StartUp". Then simply drag the "emailrelay.exe" file from one window
+to the other using the right mouse button. When you drop the file, select
+the "Create Shortcut Here" option on the pop-up menu.
+
+You can then configure the E-MailRelay server by adding configuration options
+to the shortcut's command line. The server should work okay without this step,
+but there may be options you want to add. Refer to the userguide and reference
+manual for more information on what configuration options are available.
+
+To add configuration options right-click on the new shortcut which you have
+created in the "Start menu" window. Select "Properties" from the pop-up menu,
+and then select the "Shortcut" tab in the properties dialog box. The "Target"
+box should contain the name of the E-MailRelay executable. Add any additional
+configuration options after the executable name, separated by a space.
+
+Client configuration
+--------------------
+Once the server is configured the next step is to create an icon on the desktop
+(or taskbar) which you can use to start the E-MailRelay forwarding client once
+you are connected to the Internet.
+
+You can do this by simply dragging the E-MailRelay executable file from the
+"Program Files\emailrelay" folder onto the desktop. Then right click on the
+new icon and select "Properties" from the pop-up menu.
+
+Again the "Target" box should contain the path of the E-MailRelay executable,
+and you should add configuration options at the end, separated by a space.
+As a minumum you will need to add "--as-client myisp:smtp", where "myisp"
+is replaced with the hostname of your ISP's SMTP server.
+
+Preparation
+-----------
+To complete the installation you should create a spool directory to hold
+your e-mail messages while you are off-line. By default E-MailRelay will
+look for a directory "\spool\emailrelay", where "" is the
+path of your main windows directory, typically "c:\win98" for Windows 98.
+
+Finally you will need to configure you e-mail client program to use
+the local E-MailRelay server for outgoing mail. Where it asks for the
+name of the SMTP server for outgoing mail you should tell it to use
+"localhost" or "127.0.0.1".
+
+Uninstall
+---------
+There are no DLLs or registry entries to clean up: just delete the files under
+"Program Files\emailrelay" and "\spool\emailrelay", and remove any
+taskbar, desktop or "Start->Programs->StartUp" shortcuts.
+
+
+
+Copyright (C) 2001 Graeme Walker . All rights reserved.
diff --git a/emailrelay.spec b/emailrelay.spec
index d9c3945..77c6871 100644
--- a/emailrelay.spec
+++ b/emailrelay.spec
@@ -1,10 +1,10 @@
Summary: Simple e-mail message transfer agent using SMTP
Name: emailrelay
-Version: 0.9.5
+Version: 0.9.6
Release: 1
Copyright: GPL
Group: System Environment/Daemons
-Source: http://emailrelay.sourceforge.net/.../emailrelay-src-0.9.5.tar.gz
+Source: http://emailrelay.sourceforge.net/.../emailrelay-src-0.9.6.tar.gz
BuildRoot: /tmp/emailrelay-install
%description
@@ -48,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/local/share/emailrelay/userguide.html
/usr/local/share/emailrelay/man.html
/usr/local/share/emailrelay/index.html
+/usr/local/share/emailrelay/windows.html
/usr/local/share/emailrelay/graphics/bullet.gif
/usr/local/share/emailrelay/html/
/usr/local/man/man1/emailrelay.1
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c666021..21a5256 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -126,7 +126,7 @@ maintainer-clean-recursive:
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
- test "$$subdir" = "." && dot_seen=yes; \
+ test "$$subdir" != "." || dot_seen=yes; \
done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
@@ -187,7 +187,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/lib/gcc2.95/Makefile.in b/lib/gcc2.95/Makefile.in
index 500f172..b93819c 100644
--- a/lib/gcc2.95/Makefile.in
+++ b/lib/gcc2.95/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -121,7 +121,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/lib/msvc6.0/Makefile.in b/lib/msvc6.0/Makefile.in
index dacf9fe..e605894 100644
--- a/lib/msvc6.0/Makefile.in
+++ b/lib/msvc6.0/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -121,7 +121,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/missing b/missing
index 7789652..d46f79f 100755
--- a/missing
+++ b/missing
@@ -1,6 +1,6 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
# Franc,ois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,14 @@ if test $# -eq 0; then
exit 1
fi
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.in; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
case "$1" in
-h|--h|--he|--hel|--help)
@@ -61,7 +69,7 @@ Supported PROGRAM values:
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+ you modified \`acinclude.m4' or \`$configure_ac'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -70,7 +78,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+ you modified \`$configure_ac'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -79,10 +87,10 @@ WARNING: \`$1' is missing on your system. You should only need it if
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+ you modified \`acconfig.h' or \`$configure_ac'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -98,7 +106,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
diff --git a/src/Makefile.in b/src/Makefile.in
index d898f7f..e5fd0e9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -126,7 +126,7 @@ maintainer-clean-recursive:
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
- test "$$subdir" = "." && dot_seen=yes; \
+ test "$$subdir" != "." || dot_seen=yes; \
done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
@@ -187,7 +187,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/src/glib/Makefile.in b/src/glib/Makefile.in
index 09385a7..d567ffd 100644
--- a/src/glib/Makefile.in
+++ b/src/glib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -211,7 +211,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -249,22 +249,23 @@ gdatetime_unix.o: gdatetime_unix.cpp gdef.h ../../config.h \
gdirectory.o: gdirectory.cpp gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdirectory.h \
- gpath.h gstrings.h gfs.h glog.h
+ gpath.h gstrings.h gexception.h gfs.h glog.h
gdirectory_unix.o: gdirectory_unix.cpp gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdirectory.h \
- gpath.h gstrings.h gfs.h gdebug.h glogoutput.h glog.h gassert.h
+ gpath.h gstrings.h gexception.h gfs.h gfile.h gdebug.h \
+ glogoutput.h glog.h gassert.h
gexception.o: gexception.cpp gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gexception.h
gfile.o: gfile.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \
../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
../../lib/gcc2.95/limits gfile.h gpath.h gstrings.h \
- gexception.h glog.h
+ gexception.h gprocess.h glog.h
gfile_unix.o: gfile_unix.cpp gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gfile.h \
- gpath.h gstrings.h gexception.h
+ gpath.h gstrings.h gexception.h gprocess.h
gfs_unix.o: gfs_unix.cpp gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gfs.h
diff --git a/src/glib/garg.cpp b/src/glib/garg.cpp
index 9778b1a..3b288a4 100644
--- a/src/glib/garg.cpp
+++ b/src/glib/garg.cpp
@@ -27,6 +27,7 @@
#include "gstr.h"
#include "gdebug.h"
#include "gassert.h"
+#include
G::Arg::Arg()
{
@@ -138,3 +139,14 @@ std::string G::Arg::prefix() const
return m_prefix ;
}
+//static
+const char * G::Arg::prefix( char * argv [] ) // throw()
+{
+ const char * exe = argv[0] ;
+ const char * p1 = std::strrchr( exe , '/' ) ;
+ const char * p2 = std::strrchr( exe , '\\' ) ;
+ p1 = p1 ? (p1+1U) : exe ;
+ p2 = p2 ? (p2+1U) : exe ;
+ return p1 > p2 ? p1 : p2 ;
+}
+
diff --git a/src/glib/garg.h b/src/glib/garg.h
index b218d08..de7bfe5 100644
--- a/src/glib/garg.h
+++ b/src/glib/garg.h
@@ -76,6 +76,11 @@ public:
// Returns the basename of v(0) without
// any extension.
+ static const char * prefix( char * argv[] ) ; // throw()
+ // An exception-free version of prefix() which can
+ // be used in main() outside of the outermost try
+ // block.
+
bool contains( const std::string & sw , size_t sw_args = 0U ) const ;
// Returns true if the command line
// contains the given switch with enough
diff --git a/src/glib/garg_unix.cpp b/src/glib/garg_unix.cpp
index 047498a..96d3370 100644
--- a/src/glib/garg_unix.cpp
+++ b/src/glib/garg_unix.cpp
@@ -25,7 +25,7 @@
#include "garg.h"
#include "gdebug.h"
-std::string G::Arg::moduleName( HINSTANCE hinstance )
+std::string G::Arg::moduleName( HINSTANCE )
{
return std::string() ;
}
diff --git a/src/glib/gdate.cpp b/src/glib/gdate.cpp
index 292078c..2f4c346 100644
--- a/src/glib/gdate.cpp
+++ b/src/glib/gdate.cpp
@@ -86,7 +86,6 @@ void G::Date::init( const G::DateTime::BrokenDownTime & tm )
std::string G::Date::string( Format format ) const
{
- const char * sep = format == yyyy_mm_dd_slash ? "/" : "" ;
std::stringstream ss ;
if( format == yyyy_mm_dd_slash )
ss << m_year << "/" << m_month << "/" << m_day ;
diff --git a/src/glib/gdatetime.cpp b/src/glib/gdatetime.cpp
index 6320a63..d657e60 100644
--- a/src/glib/gdatetime.cpp
+++ b/src/glib/gdatetime.cpp
@@ -27,9 +27,9 @@
#include "gassert.h"
#include
-const unsigned int minute = 60U ;
-const unsigned int hour = 60U * minute ;
-const unsigned int day = 24U * hour ;
+const time_t minute = 60U ;
+const time_t hour = 60U * minute ;
+const time_t day = 24U * hour ;
G::DateTime::EpochTime G::DateTime::now()
{
@@ -43,7 +43,7 @@ G::DateTime::EpochTime G::DateTime::epochTime( const BrokenDownTime & bdt_in )
EpochTime start = std::mktime( &bdt ) ; // localtime
// iterate over all timezones
- const unsigned int delta = minute * 30U ;
+ const time_t delta = minute * 30U ;
for( EpochTime t = (start-day-delta) ; t <= (start+day+delta) ; t += delta )
{
if( equivalent( t , bdt_in ) )
diff --git a/src/glib/gdatetime.h b/src/glib/gdatetime.h
index a88bdbf..6b7ebdb 100644
--- a/src/glib/gdatetime.h
+++ b/src/glib/gdatetime.h
@@ -67,7 +67,8 @@ public:
// operation.)
static std::string offsetString( Offset offset ) ;
- // Uses the five-character format "+/-hhmm".
+ // Converts the given utc/localtime offset into a five-character
+ // "+/-hhmm" string.
// See also RFC2822.
private:
diff --git a/src/glib/gdef.h b/src/glib/gdef.h
index a270646..3524dea 100644
--- a/src/glib/gdef.h
+++ b/src/glib/gdef.h
@@ -101,8 +101,8 @@
#include
#endif
- // Define Windows-style types (under unix these
- // are only used for unimplemented declarations)
+ // Define Windows-style types (only used for
+ // unimplemented declarations under unix)
//
#if ! defined( G_WINDOWS )
typedef unsigned char BOOL ;
@@ -111,7 +111,8 @@
typedef unsigned int HANDLE ;
#endif
- // Include commonly-used system headers
+ // Include commonly-used system headers (good for
+ // pre-compilation)
//
#include
#include
@@ -126,6 +127,8 @@
//
typedef unsigned long g_uint32_t ;
typedef unsigned short g_uint16_t ;
+ typedef long g_int32_t ;
+ typedef short g_int16_t ;
// Define short-name types
//
@@ -155,6 +158,7 @@
#pragma warning( disable : 4511 ) // cannot create default copy ctor
#pragma warning( disable : 4512 ) // cannot create default op=()
#pragma warning( disable : 4786 ) // truncation in debug info
+ #pragma warning( disable : 4275 ) // dll-interface stuff in
#endif
#endif
diff --git a/src/glib/gdirectory.h b/src/glib/gdirectory.h
index 061770d..1f09d02 100644
--- a/src/glib/gdirectory.h
+++ b/src/glib/gdirectory.h
@@ -26,6 +26,7 @@
#include "gdef.h"
#include "gpath.h"
+#include "gexception.h"
#include
#include
diff --git a/src/glib/gdirectory_unix.cpp b/src/glib/gdirectory_unix.cpp
index 3f39acf..f5e0e30 100644
--- a/src/glib/gdirectory_unix.cpp
+++ b/src/glib/gdirectory_unix.cpp
@@ -24,6 +24,7 @@
#include "gdef.h"
#include "gdirectory.h"
#include "gfs.h"
+#include "gfile.h"
#include "gdebug.h"
#include "glog.h"
#include
@@ -236,6 +237,7 @@ std::string G::DirectoryIteratorImp::modificationTimeString() const
std::string G::DirectoryIteratorImp::sizeString() const
{
- return std::string("0") ; // for now
+ std::string s = G::File::sizeString( filePath() ) ;
+ return s.empty() ? std::string("0") : s ;
}
diff --git a/src/glib/gdirectory_win32.cpp b/src/glib/gdirectory_win32.cpp
index a35ff07..64433de 100644
--- a/src/glib/gdirectory_win32.cpp
+++ b/src/glib/gdirectory_win32.cpp
@@ -24,6 +24,7 @@
#include "gdef.h"
#include "gdirectory.h"
#include "gfs.h"
+#include "gfile.h"
#include "gdebug.h"
#include "glog.h"
#include
@@ -295,8 +296,6 @@ std::string G::DirectoryIteratorImp::sizeString() const
const DWORD & hi = m_context.nFileSizeHigh ;
const DWORD & lo = m_context.nFileSizeLow ;
- std::stringstream ss ;
- ss << hi << std::setw(8) << std::setfill('0') << lo ;
- return ss.str() ;
+ return G::File::sizeString( hi , lo ) ;
}
diff --git a/src/glib/gfile.cpp b/src/glib/gfile.cpp
index 7991cb1..f696626 100644
--- a/src/glib/gfile.cpp
+++ b/src/glib/gfile.cpp
@@ -23,6 +23,7 @@
#include "gdef.h"
#include "gfile.h"
+#include "gprocess.h"
#include "glog.h"
#include
#include
@@ -38,7 +39,7 @@ void G::File::remove( const Path & path )
{
if( 0 != std::remove( path.pathCstr() ) )
{
- //int error = std::errno ;
+ //int error = G::Process::errno_() ;
throw CannotRemove( path.str() ) ;
}
G_DEBUG( "G::File::remove: \"" << path << "\"" ) ;
@@ -55,7 +56,7 @@ void G::File::rename( const Path & from , const Path & to )
{
if( 0 != std::rename( from.pathCstr() , to.pathCstr() ) )
{
- //int error = std::errno ;
+ //int error = G::Process::errno_() ;
throw CannotRename( from.str() ) ;
}
G_DEBUG( "G::File::rename: \"" << from << "\" -> \"" << to << "\"" ) ;
@@ -83,3 +84,32 @@ void G::File::mkdir( const Path & dir )
throw CannotMkdir( dir.str() ) ;
}
+bool G::File::exists( const Path & path )
+{
+ return exists( path , false , true ) ;
+}
+
+bool G::File::exists( const Path & path , const NoThrow & )
+{
+ return exists( path , false , false ) ;
+}
+
+bool G::File::exists( const Path & path , bool on_error , bool do_throw )
+{
+ bool enoent = false ;
+ bool rc = exists( path.pathCstr() , enoent ) ; // o/s-specific
+ if( !rc && enoent )
+ {
+ return false ;
+ }
+ else if( !rc && do_throw )
+ {
+ throw StatError( path.str() ) ;
+ }
+ else if( !rc )
+ {
+ return on_error ;
+ }
+ return true ;
+}
+
diff --git a/src/glib/gfile.h b/src/glib/gfile.h
index 61cfd6e..50cae48 100644
--- a/src/glib/gfile.h
+++ b/src/glib/gfile.h
@@ -32,6 +32,7 @@
namespace G
{
class File ;
+ class DirectoryIteratorImp ;
} ;
// Class: G::File
@@ -41,10 +42,12 @@ namespace G
class G::File
{
public:
+ G_EXCEPTION( StatError , "cannot stat() file" ) ;
G_EXCEPTION( CannotRemove , "cannot delete file" ) ;
G_EXCEPTION( CannotRename , "cannot rename file" ) ;
G_EXCEPTION( CannotCopy , "cannot copy file" ) ;
G_EXCEPTION( CannotMkdir , "cannot mkdir" ) ;
+ G_EXCEPTION( SizeOverflow , "file size overflow" ) ;
class NoThrow // An overload discriminator class for File methods.
{} ;
@@ -71,6 +74,25 @@ public:
static void mkdir( const Path & dir ) ;
// Creates a directory.
+
+ static std::string sizeString( const Path & file ) ;
+ // Returns the file's size in string format.
+ // Returns the empty string on error.
+
+ static bool exists( const Path & file ) ;
+ // Returns true if the file (or link or device etc.)
+ // exists. Throws an exception if permission denied
+ // or too many symlinks etc.
+
+ static bool exists( const Path & file , const NoThrow & ) ;
+ // Returns true if the file (or link or device etc.)
+ // exists. Returns false on error.
+
+private:
+ friend class G::DirectoryIteratorImp ;
+ static std::string sizeString( g_uint32_t hi , g_uint32_t lo ) ; // win32
+ static bool exists( const Path & , bool , bool ) ;
+ static bool exists( const char * , bool & ) ; // o/s-specific
} ;
#endif
diff --git a/src/glib/gfile_unix.cpp b/src/glib/gfile_unix.cpp
index 607567c..bfedcf1 100644
--- a/src/glib/gfile_unix.cpp
+++ b/src/glib/gfile_unix.cpp
@@ -23,10 +23,39 @@
#include "gdef.h"
#include "gfile.h"
+#include "gprocess.h"
+#include
#include
+#include
bool G::File::mkdir( const Path & dir , const NoThrow & )
{
return 0 == ::mkdir( dir.str().c_str() , S_IRUSR | S_IWUSR | S_IXUSR ) ;
}
+bool G::File::exists( const char * path , bool & enoent )
+{
+ struct stat statbuf ;
+ if( 0 == ::stat( path , &statbuf ) )
+ {
+ return true ;
+ }
+ else
+ {
+ int error = G::Process::errno_() ;
+ enoent = error == ENOENT || error == ENOTDIR ;
+ return false ;
+ }
+}
+
+std::string G::File::sizeString( const Path & path )
+{
+ struct stat statbuf ;
+ if( 0 != ::stat( path.pathCstr() , &statbuf ) )
+ return std::string() ;
+
+ std::stringstream ss ;
+ ss << statbuf.st_size ;
+ return ss.str() ;
+}
+
diff --git a/src/glib/gfile_win32.cpp b/src/glib/gfile_win32.cpp
index 46496dc..af92c65 100644
--- a/src/glib/gfile_win32.cpp
+++ b/src/glib/gfile_win32.cpp
@@ -25,9 +25,55 @@
#include "gfile.h"
#include
#include
+#include
+#include
bool G::File::mkdir( const Path & dir , const NoThrow & )
{
return 0 == ::_mkdir( dir.str().c_str() ) ;
}
+std::string G::File::sizeString( const Path & path )
+{
+ WIN32_FIND_DATA info ;
+ HANDLE h = ::FindFirstFile( path.str().c_str() , &info ) ;
+ if( h == INVALID_HANDLE_VALUE )
+ return std::string() ;
+
+ const DWORD & hi = info.nFileSizeHigh ;
+ const DWORD & lo = info.nFileSizeLow ;
+
+ ::FindClose( h ) ;
+
+ return sizeString( hi , lo ) ;
+}
+
+std::string G::File::sizeString( g_uint32_t hi , g_uint32_t lo )
+{
+ __int64 n = hi ;
+ n <<= 32U ;
+ n |= lo ;
+ if( n < 0 )
+ throw SizeOverflow() ;
+
+ if( n == 0 )
+ return std::string("0") ;
+
+ std::string s ;
+ while( n != 0 )
+ {
+ size_t i = n % 10U ;
+ s.insert( 0U , 1U , '0' + i ) ;
+ n /= 10U ;
+ }
+ return s ;
+}
+
+bool G::File::exists( const char * path , bool & enoent )
+{
+ struct _stat statbuf ;
+ bool ok = 0 == ::_stat( path , &statbuf ) ;
+ enoent = !ok ;
+ return ok ;
+}
+
diff --git a/src/glib/ggetopt.cpp b/src/glib/ggetopt.cpp
index f40726d..54fa251 100644
--- a/src/glib/ggetopt.cpp
+++ b/src/glib/ggetopt.cpp
@@ -148,6 +148,11 @@ size_t G::GetOpt::widthLimit( size_t w )
return (w != 0U && w < 50U) ? 50U : w ;
}
+void G::GetOpt::showUsage( std::ostream & stream , const std::string & args ) const
+{
+ showUsage( stream , m_args.prefix() , args ) ;
+}
+
void G::GetOpt::showUsage( std::ostream & stream , const std::string & exe , const std::string & args ,
size_t tab_stop , size_t width ) const
{
@@ -494,7 +499,12 @@ bool G::GetOpt::hasErrors() const
return m_errors.size() != 0U ;
}
-void G::GetOpt::showErrors( std::ostream &stream , std::string prefix_1 ,
+void G::GetOpt::showErrors( std::ostream & stream ) const
+{
+ showErrors( stream , m_args.prefix() ) ;
+}
+
+void G::GetOpt::showErrors( std::ostream & stream , std::string prefix_1 ,
std::string prefix_2 ) const
{
if( m_errors.size() != 0U )
diff --git a/src/glib/ggetopt.h b/src/glib/ggetopt.h
index f1a8aa2..6db19e6 100644
--- a/src/glib/ggetopt.h
+++ b/src/glib/ggetopt.h
@@ -91,8 +91,11 @@ public:
const std::string & args , size_t tab_stop = 30U ,
size_t wrap_width = wrapDefault() ) const ;
// Streams out multi-line usage text using
- // usageSummary() and usageHelp(). Does nothing
- // about non-switch arguments.
+ // usageSummary() and usageHelp().
+
+ void showUsage( std::ostream & stream , const std::string & args ) const ;
+ // Streams out multi-line usage text using
+ // usageSummary() and usageHelp().
bool hasErrors() const ;
// Returns true if there are errors.
@@ -103,6 +106,9 @@ public:
// item to the given stream, prefixed with the given
// prefix(es). The two prefixes are simply concatenated.
+ void showErrors( std::ostream & stream ) const ;
+ // An overload which uses prefix() as .
+
void show( std::ostream & stream , std::string prefix ) const ;
// For debugging.
@@ -134,8 +140,8 @@ private:
SwitchSpec(char c_,const std::string &name_,const std::string &description_,
bool v_,const std::string &vd_) :
c(c_) , name(name_) , description(description_) ,
- hidden(description_.empty()) ,
- valued(v_) , value_description(vd_) {}
+ valued(v_) , hidden(description_.empty()) ,
+ value_description(vd_) {}
} ;
typedef std::map SwitchSpecMap ;
typedef std::pair Value ;
diff --git a/src/glib/glogoutput_win32.cpp b/src/glib/glogoutput_win32.cpp
index ba37305..f723884 100644
--- a/src/glib/glogoutput_win32.cpp
+++ b/src/glib/glogoutput_win32.cpp
@@ -32,19 +32,14 @@ void G::LogOutput::rawOutput( G::Log::Severity severity , const char *message )
std::cerr << message ;
std::cerr.flush() ;
- if( std::getenv("GLOGOUTPUT_DEBUGGER") != NULL )
+ static bool debugger = std::getenv("GLOGOUTPUT_DEBUGGER") != NULL ;
+ if( debugger )
{
::OutputDebugString( message ) ;
}
- static bool first = true ;
- static const char * filename = NULL ;
- if( first )
- {
- first = false ;
- const char * key = "GLOGOUTPUT_FILE" ;
- filename = std::getenv(key) ;
- }
+ static const char * key = "GLOGOUTPUT_FILE" ;
+ static const char * filename = std::getenv( key ) ;
if( filename != NULL && *filename != '\0' )
{
static std::ofstream file( filename ) ;
diff --git a/src/glib/gmemory.h b/src/glib/gmemory.h
index 6c8e14d..72afee5 100644
--- a/src/glib/gmemory.h
+++ b/src/glib/gmemory.h
@@ -75,7 +75,7 @@ void operator<<=( std::auto_ptr & ap , T * p )
// Description: A version for null-pointer constants.
//
template
-void operator<<=( std::auto_ptr & ap , int null_pointer )
+void operator<<=( std::auto_ptr & ap , int /* null_pointer */ )
{
T * p = 0 ;
ap <<= p ;
diff --git a/src/glib/gprocess.h b/src/glib/gprocess.h
index 6521ee8..01cab5d 100644
--- a/src/glib/gprocess.h
+++ b/src/glib/gprocess.h
@@ -110,9 +110,11 @@ public:
// Returns true if this process has enhanced security
// privileges.
+ static int errno_() ;
+ // Returns the process's current 'errno' value.
+
private:
Process() ;
- static int errno_() ;
static void execCore( const Path & , const std::string & ) ;
} ;
diff --git a/src/glib/gprocess_unix.cpp b/src/glib/gprocess_unix.cpp
index 6e97985..dcf4ad0 100644
--- a/src/glib/gprocess_unix.cpp
+++ b/src/glib/gprocess_unix.cpp
@@ -31,6 +31,9 @@
#include
#include // open()
+// Class: G::Process::IdImp
+// Description: A private implementation class used by G::Process.
+//
class G::Process::IdImp
{
public:
@@ -56,13 +59,15 @@ bool G::Process::cd( const Path & dir , NoThrow )
void G::Process::setUmask()
{
mode_t new_mode = 0177 ; // create as -rw-------
- mode_t old_mode = ::umask( new_mode ) ;
+ (void) ::umask( new_mode ) ;
}
//static
void G::Process::closeStderr()
{
::close( STDERR_FILENO ) ;
+ ::open( G::FileSystem::nullDevice() , O_WRONLY ) ;
+ ::fcntl( STDERR_FILENO , F_SETFD , 0 ) ; // close-on-exec false
}
//static
@@ -76,8 +81,24 @@ void G::Process::closeFiles( bool keep_stderr )
for( int fd = 0 ; fd < n ; fd++ )
{
if( !keep_stderr || fd != STDERR_FILENO )
+ {
::close( fd ) ;
+ }
}
+
+ // reopen standard fds to prevent accidental use
+ // of arbitrary files or sockets as standard
+ // streams
+ //
+ ::open( G::FileSystem::nullDevice() , O_RDONLY ) ;
+ ::open( G::FileSystem::nullDevice() , O_WRONLY ) ;
+ if( !keep_stderr )
+ {
+ ::open( G::FileSystem::nullDevice() , O_WRONLY ) ;
+ ::fcntl( STDERR_FILENO , F_SETFD , 0 ) ; // close-on-exec false
+ }
+ ::fcntl( STDIN_FILENO , F_SETFD , 0 ) ; // close-on-exec false
+ ::fcntl( STDOUT_FILENO , F_SETFD , 0 ) ; // close-on-exec false
}
G::Process::Who G::Process::fork()
@@ -160,9 +181,6 @@ void G::Process::exec( const G::Path & exe , const std::string & arg )
throw InvalidPath( exe.str() ) ;
closeFiles() ;
- (void) ::open( G::FileSystem::nullDevice() , O_RDONLY ) ; // stdin
- (void) ::open( G::FileSystem::nullDevice() , O_WRONLY ) ; // stdout
- (void) ::open( G::FileSystem::nullDevice() , O_WRONLY ) ; // stderr
// TODO: more security stuff required here -- setuid() etc.
diff --git a/src/glib/gprocess_win32.cpp b/src/glib/gprocess_win32.cpp
index 07ccd2c..1dc1210 100644
--- a/src/glib/gprocess_win32.cpp
+++ b/src/glib/gprocess_win32.cpp
@@ -141,6 +141,7 @@ bool G::Process::privileged()
}
// not implemented...
+// int G::Process::errno_()
// Who G::Process::fork() {}
// Who G::Process::fork( Id & child ) {}
// void G::Process::exec( const Path & exe , const std::string & arg ) {}
diff --git a/src/glib/gstr.cpp b/src/glib/gstr.cpp
index 1e698c5..eac673f 100644
--- a/src/glib/gstr.cpp
+++ b/src/glib/gstr.cpp
@@ -182,7 +182,7 @@ unsigned int G::Str::toUInt( const std::string &s , bool limited )
unsigned long G::Str::toULong( const std::string &s , bool limited )
{
char * end = NULL ;
- unsigned long result = ::strtoul( s.c_str(), &end, 0 ) ;
+ unsigned long result = ::strtoul( s.c_str(), &end, 10 ) ;
if( end == 0 || end[0] != '\0' )
throw InvalidFormat( s ) ;
@@ -257,6 +257,10 @@ std::string G::Str::toPrintableAscii( char c , char escape )
{
result.append( 1U , 't' ) ;
}
+ else if( c == '\0' )
+ {
+ result.append( 1U , '0' ) ;
+ }
else
{
unsigned int n = c ;
@@ -270,7 +274,7 @@ std::string G::Str::toPrintableAscii( char c , char escape )
std::string G::Str::toPrintableAscii( const std::string & in , char escape )
{
std::string result ;
- for( const char * p = in.c_str() ; *p ; ++p )
+ for( std::string::const_iterator p = in.begin() ; p != in.end() ; ++p )
result.append( toPrintableAscii(*p,escape) ) ;
return result ;
}
@@ -293,8 +297,16 @@ std::string G::Str::readLineFrom( std::istream & stream , char ignore )
std::string G::Str::readLineFrom( std::istream & stream , const std::string & eol )
{
+ std::string result ;
+ readLineFrom( stream , eol , result ) ;
+ return result ;
+}
+
+void G::Str::readLineFrom( std::istream & stream , const std::string & eol , std::string & line )
+{
+ line.erase() ;
+
const size_t eol_length = eol.length() ;
- std::string line ;
char c ;
for( size_t line_length = 1U ; stream.get(c) ; ++line_length )
{
@@ -305,11 +317,10 @@ std::string G::Str::readLineFrom( std::istream & stream , const std::string & eo
if( line.find(eol,offset) == offset )
{
line.erase(offset) ;
- return line ;
+ break ;
}
}
}
- return line ;
}
std::string G::Str::wrap( std::string text , const std::string & prefix_1 ,
diff --git a/src/glib/gstr.h b/src/glib/gstr.h
index c0872ab..729c5bd 100644
--- a/src/glib/gstr.h
+++ b/src/glib/gstr.h
@@ -153,6 +153,9 @@ public:
// An overload which uses 'eol' as the terminator, and
// without the 'ignore' feature.
+ static void readLineFrom( std::istream & stream , const std::string & eol , std::string & result ) ;
+ // An overload which avoids string copying.
+
static std::string wrap( std::string text ,
const std::string & prefix_first_line , const std::string & prefix_subsequent_lines ,
size_t width = 70U ) ;
diff --git a/src/gnet/Makefile.am b/src/gnet/Makefile.am
index e2a120c..e1e8786 100644
--- a/src/gnet/Makefile.am
+++ b/src/gnet/Makefile.am
@@ -46,6 +46,7 @@ libgnet_a_SOURCES = gaddress_ipv4.cpp \
gserver.cpp \
gsocket.cpp \
gsocket_unix.cpp \
+ gtimer.cpp \
gaddress.h \
gclient.h \
gconnection.h \
@@ -61,4 +62,5 @@ libgnet_a_SOURCES = gaddress_ipv4.cpp \
gselect.h \
gserver.h \
gsocket.h \
+ gtimer.h \
gwinsock.h
diff --git a/src/gnet/Makefile.in b/src/gnet/Makefile.in
index 877878b..8a64cda 100644
--- a/src/gnet/Makefile.in
+++ b/src/gnet/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -93,7 +93,7 @@ EXTRA_DIST = gclient_win32.cpp gdescriptor_win32.cpp gevent_win32.cpp glocal_
INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib
noinst_LIBRARIES = libgnet.a
-libgnet_a_SOURCES = gaddress_ipv4.cpp gclient.cpp gclient_unix.cpp gconnection.cpp gdescriptor_unix.cpp gevent.cpp gevent_unix.cpp geventserver.cpp glinebuffer.cpp glocal_unix.cpp gmonitor.cpp gresolve.cpp gresolve_ipv4.cpp gresolve_unix.cpp gselect.cpp gserver.cpp gsocket.cpp gsocket_unix.cpp gaddress.h gclient.h gconnection.h gdescriptor.h gevent.h geventserver.h glinebuffer.h glocal.h gmonitor.h gnet.h grequest.h gresolve.h gselect.h gserver.h gsocket.h gwinsock.h
+libgnet_a_SOURCES = gaddress_ipv4.cpp gclient.cpp gclient_unix.cpp gconnection.cpp gdescriptor_unix.cpp gevent.cpp gevent_unix.cpp geventserver.cpp glinebuffer.cpp glocal_unix.cpp gmonitor.cpp gresolve.cpp gresolve_ipv4.cpp gresolve_unix.cpp gselect.cpp gserver.cpp gsocket.cpp gsocket_unix.cpp gtimer.cpp gaddress.h gclient.h gconnection.h gdescriptor.h gevent.h geventserver.h glinebuffer.h glocal.h gmonitor.h gnet.h grequest.h gresolve.h gselect.h gserver.h gsocket.h gtimer.h gwinsock.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
@@ -109,7 +109,7 @@ libgnet_a_LIBADD =
libgnet_a_OBJECTS = gaddress_ipv4.o gclient.o gclient_unix.o \
gconnection.o gdescriptor_unix.o gevent.o gevent_unix.o geventserver.o \
glinebuffer.o glocal_unix.o gmonitor.o gresolve.o gresolve_ipv4.o \
-gresolve_unix.o gselect.o gserver.o gsocket.o gsocket_unix.o
+gresolve_unix.o gselect.o gserver.o gsocket.o gsocket_unix.o gtimer.o
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
@@ -211,7 +211,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -230,7 +230,7 @@ gclient.o: gclient.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
gaddress.h ../../src/glib/gexception.h gsocket.h gevent.h \
- gdescriptor.h ../../src/glib/gdatetime.h gresolve.h gmonitor.h \
+ ../../src/glib/gdatetime.h gdescriptor.h gresolve.h gmonitor.h \
gclient.h gconnection.h gserver.h gselect.h \
../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
../../src/glib/glog.h ../../src/glib/gassert.h
@@ -238,7 +238,7 @@ gclient_unix.o: gclient_unix.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
gclient.h gaddress.h ../../src/glib/gexception.h gconnection.h \
- gsocket.h gevent.h gdescriptor.h
+ gsocket.h gevent.h ../../src/glib/gdatetime.h gdescriptor.h
gconnection.o: gconnection.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
@@ -250,19 +250,21 @@ gdescriptor_unix.o: gdescriptor_unix.cpp ../../src/glib/gdef.h \
gevent.o: gevent.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
- gevent.h gdescriptor.h ../../src/glib/gdebug.h \
+ gevent.h ../../src/glib/gdatetime.h ../../src/glib/gexception.h \
+ gdescriptor.h ../../src/glib/gdebug.h \
../../src/glib/glogoutput.h ../../src/glib/glog.h \
../../src/glib/gassert.h
gevent_unix.o: gevent_unix.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
- gevent.h gdescriptor.h gselect.h ../../src/glib/gexception.h
+ gevent.h ../../src/glib/gdatetime.h ../../src/glib/gexception.h \
+ gdescriptor.h gselect.h
geventserver.o: geventserver.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
geventserver.h gserver.h gsocket.h gaddress.h \
- ../../src/glib/gexception.h gevent.h gdescriptor.h \
- gconnection.h gselect.h ../../src/glib/glog.h
+ ../../src/glib/gexception.h gevent.h ../../src/glib/gdatetime.h \
+ gdescriptor.h gconnection.h gselect.h ../../src/glib/glog.h
glinebuffer.o: glinebuffer.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
@@ -278,17 +280,17 @@ gmonitor.o: gmonitor.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
gmonitor.h gclient.h gaddress.h ../../src/glib/gexception.h \
- gconnection.h gsocket.h gevent.h gdescriptor.h gserver.h \
- gselect.h ../../src/glib/gassert.h ../../src/glib/glogoutput.h \
- ../../src/glib/glog.h
+ gconnection.h gsocket.h gevent.h ../../src/glib/gdatetime.h \
+ gdescriptor.h gserver.h gselect.h ../../src/glib/gassert.h \
+ ../../src/glib/glogoutput.h ../../src/glib/glog.h
gresolve.o: gresolve.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gresolve.h \
gnet.h gaddress.h ../../src/glib/gexception.h gsocket.h \
- gevent.h gdescriptor.h ../../src/glib/gstr.h \
- ../../src/glib/gstrings.h ../../src/glib/gdebug.h \
- ../../src/glib/glogoutput.h ../../src/glib/glog.h \
- ../../src/glib/gassert.h
+ gevent.h ../../src/glib/gdatetime.h gdescriptor.h \
+ ../../src/glib/gstr.h ../../src/glib/gstrings.h \
+ ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+ ../../src/glib/glog.h ../../src/glib/gassert.h
gresolve_ipv4.o: gresolve_ipv4.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gresolve.h \
@@ -297,35 +299,45 @@ gresolve_unix.o: gresolve_unix.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gresolve.h \
gnet.h gaddress.h ../../src/glib/gexception.h gsocket.h \
- gevent.h gdescriptor.h ../../src/glib/gstr.h \
- ../../src/glib/gstrings.h ../../src/glib/gdebug.h \
- ../../src/glib/glogoutput.h ../../src/glib/glog.h \
- ../../src/glib/gassert.h
+ gevent.h ../../src/glib/gdatetime.h gdescriptor.h \
+ ../../src/glib/gstr.h ../../src/glib/gstrings.h \
+ ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+ ../../src/glib/glog.h ../../src/glib/gassert.h
gselect.o: gselect.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gselect.h \
- gnet.h gevent.h gdescriptor.h ../../src/glib/gexception.h \
- ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
- ../../src/glib/glog.h ../../src/glib/gassert.h
+ gnet.h gevent.h ../../src/glib/gdatetime.h \
+ ../../src/glib/gexception.h gdescriptor.h ../../src/glib/gstr.h \
+ ../../src/glib/gstrings.h gtimer.h ../../src/glib/gdebug.h \
+ ../../src/glib/glogoutput.h ../../src/glib/glog.h \
+ ../../src/glib/gassert.h
gserver.o: gserver.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
gserver.h gsocket.h gaddress.h ../../src/glib/gexception.h \
- gevent.h gdescriptor.h gconnection.h gselect.h gmonitor.h \
- gclient.h ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
- ../../src/glib/glog.h ../../src/glib/gassert.h
+ gevent.h ../../src/glib/gdatetime.h gdescriptor.h gconnection.h \
+ gselect.h gmonitor.h gclient.h ../../src/glib/gdebug.h \
+ ../../src/glib/glogoutput.h ../../src/glib/glog.h \
+ ../../src/glib/gassert.h ../../src/glib/gmemory.h
gsocket.o: gsocket.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
../../src/glib/gassert.h ../../src/glib/glogoutput.h \
../../src/glib/glog.h gsocket.h gaddress.h \
- ../../src/glib/gexception.h gevent.h gdescriptor.h \
- ../../src/glib/gmemory.h ../../src/glib/gdebug.h
+ ../../src/glib/gexception.h gevent.h ../../src/glib/gdatetime.h \
+ gdescriptor.h ../../src/glib/gmemory.h ../../src/glib/gdebug.h
gsocket_unix.o: gsocket_unix.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gnet.h \
gsocket.h gaddress.h ../../src/glib/gexception.h gevent.h \
- gdescriptor.h ../../src/glib/gdebug.h \
+ ../../src/glib/gdatetime.h gdescriptor.h \
+ ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
+ ../../src/glib/glog.h ../../src/glib/gassert.h
+gtimer.o: gtimer.cpp ../../src/glib/gdef.h ../../config.h \
+ ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+ ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gtimer.h \
+ gnet.h ../../src/glib/gdatetime.h ../../src/glib/gexception.h \
+ gevent.h gdescriptor.h ../../src/glib/gdebug.h \
../../src/glib/glogoutput.h ../../src/glib/glog.h \
../../src/glib/gassert.h
diff --git a/src/gnet/gclient.cpp b/src/gnet/gclient.cpp
index f09a214..92894de 100644
--- a/src/gnet/gclient.cpp
+++ b/src/gnet/gclient.cpp
@@ -80,6 +80,7 @@ private:
ClientResolver m_resolver ;
StreamSocket * m_s ;
Address m_address ;
+ std::string m_peer_name ;
Client & m_interface ;
bool m_priviledged ;
enum Status { Success , Failure , Retry , ImmediateSuccess } ;
@@ -96,7 +97,7 @@ public:
void writeEvent() ;
void exceptionEvent() ;
bool connect( std::string host , std::string service , std::string *error , bool sync_dns ) ;
- std::string startConnecting( const Address & , bool & ) ;
+ std::string startConnecting( const Address & , const std::string & , bool & ) ;
Status connectCore( Address , std::string * , bool , unsigned int ) ;
void disconnect() ;
StreamSocket & s() ;
@@ -108,6 +109,7 @@ public:
void setState( State ) ;
std::pair localAddress() const ;
std::pair peerAddress() const ;
+ std::string peerName() const ;
private:
ClientImp( const ClientImp & ) ;
@@ -166,17 +168,22 @@ std::pair GNet::Client::peerAddress() const
return m_imp->peerAddress() ;
}
+std::string GNet::Client::peerName() const
+{
+ return m_imp->peerName() ;
+}
+
// ===
bool GNet::ClientImp::m_first = true ;
GNet::ClientImp::ClientImp( Client &intaface , bool priviledged , bool quit_on_disconnect ) :
- m_interface(intaface) ,
- m_state(Idle) ,
- m_s(NULL) ,
m_resolver(*this) ,
- m_priviledged(priviledged) ,
+ m_s(NULL) ,
m_address(Address::invalidAddress()) ,
+ m_interface(intaface) ,
+ m_priviledged(priviledged) ,
+ m_state(Idle) ,
m_quit_on_disconnect(quit_on_disconnect)
{
G_DEBUG( "ClientImp::ctor" ) ;
@@ -252,7 +259,7 @@ bool GNet::ClientImp::connect( std::string host , std::string service ,
return false ;
}
bool immediate = false ;
- std::string connect_reason = startConnecting( pair.first.address , immediate ) ;
+ std::string connect_reason = startConnecting( pair.first.address, pair.first.canonical_name, immediate);
if( connect_reason.length() != 0U )
{
error = connect_reason ;
@@ -295,8 +302,9 @@ void GNet::ClientImp::resolveCon( bool success , const Address &address ,
if( success )
{
G_DEBUG( "GNet::ClientImp::resolveCon: " << address.displayString() ) ;
+ std::string peer_name = resolve_reason ;
bool immediate = false ;
- std::string connect_reason = startConnecting( address , immediate ) ;
+ std::string connect_reason = startConnecting( address , peer_name , immediate ) ;
if( connect_reason.length() )
{
close() ;
@@ -314,11 +322,12 @@ void GNet::ClientImp::resolveCon( bool success , const Address &address ,
}
}
-std::string GNet::ClientImp::startConnecting( const Address & address , bool & immediate )
+std::string GNet::ClientImp::startConnecting( const Address & address , const std::string & peer_name , bool & immediate )
{
// save the target address
G_DEBUG( "GNet::ClientImp::startConnecting: " << address.displayString() ) ;
m_address = address ;
+ m_peer_name = peer_name ;
// create and open a socket
//
@@ -444,7 +453,7 @@ void GNet::ClientImp::readEvent()
else if( n != -1 )
{
G_ASSERT( n <= sizeof(buffer) ) ;
- G_DEBUG( "GNet::ClientImp::readEvent: " << n << " byte(s)" ) ;
+ //G_DEBUG( "GNet::ClientImp::readEvent: " << n << " byte(s)" ) ;
m_interface.onData( buffer , n ) ;
}
else
@@ -489,6 +498,11 @@ std::pair GNet::ClientImp::peerAddress() const
return s().getPeerAddress() ;
}
+std::string GNet::ClientImp::peerName() const
+{
+ return m_peer_name ;
+}
+
// ===
void GNet::ClientResolver::resolveCon( bool success , const Address &address ,
diff --git a/src/gnet/gclient.h b/src/gnet/gclient.h
index 3fee42a..5d1fbe1 100644
--- a/src/gnet/gclient.h
+++ b/src/gnet/gclient.h
@@ -89,13 +89,17 @@ public:
// Destructor.
virtual std::pair localAddress() const ;
- // Returns the local address.
+ // Override from Connection. Returns the local address.
// Pair.first is false on error.
virtual std::pair peerAddress() const ;
- // Returns the peer address.
+ // Override from Connection. Returns the peer address.
// Pair.first is false on error.
+ std::string peerName() const ;
+ // Returns the peer's canonical name if available.
+ // Returns the empty string if not.
+
protected:
friend class ClientImp ;
diff --git a/src/gnet/gevent.cpp b/src/gnet/gevent.cpp
index 265b36b..9245a68 100644
--- a/src/gnet/gevent.cpp
+++ b/src/gnet/gevent.cpp
@@ -83,7 +83,8 @@ GNet::EventHandlerList::EventHandlerList( std::string type ) :
//static
bool GNet::EventHandlerList::contains( const EventHandlerListImp & list , Descriptor fd )
{
- for( List::const_iterator p = list.begin() ; p != list.end() ; ++p )
+ const List::const_iterator end = list.end() ;
+ for( List::const_iterator p = list.begin() ; p != end ; ++p )
{
if( (*p).m_fd == fd )
return true ;
@@ -153,7 +154,8 @@ void GNet::EventHandlerList::remove( Descriptor fd )
GNet::EventHandler * GNet::EventHandlerList::find( Descriptor fd )
{
- for( List::iterator p = m_list.begin() ; p != m_list.end() ; ++p )
+ const List::iterator end = m_list.end() ;
+ for( List::iterator p = m_list.begin() ; p != end ; ++p )
{
if( (*p).m_fd == fd )
return (*p).m_handler ;
@@ -162,30 +164,6 @@ GNet::EventHandler * GNet::EventHandlerList::find( Descriptor fd )
return NULL ;
}
-GNet::EventHandlerList::Iterator GNet::EventHandlerList::begin() const
-{
- return m_list.begin() ;
-}
-
-GNet::EventHandlerList::Iterator GNet::EventHandlerList::end() const
-{
- return m_list.end() ;
-}
-
-//static
-GNet::Descriptor GNet::EventHandlerList::fd( Iterator i )
-{
- return (*i).m_fd ;
-}
-
-//static
-GNet::EventHandler & GNet::EventHandlerList::handler( Iterator i )
-{
- EventHandler * p = (*i).m_handler ;
- G_ASSERT( p != NULL ) ;
- return *p ;
-}
-
void GNet::EventHandlerList::lock()
{
m_lock++ ;
diff --git a/src/gnet/gevent.h b/src/gnet/gevent.h
index 2efa1ac..47ee02a 100644
--- a/src/gnet/gevent.h
+++ b/src/gnet/gevent.h
@@ -26,6 +26,7 @@
#include "gdef.h"
#include "gnet.h"
+#include "gdatetime.h"
#include "gdescriptor.h"
#include
#include
@@ -55,9 +56,20 @@ class GNet::EventHandler
{
public:
virtual ~EventHandler() ;
- virtual void readEvent() /*=0*/ ;
- virtual void writeEvent() /*=0*/ ;
- virtual void exceptionEvent() /*=0*/ ;
+ // Destructor.
+
+ virtual void readEvent() ;
+ // Called for a read event. The default
+ // implementation does nothing.
+
+ virtual void writeEvent() ;
+ // Called for a write event. The default
+ // implementation does nothing.
+
+ virtual void exceptionEvent() ;
+ // Called for an exception event. The default
+ // implementation does nothing.
+
private:
void operator=( const EventHandler & ) ; // not implemented
} ;
@@ -80,9 +92,6 @@ private:
//
class GNet::EventSources
{
-private:
- static EventSources *m_this ;
-
protected:
EventSources() ;
// Constructor.
@@ -139,6 +148,17 @@ public:
// Removes the given event source descriptor
// from the list of exception sources.
// See also Socket::dropExceptionHandler().
+
+ virtual void setTimeout( G::DateTime::EpochTime t ) = 0 ;
+ // Used by GNet::TimerList. Sets the time at which
+ // TimerList::doTimeouts() is to be called.
+ // A parameter of zero is used to cancel the
+ // timer. Some concrete implementations of this
+ // interface may use TimerList::interval()
+ // rather than setTimeout()/doTimeouts().
+
+private:
+ static EventSources * m_this ;
} ;
@@ -152,10 +172,16 @@ public:
Descriptor m_fd ;
EventHandler * m_handler ;
EventHandlerListItem( Descriptor fd = Descriptor__invalid() ,
- EventHandler * handler = NULL ) :
- m_fd(fd) , m_handler(handler) {}
+ EventHandler * handler = NULL ) ;
} ;
+inline
+GNet::EventHandlerListItem::EventHandlerListItem( Descriptor fd , EventHandler * handler ) :
+ m_fd(fd) ,
+ m_handler(handler)
+{
+}
+
namespace GNet
{
typedef std::list< EventHandlerListItem GAllocator(EventHandlerListItem) >
@@ -164,7 +190,7 @@ namespace GNet
// Class: GNet::EventHandlerList
// Description: A class which can be used in the implemention
-// of classes derived from GEventSources.
+// of classes derived from GNet::EventSources.
//
class GNet::EventHandlerList
{
@@ -231,6 +257,31 @@ private:
bool m_copied ;
} ;
+inline
+GNet::EventHandlerList::Iterator GNet::EventHandlerList::begin() const
+{
+ return m_list.begin() ;
+}
+
+inline
+GNet::EventHandlerList::Iterator GNet::EventHandlerList::end() const
+{
+ return m_list.end() ;
+}
+
+//static
+inline
+GNet::Descriptor GNet::EventHandlerList::fd( Iterator i )
+{
+ return (*i).m_fd ;
+}
+
+//static
+inline
+GNet::EventHandler & GNet::EventHandlerList::handler( Iterator i )
+{
+ return *((*i).m_handler) ;
+}
#endif
diff --git a/src/gnet/glocal_unix.cpp b/src/gnet/glocal_unix.cpp
index bb03e83..d44d673 100644
--- a/src/gnet/glocal_unix.cpp
+++ b/src/gnet/glocal_unix.cpp
@@ -51,8 +51,8 @@ std::string GNet::Local::domainname()
if( pos == std::string::npos )
throw Error( "invalid fqdn" ) ;
- G_DEBUG( "GNet::Local::domainname: \"" << full.substr(0U,pos) << "\"" ) ;
- return full.substr( 0U , pos ) ;
+ G_DEBUG( "GNet::Local::domainname: \"" << full.substr(pos+1U) << "\"" ) ;
+ return full.substr( pos+1U ) ;
}
GNet::Address GNet::Local::canonicalAddress()
diff --git a/src/gnet/glocal_win32.cpp b/src/gnet/glocal_win32.cpp
index 18eb57d..5ae12cd 100644
--- a/src/gnet/glocal_win32.cpp
+++ b/src/gnet/glocal_win32.cpp
@@ -43,6 +43,7 @@ std::string GNet::Local::domainname()
size_t pos = full.find( '.' ) ;
if( pos == std::string::npos )
throw Error( std::stringstream() << "invalid fqdn: no dots in \"" << full << "\"" ) ;
+
return full.substr(pos+1U) ;
}
@@ -85,6 +86,13 @@ std::string GNet::Local::fqdn()
throw Error( std::stringstream() << "resolve: " << rc.second ) ;
result = rc.first.canonical_name ;
+
+ size_t pos = result.find( '.' ) ;
+ if( pos == std::string::npos )
+ {
+ G_WARNING( "GNet::Local: no valid domain in \"" << result << "\": defaulting to \".local\"" ) ;
+ result.append( ".local" ) ;
+ }
}
return result ;
}
diff --git a/src/gnet/gmonitor.cpp b/src/gnet/gmonitor.cpp
index d563113..91bc36b 100644
--- a/src/gnet/gmonitor.cpp
+++ b/src/gnet/gmonitor.cpp
@@ -27,6 +27,9 @@
#include "gassert.h"
#include
+// Class: GNet::MontiorImp
+// Description: A pimple pattern implementation class for GNet::Monitor.
+//
class GNet::MonitorImp
{
public:
diff --git a/src/gnet/grequest.cpp b/src/gnet/grequest.cpp
index c28f3bf..49ecff8 100644
--- a/src/gnet/grequest.cpp
+++ b/src/gnet/grequest.cpp
@@ -160,6 +160,21 @@ GNet::Address GNet::HostRequest::result() const
}
}
+std::string GNet::HostRequest::fqdn() const
+{
+ G_ASSERT( m_done && m_handle == 0 ) ;
+ if( m_numeric )
+ {
+ return std::string() ;
+ }
+ else
+ {
+ const hostent *h = reinterpret_cast(m_buffer) ;
+ G_ASSERT( h != NULL && h->h_name != NULL ) ;
+ return std::string( h->h_name ) ;
+ }
+}
+
// SERVICE...
GNet::ServiceRequest::ServiceRequest( std::string service_name , bool udp , HWND hwnd , unsigned msg ) :
diff --git a/src/gnet/grequest.h b/src/gnet/grequest.h
index 2024628..c98060e 100644
--- a/src/gnet/grequest.h
+++ b/src/gnet/grequest.h
@@ -38,7 +38,8 @@ namespace GNet
// Class: GNet::Request
// Description: A base class for making
-// asynchronous DNS requests.
+// asynchronous DNS requests under Windows.
+// See also: WSAAsyncGetHostByName()
//
class GNet::Request
{
@@ -56,7 +57,9 @@ protected:
protected:
explicit Request( bool host ) ;
// Constructor. Derived class constructors
- // should issue the appropriate request.
+ // should issue the appropriate WSAAsync..()
+ // request, with m_buffer[] given as the
+ // result buffer.
public:
virtual ~Request() ;
@@ -90,7 +93,14 @@ class GNet::HostRequest : public GNet:: Request
{
public:
HostRequest( std::string host_name , HWND hwnd , unsigned msg ) ;
- Address result() const ; // zero port
+ // Constructor.
+
+ Address result() const ;
+ // Returns the resolved address with a zero port number.
+
+ std::string fqdn() const ;
+ // Returns the fully-qualified canonical hostname, if
+ // available.
private:
bool numeric( std::string s , Address & address ) ;
@@ -104,8 +114,12 @@ private:
class GNet::ServiceRequest : public GNet:: Request
{
public:
- ServiceRequest( std::string service_name , bool udp , HWND hwnd , unsigned msg ) ;
- Address result() const ; // zero host address
+ ServiceRequest( std::string service_name , bool udp ,
+ HWND hwnd , unsigned msg ) ;
+ // Constructor.
+
+ Address result() const ;
+ // Returns the address with a zeroed host part.
private:
static const char * protocol( bool udp ) ;
diff --git a/src/gnet/gresolve.h b/src/gnet/gresolve.h
index a54d3c6..570f5cc 100644
--- a/src/gnet/gresolve.h
+++ b/src/gnet/gresolve.h
@@ -74,8 +74,8 @@ public:
// A zero-length host_name defaults to "0.0.0.0". A
// zero-length service name defaults to "0".
- virtual void resolveCon( bool success, const Address &address,
- std::string failure_reason ) ;
+ virtual void resolveCon( bool success, const Address & address ,
+ std::string fqdn_or_failure_reason ) ;
// Called when the resolution process is complete.
// This function is never called from within
// resolveReq().
diff --git a/src/gnet/gresolve_unix.cpp b/src/gnet/gresolve_unix.cpp
index 8265e11..37d7a72 100644
--- a/src/gnet/gresolve_unix.cpp
+++ b/src/gnet/gresolve_unix.cpp
@@ -59,9 +59,9 @@ private:
// ===
GNet::ResolverImp::ResolverImp( Resolver & resolver , unsigned int port ) :
- m_s(NULL) ,
+ m_address(Address::localhost(port)) ,
m_outer(resolver) ,
- m_address(Address::localhost(port))
+ m_s(NULL)
{
}
@@ -131,10 +131,14 @@ void GNet::ResolverImp::readEvent()
{
std::string result( buffer , rc ) ;
G_DEBUG( "GNet::ResolverImp::readEvent: \"" << result << "\"" ) ;
- G::Str::trimRight( result , " \n" ) ;
- if( Address::validString(result) )
+ G::Str::trim( result , " \n" ) ;
+ size_t pos = result.find( ' ' ) ;
+ std::string head = pos == std::string::npos ? result : result.substr(0U,pos) ;
+ std::string tail = pos == std::string::npos ? std::string() : result.substr(pos+1U) ;
+ if( Address::validString(head) )
{
- m_outer.resolveCon( true , Address(result) , "" ) ;
+ G::Str::trim( tail , " \n" ) ;
+ m_outer.resolveCon( true , Address(result) , tail ) ;
}
else
{
diff --git a/src/gnet/gresolve_win32.cpp b/src/gnet/gresolve_win32.cpp
index 328c92e..c59f273 100644
--- a/src/gnet/gresolve_win32.cpp
+++ b/src/gnet/gresolve_win32.cpp
@@ -45,6 +45,7 @@ private:
bool m_udp ;
Address m_result ;
+ std::string m_fqdn ;
public:
explicit ResolverImp( Resolver & resolver ) ;
@@ -59,11 +60,9 @@ private:
ResolverImp( const ResolverImp & ) ;
const char *errorString( bool host_error , int error ) ;
void cleanup() ;
- void saveHost( const Address &address ) ;
+ void saveHost( const Address &address , const std::string & fqdn ) ;
void saveService( const Address &address ) ;
-
-protected:
- LRESULT onUser( WPARAM wparam , LPARAM lparam ) ;
+ virtual LRESULT onUser( WPARAM wparam , LPARAM lparam ) ;
} ;
// ===
@@ -97,7 +96,7 @@ bool GNet::ResolverImp::resolveReq( std::string host_part, std::string service_p
m_service = service_part ;
m_udp = udp ;
- m_host_request = new HostRequest( host_part , handle() , WM_USER ) ;
+ m_host_request = new HostRequest( host_part , handle() , Cracker::wm_user() ) ;
if( !m_host_request->valid() )
{
std::string reason = m_host_request->reason() ; // not used
@@ -129,9 +128,10 @@ bool GNet::ResolverImp::busy() const
m_host_request != NULL ;
}
-void GNet::ResolverImp::saveHost( const Address & address )
+void GNet::ResolverImp::saveHost( const Address & address , const std::string & fqdn )
{
m_result = address ;
+ m_fqdn = fqdn ;
}
void GNet::ResolverImp::saveService( const Address & address )
@@ -148,10 +148,10 @@ LRESULT GNet::ResolverImp::onUser( WPARAM wparam , LPARAM lparam )
{
if( m_host_request->onMessage( wparam , lparam ) )
{
- saveHost( m_host_request->result() ) ;
+ saveHost( m_host_request->result() , m_host_request->fqdn() ) ;
cleanup() ;
- m_service_request = new ServiceRequest( m_service , m_udp , handle() , WM_USER ) ;
+ m_service_request = new ServiceRequest( m_service , m_udp , handle() , Cracker::wm_user() ) ;
if( !m_service_request->valid() )
{
std::string reason = m_service_request->reason() ;
@@ -173,7 +173,7 @@ LRESULT GNet::ResolverImp::onUser( WPARAM wparam , LPARAM lparam )
saveService( m_service_request->result() ) ;
Address address( m_result ) ;
cleanup() ;
- m_if.resolveCon( true , address , std::string() ) ; // success
+ m_if.resolveCon( true , address , m_fqdn ) ; // success
}
else
{
diff --git a/src/gnet/gselect.cpp b/src/gnet/gselect.cpp
index 6432dae..b745feb 100644
--- a/src/gnet/gselect.cpp
+++ b/src/gnet/gselect.cpp
@@ -23,10 +23,14 @@
#include "gdef.h"
#include "gselect.h"
+#include "gstr.h"
+#include "gtimer.h"
#include "gdebug.h"
#include
#include
+typedef struct timeval Timeval ; // std:: ??
+
namespace GNet
{
class Lock ;
@@ -83,7 +87,8 @@ GNet::Lock::~Lock()
int GNet::FdSet::init( int n , fd_set * set , const EventHandlerList & list )
{
FD_ZERO( set ) ;
- for( EventHandlerList::Iterator p = list.begin() ; p != list.end() ; ++p )
+ const EventHandlerList::Iterator end = list.end() ;
+ for( EventHandlerList::Iterator p = list.begin() ; p != end ; ++p )
{
Descriptor fd = EventHandlerList::fd( p ) ;
FD_SET( fd , set ) ;
@@ -95,15 +100,16 @@ int GNet::FdSet::init( int n , fd_set * set , const EventHandlerList & list )
//static
void GNet::FdSet::raiseEvents( fd_set * set , EventHandlerList & list ,
- void (EventHandler::*method)() , const char * type )
+ void (EventHandler::*method)() , const char * /*type*/ )
{
- GNet::Lock lock( list ) ;
- for( EventHandlerList::Iterator p = list.begin() ; p != list.end() ; ++p )
+ GNet::Lock lock( list ) ; // since event handlers may change the list while we iterate
+ const EventHandlerList::Iterator end = list.end() ;
+ for( EventHandlerList::Iterator p = list.begin() ; p != end ; ++p )
{
Descriptor fd = EventHandlerList::fd( p ) ;
if( FD_ISSET( fd , set ) )
{
- G_DEBUG( "raiseEvents: " << type << " event on fd " << fd ) ;
+ //G_DEBUG( "raiseEvents: " << type << " event on fd " << fd ) ;
EventHandler & h = EventHandlerList::handler( p ) ;
(h.*method)() ;
}
@@ -113,10 +119,10 @@ void GNet::FdSet::raiseEvents( fd_set * set , EventHandlerList & list ,
// ===
GNet::Select::Select() :
+ m_quit(false) ,
m_read_list(std::string("read")) ,
m_write_list(std::string("write")) ,
- m_exception_list(std::string("exception")) ,
- m_quit(false)
+ m_exception_list(std::string("exception"))
{
}
@@ -150,22 +156,40 @@ void GNet::Select::runOnce()
fd_set w ; n = FdSet::init( n , &w , m_write_list ) ;
fd_set e ; n = FdSet::init( n , &e , m_exception_list ) ;
- struct timeval * const infinite = NULL ;
+ Timeval timeout ;
+ Timeval * timeout_p = NULL ;
+ if( TimerList::instance(TimerList::NoThrow()) != NULL )
+ {
+ bool infinite = false ;
+ timeout.tv_sec = TimerList::instance().interval( infinite ) ;
+ timeout.tv_usec = 0 ; // micro seconds
+ timeout_p = infinite ? NULL : &timeout ;
+ }
- G_DEBUG( "GNet::Select::runOnce: selecting: fd(max) = " << (n-1) << ": "
- << "read-list=\"" << m_read_list.asString() << "\": "
- << "write-list=\"" << m_write_list.asString() << "\": "
- << "exception-list=\"" << m_exception_list.asString() << "\"" ) ;
+ const bool debug = false ;
+ if( debug )
+ {
+ G_DEBUG( "GNet::Select::runOnce: selecting: fd(max) = " << (n-1) << ": "
+ << "read-list=\"" << m_read_list.asString() << "\": "
+ << "write-list=\"" << m_write_list.asString() << "\": "
+ << "exception-list=\"" << m_exception_list.asString() << "\": "
+ << "timeout=" << (timeout_p?G::Str::fromUInt(timeout_p->tv_sec):std::string("infinite")) ) ;
+ }
- int rc = ::select( n , &r , &w , &e , infinite ) ;
- if( rc > 0 )
+ int rc = ::select( n , &r , &w , &e , timeout_p ) ;
+ if( rc == 0 )
+ {
+ G_DEBUG( "GNet::Select::runOnce: select() timeout" ) ;
+ TimerList::instance().doTimeouts() ;
+ }
+ else if( rc > 0 )
{
G_DEBUG( "GNet::Select::runOnce: detected event(s) on " << rc << " fd(s)" ) ;
FdSet::raiseEvents( &r , m_read_list , & EventHandler::readEvent , "read" ) ;
FdSet::raiseEvents( &w , m_write_list , & EventHandler::writeEvent , "write" ) ;
FdSet::raiseEvents( &e , m_exception_list , & EventHandler::exceptionEvent , "exception" ) ;
}
- else if( rc < 0 )
+ else
{
throw Error() ;
}
@@ -201,3 +225,8 @@ void GNet::Select::dropException( Descriptor fd )
m_exception_list.remove( fd ) ;
}
+void GNet::Select::setTimeout( G::DateTime::EpochTime )
+{
+ // not used -- interval() in runOnce() suffices
+}
+
diff --git a/src/gnet/gselect.h b/src/gnet/gselect.h
index 7bd231e..57b1df4 100644
--- a/src/gnet/gselect.h
+++ b/src/gnet/gselect.h
@@ -79,6 +79,7 @@ private:
Select( const Select & ) ;
void operator=( const Select & ) ;
void runOnce() ;
+ virtual void setTimeout( G::DateTime::EpochTime t ) ;
private:
bool m_quit ;
diff --git a/src/gnet/gserver.cpp b/src/gnet/gserver.cpp
index 4349f5a..b45852f 100644
--- a/src/gnet/gserver.cpp
+++ b/src/gnet/gserver.cpp
@@ -27,11 +27,12 @@
#include "gmonitor.h"
#include "gdebug.h"
#include "gassert.h"
+#include "gmemory.h"
GNet::ServerPeer::ServerPeer( StreamSocket * s , Address a ) :
- m_socket(s) ,
+ m_ref_count(1U) ,
m_address(a) ,
- m_ref_count(1U)
+ m_socket(s)
{
G_ASSERT( m_socket != NULL ) ;
G_DEBUG( "GNet::ServerPeer::ctor: fd " << m_socket->asString() << ": " << m_address.displayString() ) ;
@@ -121,32 +122,31 @@ std::pair GNet::ServerPeer::peerAddress() const
// ===
-GNet::Server::Server( unsigned int listening_port ) :
- m_socket(NULL)
+GNet::Server::Server( unsigned int listening_port )
{
- try
- {
- init( listening_port ) ;
- }
- catch(...)
- {
- delete m_socket ;
- throw ;
- }
+ init( listening_port ) ;
}
-GNet::Server::Server() :
- m_socket(NULL)
+GNet::Server::Server( const Address & listening_address )
+{
+ init( listening_address ) ;
+}
+
+GNet::Server::Server()
{
}
void GNet::Server::init( unsigned int listening_port )
{
- m_socket = new StreamSocket ;
- G_DEBUG( "GNet::Server::init: " << (void*)this << ": listening on port " << listening_port ) ;
- Address local_address( listening_port ) ;
- if( ! m_socket->bind( local_address ) )
- throw CannotBind( local_address.displayString() ) ;
+ init( Address(listening_port) ) ;
+}
+
+void GNet::Server::init( const Address & listening_address )
+{
+ m_socket <<= new StreamSocket ;
+ G_DEBUG( "GNet::Server::init: listening on " << listening_address.displayString() ) ;
+ if( ! m_socket->bind( listening_address ) )
+ throw CannotBind( listening_address.displayString() ) ;
if( ! m_socket->listen() )
throw CannotListen() ;
m_socket->addReadHandler( *this ) ;
@@ -154,7 +154,6 @@ void GNet::Server::init( unsigned int listening_port )
GNet::Server::~Server()
{
- delete m_socket ;
}
void GNet::Server::readEvent()
@@ -162,7 +161,7 @@ void GNet::Server::readEvent()
// read-event-on-listening-port => new connection to accept
G_DEBUG( "GNet::Server::readEvent: " << (void*)this ) ;
- G_ASSERT( m_socket != NULL ) ;
+ G_ASSERT( m_socket.get() != NULL ) ;
AcceptPair pair = m_socket->accept() ;
if( pair.first.get() == NULL )
{
diff --git a/src/gnet/gserver.h b/src/gnet/gserver.h
index cb07221..a804533 100644
--- a/src/gnet/gserver.h
+++ b/src/gnet/gserver.h
@@ -31,6 +31,7 @@
#include "gselect.h"
#include "gevent.h"
#include
+#include
#include
namespace GNet
@@ -52,8 +53,12 @@ public:
G_EXCEPTION( CannotListen , "cannot listen" ) ;
explicit Server( unsigned int listening_port ) ;
- // Constructor. Throws exceptions on
- // error.
+ // Constructor taking a port number. The server
+ // listens on all local interfaces.
+
+ explicit Server( const Address & listening_address ) ;
+ // Constructor. The server listens only on the
+ // specific (local) interface.
Server() ;
// Default constructor. Initialise with init().
@@ -61,6 +66,9 @@ public:
void init( unsigned int listening_port ) ;
// Iniailisation after default construction.
+ void init( const Address & listening_address ) ;
+ // Iniailisation after default construction.
+
virtual ~Server() ;
// Destructor.
@@ -90,7 +98,7 @@ private:
virtual void exceptionEvent() ; // from EventHandler
private:
- StreamSocket * m_socket ;
+ std::auto_ptr m_socket ;
} ;
// Class: GNet::ServerPeer
diff --git a/src/gnet/gsocket.cpp b/src/gnet/gsocket.cpp
index b017c21..9f1f460 100644
--- a/src/gnet/gsocket.cpp
+++ b/src/gnet/gsocket.cpp
@@ -57,8 +57,8 @@ bool GNet::Socket::open( int domain, int type, int protocol )
}
GNet::Socket::Socket( Descriptor s ) :
- m_socket(s) ,
- m_reason( 0 )
+ m_reason(0) ,
+ m_socket(s)
{
;
}
@@ -168,7 +168,7 @@ ssize_t GNet::Socket::write( const char *buf, size_t len )
G_DEBUG( "GNet::Socket::write: write error " << m_reason ) ;
return -1 ;
}
- else if( nsent < len )
+ else if( nsent < 0 || static_cast(nsent) < len )
{
m_reason = reason() ;
}
@@ -183,7 +183,7 @@ void GNet::Socket::setNoLinger()
options.l_onoff = 0 ;
options.l_linger = 0 ;
socklen_t sizeof_options = sizeof(options) ;
- (void)setsockopt( m_socket , SOL_SOCKET , SO_LINGER ,
+ (void)::setsockopt( m_socket , SOL_SOCKET , SO_LINGER ,
(char*)&options , sizeof_options ) ;
}
diff --git a/src/gnet/gtimer.cpp b/src/gnet/gtimer.cpp
new file mode 100644
index 0000000..0e1b1b5
--- /dev/null
+++ b/src/gnet/gtimer.cpp
@@ -0,0 +1,230 @@
+//
+// Copyright (C) 2001 Graeme Walker
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gtimer.cpp
+//
+
+#include "gdef.h"
+#include "gtimer.h"
+#include "gevent.h"
+#include "gdebug.h"
+
+namespace GNet
+{
+ class TimerUpdate ;
+} ;
+
+// Class: GNet::TimerUpdate
+// Description: A private implementation class used by GNet::Timer.
+//
+class GNet::TimerUpdate
+{
+public:
+ TimerUpdate( Timer & , const std::string & ) ;
+ ~TimerUpdate() ;
+private:
+ TimerUpdate( const TimerUpdate & ) ; // not implemented
+ void operator=( const TimerUpdate & ) ; // not implemented
+private:
+ Timer & m_timer ;
+ std::string m_type ;
+ G::DateTime::EpochTime m_soonest ;
+} ;
+
+// ===
+
+GNet::TimeoutHandler::~TimeoutHandler()
+{
+}
+
+// ===
+
+GNet::Timer::Timer( TimeoutHandler & handler ) :
+ m_time(0UL) ,
+ m_handler(&handler)
+{
+ TimerUpdate update( *this , "ctor" ) ;
+ TimerList::instance().add( *this ) ;
+}
+
+GNet::Timer::Timer() :
+ m_time(0UL) ,
+ m_handler(NULL)
+{
+ TimerUpdate update( *this , "ctor" ) ;
+ TimerList::instance().add( *this ) ;
+}
+
+GNet::Timer::~Timer()
+{
+ try
+ {
+ TimerUpdate update( *this , "dtor" ) ;
+ TimerList::instance().remove( *this ) ;
+ }
+ catch(...)
+ {
+ }
+}
+
+void GNet::Timer::startTimer( unsigned int time )
+{
+ TimerUpdate update( *this , "start" ) ;
+ m_time = G::DateTime::now() + time ;
+}
+
+void GNet::Timer::cancelTimer()
+{
+ TimerUpdate update( *this , "cancel" ) ;
+ m_time = 0U ;
+}
+
+void GNet::Timer::doTimeout()
+{
+ if( m_time != 0U )
+ {
+ m_time = 0U ;
+ G_DEBUG( "GNet::Timer::doTimeout" ) ;
+ onTimeout() ;
+ if( m_handler != NULL )
+ m_handler->onTimeout(*this) ;
+ }
+}
+
+void GNet::Timer::onTimeout()
+{
+ // no-op
+}
+
+G::DateTime::EpochTime GNet::Timer::t() const
+{
+ return m_time ;
+}
+
+// ===
+
+GNet::TimerList * GNet::TimerList::m_this = NULL ;
+
+GNet::TimerList::TimerList()
+{
+ if( m_this == NULL )
+ m_this = this ;
+}
+
+GNet::TimerList::~TimerList()
+{
+ if( m_this == this )
+ m_this = NULL ;
+}
+
+void GNet::TimerList::add( Timer & t )
+{
+ m_set.insert( &t ) ;
+}
+
+void GNet::TimerList::remove( Timer & t )
+{
+ m_set.erase( &t ) ;
+}
+
+void GNet::TimerList::update( G::DateTime::EpochTime t_old ,
+ const std::string & op )
+{
+ G::DateTime::EpochTime t_new = soonest() ;
+ G_DEBUG( "GNet::TimerList::update: " << op << ": " << t_old << " -> " << t_new ) ;
+ (void) op.length() ; // pacify the compiler
+ if( t_old != t_new )
+ {
+ EventSources::instance().setTimeout( t_new ) ;
+ }
+}
+
+G::DateTime::EpochTime GNet::TimerList::soonest() const
+{
+ G::DateTime::EpochTime result = 0U ;
+ const Set::const_iterator end = m_set.end() ;
+ for( Set::const_iterator p = m_set.begin() ; p != end ; ++p )
+ {
+ if( (*p)->t() != 0UL && ( result == 0U || (*p)->t() < result ) )
+ result = (*p)->t() ;
+ }
+ return result ;
+}
+
+unsigned int GNet::TimerList::interval( bool & infinite ) const
+{
+ G::DateTime::EpochTime then = soonest() ;
+ infinite = then == 0U ;
+ if( infinite )
+ {
+ return 0U ;
+ }
+ else
+ {
+ G::DateTime::EpochTime now = G::DateTime::now() ;
+ return now >= then ? 0U : (then-now) ;
+ }
+}
+
+GNet::TimerList * GNet::TimerList::instance( const NoThrow & )
+{
+ return m_this ;
+}
+
+GNet::TimerList & GNet::TimerList::instance()
+{
+ if( m_this == NULL )
+ throw NoInstance() ;
+
+ return * m_this ;
+}
+
+void GNet::TimerList::doTimeouts()
+{
+ G_DEBUG( "GNet::TimerList::doTimeouts" ) ;
+ G::DateTime::EpochTime now = G::DateTime::now() ;
+ for( Set::iterator p = m_set.begin() ; p != m_set.end() ; ++p )
+ {
+ if( now >= (*p)->t() )
+ (*p)->doTimeout() ;
+ }
+ EventSources::instance().setTimeout( soonest() ) ;
+}
+
+// ===
+
+GNet::TimerUpdate::TimerUpdate( Timer & timer , const std::string & type ) :
+ m_timer(timer) ,
+ m_type(type)
+{
+ m_soonest = TimerList::instance().soonest() ;
+}
+
+GNet::TimerUpdate::~TimerUpdate()
+{
+ try
+ {
+ TimerList::instance().update( m_soonest , m_type ) ;
+ }
+ catch(...)
+ {
+ }
+}
+
diff --git a/src/gnet/gtimer.h b/src/gnet/gtimer.h
new file mode 100644
index 0000000..f6e5a25
--- /dev/null
+++ b/src/gnet/gtimer.h
@@ -0,0 +1,156 @@
+//
+// Copyright (C) 2001 Graeme Walker
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gtimer.h
+//
+
+#ifndef G_NET_TIMER_H
+#define G_NET_TIMER_H
+
+#include "gdef.h"
+#include "gnet.h"
+#include "gdatetime.h"
+#include "gexception.h"
+#include
+
+namespace GNet
+{
+ class Timer ;
+ class TimeoutHandler ;
+ class TimerList ;
+} ;
+
+// Class: GNet::TimeoutHandler
+// Description: An interface used by GNet::Timer.
+//
+class GNet::TimeoutHandler
+{
+public:
+ virtual ~TimeoutHandler() ;
+ // Destructor.
+
+ virtual void onTimeout( Timer & ) = 0 ;
+ // Called when the associated timer
+ // expires.
+
+private:
+ void operator=( const TimeoutHandler & ) ; // not implemented
+} ;
+
+// Class: GNet::Timer
+// Description: A timer class.
+//
+class GNet::Timer
+{
+public:
+ explicit Timer( TimeoutHandler & handler ) ;
+ // Constructor.
+
+ Timer() ;
+ // Default constructor.
+
+ virtual ~Timer() ;
+ // Destructor.
+
+ void startTimer( unsigned int time ) ;
+ // Starts the timer.
+
+ void cancelTimer() ;
+ // Cancels the timer.
+
+protected:
+ virtual void onTimeout() ;
+ // Called when the timer expires (or soon
+ // after).
+private:
+ Timer( const Timer & ) ; // not implemented
+ void operator=( const Timer & ) ; // not implemented
+
+private:
+ friend class TimerList ;
+ void doTimeout() ; // called by friendly TimerList
+ G::DateTime::EpochTime t() const ; // called by friendly TimerList
+
+private:
+ G::DateTime::EpochTime m_time ;
+ TimeoutHandler * m_handler ;
+} ;
+
+// Class: GNet::TimerList
+// Description: A singleton which maintains a list of all Timer
+// objects, and interfaces to the event loop on their behalf.
+//
+class GNet::TimerList
+{
+public:
+ G_EXCEPTION( NoInstance , "no TimerList instance" ) ;
+ class NoThrow // Overload discriminator class for TimerList.
+ {} ;
+
+ TimerList() ;
+ // Default constructor.
+
+ ~TimerList() ;
+ // Destructor.
+
+ void add( Timer & ) ;
+ // Adds a timer. Used by Timer::Timer().
+
+ void remove( Timer & ) ;
+ // Removes a timer from the list.
+ // Used by Timer::~Timer().
+
+ void update( G::DateTime::EpochTime previous_soonest ,
+ const std::string & why ) ;
+ // Called when one of the list's timers
+ // has changed.
+
+ G::DateTime::EpochTime soonest() const ;
+ // Returns the time of the first timer to expire,
+ // or zero if none.
+
+ unsigned int interval( bool & infinite ) const ;
+ // Returns the interval to the next
+ // timer expiry. The 'infinite' value is
+ // set to true if there are no timers
+ // running.
+
+ void doTimeouts() ;
+ // Triggers the timeout callbacks of any expired
+ // timers. Called by the event loop (GNet::EventSources).
+
+ static TimerList * instance( const NoThrow & ) ;
+ // Singleton access. Returns NULL if none.
+
+ static TimerList & instance() ;
+ // Singleton access. Throws an exception if none.
+
+private:
+ TimerList( const TimerList & ) ; // not implemented
+ void operator=( const TimerList & ) ; // not implemented
+
+private:
+ static TimerList * m_this ;
+ typedef std::set Set ;
+ Set m_set ;
+} ;
+
+
+#endif
diff --git a/src/gnet/gwinsock.cpp b/src/gnet/gwinsock.cpp
index 19441b3..1313d2c 100644
--- a/src/gnet/gwinsock.cpp
+++ b/src/gnet/gwinsock.cpp
@@ -27,6 +27,8 @@
#include "gappinst.h"
#include "gwinhid.h"
#include "gwinsock.h"
+#include "gexception.h"
+#include "gtimer.h"
#include "gassert.h"
#include "gdebug.h"
#include "glog.h"
@@ -45,7 +47,8 @@ class GNet::WinsockWindow : public GGui::WindowHidden
public:
WinsockWindow( Winsock & ws , HINSTANCE h ) ;
private:
- virtual LRESULT onUser( WPARAM , LPARAM ) ;
+ virtual void onWinsock( WPARAM , LPARAM ) ;
+ virtual void onTimer( unsigned int ) ;
Winsock & m_ws ;
} ;
@@ -55,11 +58,15 @@ GNet::WinsockWindow::WinsockWindow( Winsock & ws , HINSTANCE hinstance ) :
{
}
-// (wm_winsock is WM_USER -- should be called onWinsock())
-LRESULT GNet::WinsockWindow::onUser( WPARAM w , LPARAM l )
+void GNet::WinsockWindow::onWinsock( WPARAM w , LPARAM l )
{
m_ws.onMessage( w , l ) ;
- return 0 ;
+}
+
+void GNet::WinsockWindow::onTimer( unsigned int timer_id )
+{
+ G_DEBUG( "GNet::WinsockWindow::onTimer: " << timer_id ) ;
+ m_ws.onTimer() ;
}
// ===
@@ -71,7 +78,8 @@ GNet::Winsock::Winsock() :
m_exception_list("exception") ,
m_success(false) ,
m_hwnd(0) ,
- m_msg(0)
+ m_msg(0) ,
+ m_timer_id(1U)
{
}
@@ -95,13 +103,14 @@ bool GNet::Winsock::init()
G_WARNING( "GNet::Winsock::init: cannot create hidden window" ) ;
return false ;
}
- return attach( m_window->handle() , GGui::Cracker::wm_winsock() ) ;
+ return attach( m_window->handle() , GGui::Cracker::wm_winsock() , 1U ) ;
}
-bool GNet::Winsock::attach( HWND hwnd , unsigned msg )
+bool GNet::Winsock::attach( HWND hwnd , unsigned msg , unsigned int timer_id )
{
m_hwnd = hwnd ;
m_msg = msg ;
+ m_timer_id = timer_id ;
WSADATA info ;
WORD version = MAKEWORD( 1 , 1 ) ;
@@ -248,6 +257,36 @@ void GNet::Winsock::onMessage( WPARAM wparam , LPARAM lparam )
}
}
+void GNet::Winsock::onTimer()
+{
+ G_DEBUG( "GNet::Winsock::onTimer" ) ;
+ ::KillTimer( m_hwnd , m_timer_id ) ; // since periodic
+ TimerList::instance().doTimeouts() ;
+}
+
+void GNet::Winsock::setTimeout( G::DateTime::EpochTime t )
+{
+ G_DEBUG( "GNet::Winsock::setTimeout: " << t ) ;
+ if( t != 0U )
+ {
+ G::DateTime::EpochTime now = G::DateTime::now() ;
+ unsigned int interval = t > now ? (t - now) : 0U ;
+ unsigned long ms = interval ;
+ ms *= 1000UL ;
+ G_DEBUG( "GNet::Winsock::setTimeout: SetTimer(): " << ms << "ms" ) ;
+ ::KillTimer( m_hwnd , m_timer_id ) ;
+ unsigned int rc = ::SetTimer( m_hwnd , m_timer_id , ms , NULL ) ;
+ if( rc == 0U )
+ throw G::Exception( "GNet::Winsock: SetTimer() failure" ) ;
+ G_ASSERT( rc == m_timer_id ) ;
+ }
+ else
+ {
+ G_DEBUG( "GNet::Winsock::setTimeout: KillTimer()" ) ;
+ ::KillTimer( m_hwnd , m_timer_id ) ;
+ }
+}
+
void GNet::Winsock::run()
{
GGui::Pump::run() ;
diff --git a/src/gnet/gwinsock.h b/src/gnet/gwinsock.h
index 623cfbc..0c70575 100644
--- a/src/gnet/gwinsock.h
+++ b/src/gnet/gwinsock.h
@@ -59,8 +59,11 @@ public:
// WinSock library, passing it the handle
// of an internally-created hidden window.
// Returns false on error.
+ //
+ // Use either init() for an internally-created
+ // window, or attach().
- bool attach( HWND hwnd , unsigned int msg ) ;
+ bool attach( HWND hwnd , unsigned int msg , unsigned int timer_id = 0U ) ;
// Initialises the WinSock library, passing
// it the specified window handle and
// message number. WinSock events are sent
@@ -68,6 +71,10 @@ public:
//
// For simple, synchronous programs
// the window handle may be zero.
+ //
+ // Use either init() or attach().
+ //
+ // See also onMessage() and onTimer().
std::string reason() const ;
// Returns the reason for initialisation
@@ -83,9 +90,13 @@ public:
// if this is the last Winsock object.
void onMessage( WPARAM wparam , LPARAM lparam ) ;
- // To be called on receipt of a window
- // message corresponding to the constructor's
- // 'msg' parameter.
+ // To be called when the attach()ed window
+ // receives a message with a message-id
+ // equal to attach() 'msg' parameter.
+
+ void onTimer() ;
+ // To be called when the attach()ed window
+ // receives a WM_TIMER message.
virtual void run() ;
// Override from EventSources. Calls GGui::Pump::run().
@@ -100,6 +111,7 @@ protected:
virtual void dropRead( Descriptor fd ) ;
virtual void dropWrite( Descriptor fd ) ;
virtual void dropException( Descriptor fd ) ;
+ virtual void setTimeout( G::DateTime::EpochTime ) ;
private:
Winsock( const Winsock & other ) ;
@@ -119,6 +131,7 @@ private:
EventHandlerList m_read_list ;
EventHandlerList m_write_list ;
EventHandlerList m_exception_list ;
+ unsigned int m_timer_id ;
} ;
#endif
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 54393ba..cadd316 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -24,7 +24,7 @@ AM_INSTALL_PROGRAM_FLAGS=-s
# change the local-state directory from .../var to .../var/spool/emailrelay
localstatedir = ${prefix}/var/spool/emailrelay
-EXTRA_DIST=commandline_win32.cpp main_win32.cpp gmessagestore_win32.cpp emailrelay.dsp icon-32.ico icon2.ico icon3.ico empty_file doxygen.cfg emailrelay.rc resource.h
+EXTRA_DIST=commandline_win32.cpp main_win32.cpp gmessagestore_win32.cpp emailrelay.dsp icon-32.ico icon2.ico icon3.ico icon4.ico empty_file doxygen.cfg emailrelay.rc resource.h gsasl_cyrus.cpp
INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet
sbin_PROGRAMS = emailrelay
libexec_PROGRAMS = emailrelay-poke
@@ -32,6 +32,8 @@ localstate_DATA = empty_file
emailrelay_SOURCES = \
gadminserver.cpp \
gadminserver.h \
+ gbase64.cpp \
+ gbase64.h \
gclientprotocol.cpp \
gclientprotocol.h \
gfilestore.cpp \
@@ -49,6 +51,10 @@ emailrelay_SOURCES = \
gprotocolmessageforward.h \
gprotocolmessagestore.cpp \
gprotocolmessagestore.h \
+ gsasl_login.cpp \
+ gsasl.h \
+ gsecrets.cpp \
+ gsecrets.h \
gserverprotocol.cpp \
gserverprotocol.h \
gsmtp.h \
@@ -62,6 +68,8 @@ emailrelay_SOURCES = \
gstoredmessage.h \
gverifier.cpp \
gverifier.h \
+ gxtext.cpp \
+ gxtext.h \
main_unix.cpp \
configuration.cpp \
configuration.h \
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 21ae03b..b1b43fd 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -95,12 +95,12 @@ AM_INSTALL_PROGRAM_FLAGS = -s
# change the local-state directory from .../var to .../var/spool/emailrelay
localstatedir = ${prefix}/var/spool/emailrelay
-EXTRA_DIST = commandline_win32.cpp main_win32.cpp gmessagestore_win32.cpp emailrelay.dsp icon-32.ico icon2.ico icon3.ico empty_file doxygen.cfg emailrelay.rc resource.h
+EXTRA_DIST = commandline_win32.cpp main_win32.cpp gmessagestore_win32.cpp emailrelay.dsp icon-32.ico icon2.ico icon3.ico icon4.ico empty_file doxygen.cfg emailrelay.rc resource.h gsasl_cyrus.cpp
INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet
sbin_PROGRAMS = emailrelay
libexec_PROGRAMS = emailrelay-poke
localstate_DATA = empty_file
-emailrelay_SOURCES = gadminserver.cpp gadminserver.h gclientprotocol.cpp gclientprotocol.h gfilestore.cpp gfilestore.h gmessagestore.cpp gmessagestore.h gmessagestore_unix.cpp gnewfile.cpp gnewfile.h gnewmessage.cpp gnewmessage.h gprotocolmessage.cpp gprotocolmessage.h gprotocolmessageforward.cpp gprotocolmessageforward.h gprotocolmessagestore.cpp gprotocolmessagestore.h gserverprotocol.cpp gserverprotocol.h gsmtp.h gsmtpclient.cpp gsmtpclient.h gsmtpserver.cpp gsmtpserver.h gstoredfile.cpp gstoredfile.h gstoredmessage.cpp gstoredmessage.h gverifier.cpp gverifier.h main_unix.cpp configuration.cpp configuration.h run.cpp run.h commandline.cpp commandline_unix.cpp commandline.h
+emailrelay_SOURCES = gadminserver.cpp gadminserver.h gbase64.cpp gbase64.h gclientprotocol.cpp gclientprotocol.h gfilestore.cpp gfilestore.h gmessagestore.cpp gmessagestore.h gmessagestore_unix.cpp gnewfile.cpp gnewfile.h gnewmessage.cpp gnewmessage.h gprotocolmessage.cpp gprotocolmessage.h gprotocolmessageforward.cpp gprotocolmessageforward.h gprotocolmessagestore.cpp gprotocolmessagestore.h gsasl_login.cpp gsasl.h gsecrets.cpp gsecrets.h gserverprotocol.cpp gserverprotocol.h gsmtp.h gsmtpclient.cpp gsmtpclient.h gsmtpserver.cpp gsmtpserver.h gstoredfile.cpp gstoredfile.h gstoredmessage.cpp gstoredmessage.h gverifier.cpp gverifier.h gxtext.cpp gxtext.h main_unix.cpp configuration.cpp configuration.h run.cpp run.h commandline.cpp commandline_unix.cpp commandline.h
emailrelay_poke_SOURCES = poke.c
emailrelay_LDADD = $(top_builddir)/src/glib/libglib.a $(top_builddir)/src/gnet/libgnet.a
@@ -118,12 +118,13 @@ emailrelay_poke_OBJECTS = poke.o
emailrelay_poke_LDADD = $(LDADD)
emailrelay_poke_DEPENDENCIES =
emailrelay_poke_LDFLAGS =
-emailrelay_OBJECTS = gadminserver.o gclientprotocol.o gfilestore.o \
-gmessagestore.o gmessagestore_unix.o gnewfile.o gnewmessage.o \
-gprotocolmessage.o gprotocolmessageforward.o gprotocolmessagestore.o \
-gserverprotocol.o gsmtpclient.o gsmtpserver.o gstoredfile.o \
-gstoredmessage.o gverifier.o main_unix.o configuration.o run.o \
-commandline.o commandline_unix.o
+emailrelay_OBJECTS = gadminserver.o gbase64.o gclientprotocol.o \
+gfilestore.o gmessagestore.o gmessagestore_unix.o gnewfile.o \
+gnewmessage.o gprotocolmessage.o gprotocolmessageforward.o \
+gprotocolmessagestore.o gsasl_login.o gsecrets.o gserverprotocol.o \
+gsmtpclient.o gsmtpserver.o gstoredfile.o gstoredmessage.o gverifier.o \
+gxtext.o main_unix.o configuration.o run.o commandline.o \
+commandline_unix.o
emailrelay_DEPENDENCIES = $(top_builddir)/src/glib/libglib.a \
$(top_builddir)/src/gnet/libgnet.a
emailrelay_LDFLAGS =
@@ -293,7 +294,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -333,14 +334,22 @@ gadminserver.o: gadminserver.cpp ../../src/glib/gdef.h ../../config.h \
gadminserver.h ../../src/gnet/gserver.h \
../../src/gnet/gsocket.h ../../src/gnet/gaddress.h \
../../src/glib/gexception.h ../../src/gnet/gevent.h \
- ../../src/gnet/gdescriptor.h ../../src/gnet/gconnection.h \
- ../../src/gnet/gselect.h ../../src/gnet/glinebuffer.h \
- ../../src/glib/gstrings.h gserverprotocol.h gprotocolmessage.h \
- gverifier.h gsmtpclient.h ../../src/gnet/gclient.h \
- gclientprotocol.h gmessagestore.h gnewmessage.h \
- gstoredmessage.h ../../src/glib/gpath.h \
+ ../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
+ ../../src/gnet/gconnection.h ../../src/gnet/gselect.h \
+ ../../src/gnet/glinebuffer.h ../../src/glib/gstrings.h \
+ gserverprotocol.h gprotocolmessage.h gverifier.h gsasl.h \
+ gsecrets.h ../../src/glib/gpath.h gsmtpclient.h \
+ ../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \
+ gnewmessage.h gstoredmessage.h ../../src/gnet/gtimer.h \
../../src/gnet/gmonitor.h ../../src/glib/gstr.h \
../../src/glib/gmemory.h
+gbase64.o: gbase64.cpp ../../src/glib/gdef.h ../../config.h \
+ ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+ ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+ ../../src/gnet/gnet.h ../../src/glib/glog.h gbase64.h \
+ ../../src/glib/gexception.h ../../src/glib/gassert.h \
+ ../../src/glib/glogoutput.h ../../src/glib/gstr.h \
+ ../../src/glib/gstrings.h
gclientprotocol.o: gclientprotocol.cpp ../../src/glib/gdef.h \
../../config.h ../../lib/gcc2.95/iostream \
../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
@@ -348,9 +357,11 @@ gclientprotocol.o: gclientprotocol.cpp ../../src/glib/gdef.h \
../../src/glib/glog.h ../../src/gnet/glocal.h \
../../src/gnet/gaddress.h ../../src/glib/gexception.h \
../../src/glib/gfile.h ../../src/glib/gpath.h \
- ../../src/glib/gstrings.h ../../src/glib/gstr.h \
- ../../src/glib/gmemory.h gclientprotocol.h gmessagestore.h \
- gnewmessage.h gstoredmessage.h ../../src/gnet/gresolve.h \
+ ../../src/glib/gstrings.h gsasl.h gsecrets.h gbase64.h \
+ ../../src/glib/gstr.h ../../src/glib/gmemory.h gxtext.h \
+ gclientprotocol.h gmessagestore.h gnewmessage.h \
+ gstoredmessage.h ../../src/gnet/gtimer.h \
+ ../../src/glib/gdatetime.h ../../src/gnet/gresolve.h \
../../src/glib/gassert.h ../../src/glib/glogoutput.h
gfilestore.o: gfilestore.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
@@ -385,7 +396,7 @@ gnewfile.o: gnewfile.cpp ../../src/glib/gdef.h ../../config.h \
../../src/glib/gpath.h ../../src/glib/gexception.h gnewfile.h \
gfilestore.h ../../src/glib/gdatetime.h \
../../src/glib/gmemory.h ../../src/glib/gprocess.h \
- ../../src/glib/gfile.h ../../src/glib/gassert.h \
+ ../../src/glib/gfile.h gxtext.h ../../src/glib/gassert.h \
../../src/glib/glogoutput.h
gnewmessage.o: gnewmessage.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
@@ -405,13 +416,14 @@ gprotocolmessageforward.o: gprotocolmessageforward.cpp \
../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
../../src/glib/glog.h gprotocolmessageforward.h \
gprotocolmessage.h ../../src/glib/gstrings.h gverifier.h \
- gprotocolmessagestore.h gnewmessage.h gsmtpclient.h \
+ gprotocolmessagestore.h gnewmessage.h gsmtpclient.h gsecrets.h \
+ ../../src/glib/gpath.h ../../src/glib/gexception.h \
../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \
- ../../src/gnet/gaddress.h ../../src/glib/gexception.h \
- ../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
- ../../src/gnet/gevent.h ../../src/gnet/gdescriptor.h \
- gclientprotocol.h gmessagestore.h gstoredmessage.h \
- ../../src/glib/gpath.h ../../src/glib/gmemory.h \
+ ../../src/gnet/gaddress.h ../../src/gnet/gconnection.h \
+ ../../src/gnet/gsocket.h ../../src/gnet/gevent.h \
+ ../../src/glib/gdatetime.h ../../src/gnet/gdescriptor.h \
+ gclientprotocol.h gmessagestore.h gstoredmessage.h gsasl.h \
+ ../../src/gnet/gtimer.h ../../src/glib/gmemory.h \
../../src/glib/gstr.h ../../src/glib/gassert.h \
../../src/glib/glogoutput.h
gprotocolmessagestore.o: gprotocolmessagestore.cpp ../../src/glib/gdef.h \
@@ -424,13 +436,28 @@ gprotocolmessagestore.o: gprotocolmessagestore.cpp ../../src/glib/gdef.h \
../../src/glib/gpath.h ../../src/glib/gexception.h \
../../src/glib/gmemory.h ../../src/glib/gstr.h \
../../src/glib/gassert.h ../../src/glib/glogoutput.h
+gsasl_login.o: gsasl_login.cpp ../../src/glib/gdef.h ../../config.h \
+ ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+ ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+ ../../src/gnet/gnet.h ../../src/glib/glog.h gsasl.h gsecrets.h \
+ ../../src/glib/gpath.h ../../src/glib/gstrings.h \
+ ../../src/glib/gexception.h ../../src/glib/gstr.h \
+ ../../src/glib/gmemory.h ../../src/glib/gdebug.h \
+ ../../src/glib/glogoutput.h ../../src/glib/gassert.h
+gsecrets.o: gsecrets.cpp ../../src/glib/gdef.h ../../config.h \
+ ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+ ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+ ../../src/gnet/gnet.h ../../src/glib/glog.h gsecrets.h \
+ ../../src/glib/gpath.h ../../src/glib/gstrings.h \
+ ../../src/glib/gexception.h gxtext.h ../../src/glib/gstr.h
gserverprotocol.o: gserverprotocol.cpp ../../src/glib/gdef.h \
../../config.h ../../lib/gcc2.95/iostream \
../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
../../lib/gcc2.95/limits gsmtp.h ../../src/gnet/gnet.h \
../../src/glib/glog.h gserverprotocol.h gprotocolmessage.h \
- ../../src/glib/gstrings.h gverifier.h ../../src/glib/gdate.h \
- ../../src/glib/gdatetime.h ../../src/glib/gexception.h \
+ ../../src/glib/gstrings.h gverifier.h gsasl.h gsecrets.h \
+ ../../src/glib/gpath.h ../../src/glib/gexception.h gbase64.h \
+ ../../src/glib/gdate.h ../../src/glib/gdatetime.h \
../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
../../src/glib/gassert.h ../../src/glib/gtime.h \
../../src/glib/gstr.h
@@ -441,26 +468,29 @@ gsmtpclient.o: gsmtpclient.cpp ../../src/glib/gdef.h ../../config.h \
../../src/gnet/glocal.h ../../src/gnet/gaddress.h \
../../src/glib/gexception.h ../../src/glib/gfile.h \
../../src/glib/gpath.h ../../src/glib/gstrings.h \
- ../../src/glib/gstr.h ../../src/glib/gmemory.h gsmtpclient.h \
- ../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \
- ../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
- ../../src/gnet/gevent.h ../../src/gnet/gdescriptor.h \
- gclientprotocol.h gmessagestore.h gnewmessage.h \
- gstoredmessage.h ../../src/gnet/gresolve.h \
- ../../src/glib/gassert.h ../../src/glib/glogoutput.h
+ ../../src/glib/gstr.h ../../src/glib/gmemory.h \
+ ../../src/gnet/gtimer.h ../../src/glib/gdatetime.h \
+ gsmtpclient.h gsecrets.h ../../src/gnet/glinebuffer.h \
+ ../../src/gnet/gclient.h ../../src/gnet/gconnection.h \
+ ../../src/gnet/gsocket.h ../../src/gnet/gevent.h \
+ ../../src/gnet/gdescriptor.h gclientprotocol.h gmessagestore.h \
+ gnewmessage.h gstoredmessage.h gsasl.h \
+ ../../src/gnet/gresolve.h ../../src/glib/gassert.h \
+ ../../src/glib/glogoutput.h
gsmtpserver.o: gsmtpserver.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
../../src/gnet/gnet.h ../../src/glib/glog.h gsmtpserver.h \
../../src/gnet/gserver.h ../../src/gnet/gsocket.h \
../../src/gnet/gaddress.h ../../src/glib/gexception.h \
- ../../src/gnet/gevent.h ../../src/gnet/gdescriptor.h \
- ../../src/gnet/gconnection.h ../../src/gnet/gselect.h \
- ../../src/gnet/glinebuffer.h ../../src/glib/gstrings.h \
- gverifier.h gserverprotocol.h gprotocolmessage.h \
+ ../../src/gnet/gevent.h ../../src/glib/gdatetime.h \
+ ../../src/gnet/gdescriptor.h ../../src/gnet/gconnection.h \
+ ../../src/gnet/gselect.h ../../src/gnet/glinebuffer.h \
+ ../../src/glib/gstrings.h gverifier.h gserverprotocol.h \
+ gprotocolmessage.h gsasl.h gsecrets.h ../../src/glib/gpath.h \
gprotocolmessagestore.h gnewmessage.h gprotocolmessageforward.h \
gsmtpclient.h ../../src/gnet/gclient.h gclientprotocol.h \
- gmessagestore.h gstoredmessage.h ../../src/glib/gpath.h \
+ gmessagestore.h gstoredmessage.h ../../src/gnet/gtimer.h \
../../src/glib/gmemory.h ../../src/gnet/glocal.h \
../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
../../src/glib/gassert.h
@@ -471,9 +501,9 @@ gstoredfile.o: gstoredfile.cpp ../../src/glib/gdef.h ../../config.h \
gmessagestore.h gnewmessage.h gstoredmessage.h \
../../src/glib/gstrings.h ../../src/glib/gpath.h \
../../src/glib/gexception.h ../../src/glib/gdatetime.h \
- gstoredfile.h ../../src/glib/gmemory.h ../../src/glib/gfile.h \
- ../../src/glib/gstr.h ../../src/glib/gassert.h \
- ../../src/glib/glogoutput.h
+ gstoredfile.h ../../src/glib/gmemory.h gxtext.h \
+ ../../src/glib/gfile.h ../../src/glib/gstr.h \
+ ../../src/glib/gassert.h ../../src/glib/glogoutput.h
gstoredmessage.o: gstoredmessage.cpp ../../src/glib/gdef.h \
../../config.h ../../lib/gcc2.95/iostream \
../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \
@@ -487,6 +517,11 @@ gverifier.o: gverifier.cpp ../../src/glib/gdef.h ../../config.h \
../../src/glib/gstr.h ../../src/glib/gexception.h \
../../src/glib/gstrings.h ../../src/glib/gassert.h \
../../src/glib/glogoutput.h
+gxtext.o: gxtext.cpp ../../src/glib/gdef.h ../../config.h \
+ ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
+ ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
+ ../../src/gnet/gnet.h ../../src/glib/glog.h gxtext.h \
+ ../../src/glib/gassert.h ../../src/glib/glogoutput.h
main_unix.o: main_unix.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gsmtp.h \
@@ -494,12 +529,13 @@ main_unix.o: main_unix.cpp ../../src/glib/gdef.h ../../config.h \
../../src/glib/garg.h run.h configuration.h \
../../src/glib/gpath.h ../../src/glib/gstrings.h commandline.h \
../../src/glib/ggetopt.h ../../src/glib/gexception.h \
- ../../src/gnet/gevent.h ../../src/gnet/gdescriptor.h \
- ../../src/glib/gdaemon.h gmessagestore.h gnewmessage.h \
- gstoredmessage.h gsmtpclient.h ../../src/gnet/glinebuffer.h \
+ ../../src/gnet/gevent.h ../../src/glib/gdatetime.h \
+ ../../src/gnet/gdescriptor.h ../../src/glib/gdaemon.h \
+ gmessagestore.h gnewmessage.h gstoredmessage.h gsmtpclient.h \
+ gsecrets.h ../../src/gnet/glinebuffer.h \
../../src/gnet/gclient.h ../../src/gnet/gaddress.h \
../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
- gclientprotocol.h
+ gclientprotocol.h gsasl.h ../../src/gnet/gtimer.h
poke.o: poke.c
run.o: run.cpp ../../src/glib/gdef.h ../../config.h \
../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \
@@ -508,15 +544,16 @@ run.o: run.cpp ../../src/glib/gdef.h ../../config.h \
configuration.h ../../src/glib/gpath.h \
../../src/glib/gstrings.h commandline.h ../../src/glib/garg.h \
../../src/glib/ggetopt.h ../../src/glib/gexception.h \
- ../../src/gnet/gevent.h ../../src/gnet/gdescriptor.h \
- ../../src/glib/gdaemon.h gmessagestore.h gnewmessage.h \
- gstoredmessage.h gsmtpclient.h ../../src/gnet/glinebuffer.h \
+ ../../src/gnet/gevent.h ../../src/glib/gdatetime.h \
+ ../../src/gnet/gdescriptor.h ../../src/glib/gdaemon.h \
+ gmessagestore.h gnewmessage.h gstoredmessage.h gsmtpclient.h \
+ gsecrets.h ../../src/gnet/glinebuffer.h \
../../src/gnet/gclient.h ../../src/gnet/gaddress.h \
../../src/gnet/gconnection.h ../../src/gnet/gsocket.h \
- gclientprotocol.h gsmtpserver.h ../../src/gnet/gserver.h \
- ../../src/gnet/gselect.h gverifier.h gserverprotocol.h \
- gprotocolmessage.h gfilestore.h ../../src/glib/gdatetime.h \
- gnewfile.h gadminserver.h ../../src/gnet/gmonitor.h \
+ gclientprotocol.h gsasl.h ../../src/gnet/gtimer.h gsmtpserver.h \
+ ../../src/gnet/gserver.h ../../src/gnet/gselect.h gverifier.h \
+ gserverprotocol.h gprotocolmessage.h gfilestore.h gnewfile.h \
+ gadminserver.h ../../src/gnet/gmonitor.h \
../../src/glib/gprocess.h ../../src/glib/gmemory.h \
../../src/glib/gdebug.h ../../src/glib/glogoutput.h \
../../src/glib/gassert.h
diff --git a/src/main/commandline.cpp b/src/main/commandline.cpp
index 9be157f..771a1f8 100644
--- a/src/main/commandline.cpp
+++ b/src/main/commandline.cpp
@@ -36,6 +36,8 @@ std::string Main::CommandLine::switchSpec()
std::stringstream ss ;
ss
<< osSwitchSpec() << "|"
+ << "C!client-auth!enables authentication with remote server, using the given secrets file!1!file|"
+ << "S!server-auth!enables authentication of remote clients, using the given secrets file!1!file|"
<< "y!as-proxy!equivalent to \"--log --close-stderr --immediate --forward-to\"!1!host:port|"
<< "e!close-stderr!closes the standard error stream after start-up!0!|"
<< "a!admin!enables the administration interface and specifies its listening port number!1!admin-port|"
@@ -44,6 +46,8 @@ std::string Main::CommandLine::switchSpec()
<< "f!forward!forwards stored mail on startup (requires --forward-to)!0!|"
<< "o!forward-to!specifies the remote smtp server (required by --forward and --admin)!1!host:port|"
<< "h!help!displays help text and exits!0!|"
+ << "T!response-timeout!sets the client-side response timeout in seconds (default is 1800)!1!time|"
+ << "U!connection-timeout!sets the client-side connection timeout in seconds (default is 40)!1!time|"
<< "m!immediate!forwards each message as soon as it is received (requires --forward-to)!0!|"
<< "i!pid-file!records the daemon process-id in the given file!1!pid-file|"
<< "p!port!specifies the smtp listening port number!1!port|"
@@ -81,7 +85,7 @@ void Main::CommandLine::showUsage( bool e ) const
{
Show show( e ) ;
unsigned int columns = ttyColumns() ;
- m_getopt.showUsage( show.s() , m_arg.prefix() , "" , 30U , columns ) ;
+ m_getopt.showUsage( show.s() , m_arg.prefix() , "" , 33U , columns ) ;
}
bool Main::CommandLine::contains( const std::string & name ) const
@@ -108,6 +112,14 @@ std::string Main::CommandLine::semanticError() const
"be an absolute path" ;
}
+ if( cfg().daemon() && (
+ ( !cfg().clientSecretsFile().empty() && G::Path(cfg().clientSecretsFile()).isRelative() ) ||
+ ( !cfg().serverSecretsFile().empty() && G::Path(cfg().serverSecretsFile()).isRelative() ) ) )
+ {
+ return "in daemon mode the authorisation secrets file(s) must "
+ "be absolute paths" ;
+ }
+
if( !m_getopt.contains("forward-to") && (
m_getopt.contains("forward") ||
m_getopt.contains("immediate") ||
diff --git a/src/main/commandline_win32.cpp b/src/main/commandline_win32.cpp
index d07f0bb..43c188e 100644
--- a/src/main/commandline_win32.cpp
+++ b/src/main/commandline_win32.cpp
@@ -30,8 +30,9 @@ Main::CommandLine::Show * Main::CommandLine::Show::m_this = NULL ;
//static
std::string Main::CommandLine::osSwitchSpec()
{
- // (could use empty descriptions here so that G::GetOpt does
- // not put them in the --help listing)
+ // (could use empty descriptions for some switches so that they
+ // do not appear in the "--help" listing, but that might be
+ // confusing)
std::stringstream ss ;
ss
@@ -40,12 +41,19 @@ std::string Main::CommandLine::osSwitchSpec()
<< "n!no-syslog!has no effect on windows!0!|"
<< "q!as-client!equivalent to \"--log --no-daemon --dont-serve --forward --forward-to\"!" << "1!host:port|"
<< "d!as-server!equivalent to \"--log --close-stderr\" (has little effect on windows)!0!|"
- << "I!icon!chooses the application icon!1!icon index {0,1,2}"
-
+ << "I!icon!selects the application icon!1!0^|1^|2^|3"
;
+
return ss.str() ;
}
+unsigned int Main::CommandLine::ttyColumns() const
+{
+ return 120U ;
+}
+
+// ===
+
Main::CommandLine::Show::Show( bool )
{
if( m_this == NULL )
@@ -68,9 +76,3 @@ Main::CommandLine::Show::~Show()
}
}
-unsigned int Main::CommandLine::ttyColumns() const
-{
- return 120U ;
-}
-
-
diff --git a/src/main/configuration.cpp b/src/main/configuration.cpp
index 7683b07..28380c4 100644
--- a/src/main/configuration.cpp
+++ b/src/main/configuration.cpp
@@ -173,6 +173,36 @@ std::string Main::Configuration::filter() const
unsigned int Main::Configuration::icon() const
{
- return m_cl.contains("icon") ? G::Str::toUInt(m_cl.value("icon")) : 0U ;
+ unsigned int n = 0U ;
+ if( m_cl.contains("icon") )
+ {
+ n = G::Str::toUInt(m_cl.value("icon")) ;
+ n %= 4U ;
+ }
+ return n ;
+}
+
+std::string Main::Configuration::clientSecretsFile() const
+{
+ return m_cl.contains("client-auth") ? m_cl.value("client-auth") : std::string() ;
+}
+
+std::string Main::Configuration::serverSecretsFile() const
+{
+ return m_cl.contains("server-auth") ? m_cl.value("server-auth") : std::string() ;
+}
+
+unsigned int Main::Configuration::responseTimeout() const
+{
+ const unsigned int default_timeout = 30U * 60U ;
+ return m_cl.contains("response-timeout") ?
+ G::Str::toUInt(m_cl.value("response-timeout")) : default_timeout ;
+}
+
+unsigned int Main::Configuration::connectionTimeout() const
+{
+ const unsigned int default_timeout = 40U ;
+ return m_cl.contains("connection-timeout") ?
+ G::Str::toUInt(m_cl.value("connection-timeout")) : default_timeout ;
}
diff --git a/src/main/configuration.h b/src/main/configuration.h
index 8824c1a..eef511d 100644
--- a/src/main/configuration.h
+++ b/src/main/configuration.h
@@ -109,6 +109,20 @@ public:
unsigned int icon() const ;
// Returns the icon selector.
+ unsigned int responseTimeout() const ;
+ // Returns the client-side protocol timeout value.
+
+ unsigned int connectionTimeout() const ;
+ // Returns the client-side connection timeout value.
+
+ std::string clientSecretsFile() const ;
+ // Returns the client-side autentication secrets (password) file.
+ // Returns the empty string if none.
+
+ std::string serverSecretsFile() const ;
+ // Returns the server-side autentication secrets (password) file.
+ // Returns the empty string if none.
+
private:
const CommandLine & m_cl ;
diff --git a/src/main/doxygen.cfg b/src/main/doxygen.cfg
index 3915325..061ae69 100644
--- a/src/main/doxygen.cfg
+++ b/src/main/doxygen.cfg
@@ -3,7 +3,7 @@
# General configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = E-MailRelay
-PROJECT_NUMBER = 0.9.5
+PROJECT_NUMBER = 0.9.6
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English
EXTRACT_ALL = YES
diff --git a/src/main/emailrelay.dsp b/src/main/emailrelay.dsp
index b8d980d..59f08a8 100644
--- a/src/main/emailrelay.dsp
+++ b/src/main/emailrelay.dsp
@@ -127,6 +127,10 @@ SOURCE=..\..\src\glib\garg_win32.cpp
# End Source File
# Begin Source File
+SOURCE=.\gbase64.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\gnet\gclient.cpp
# End Source File
# Begin Source File
@@ -307,10 +311,18 @@ SOURCE=..\..\src\gnet\gresolve_win32.cpp
# End Source File
# Begin Source File
+SOURCE=.\gsasl_login.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\win32\gscmap.cpp
# End Source File
# Begin Source File
+SOURCE=.\gsecrets.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\gnet\gserver.cpp
# End Source File
# Begin Source File
@@ -351,6 +363,10 @@ SOURCE=..\..\src\glib\gtime.cpp
# End Source File
# Begin Source File
+SOURCE=..\gnet\gtimer.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\win32\gtray.cpp
# End Source File
# Begin Source File
@@ -375,6 +391,10 @@ SOURCE=..\..\src\gnet\gwinsock.cpp
# End Source File
# Begin Source File
+SOURCE=.\gxtext.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\main_win32.cpp
# End Source File
# Begin Source File
diff --git a/src/main/emailrelay.rc b/src/main/emailrelay.rc
index b48e2ba..f420ef4 100644
--- a/src/main/emailrelay.rc
+++ b/src/main/emailrelay.rc
@@ -30,6 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
IDI_ICON1 ICON DISCARDABLE "icon-32.ico"
IDI_ICON2 ICON DISCARDABLE "icon2.ico"
IDI_ICON3 ICON DISCARDABLE "icon3.ico"
+IDI_ICON4 ICON DISCARDABLE "icon4.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/gadminserver.cpp b/src/main/gadminserver.cpp
index 3387c69..32f9476 100644
--- a/src/main/gadminserver.cpp
+++ b/src/main/gadminserver.cpp
@@ -39,8 +39,8 @@ GSmtp::AdminClient::AdminClient( AdminPeer & admin_peer ) :
GSmtp::AdminPeer::AdminPeer( GNet::StreamSocket * s , GNet::Address a , AdminServer & server ,
const std::string & server_address ) :
GNet::ServerPeer( s , a ) ,
- m_server(server) ,
m_buffer(crlf()) ,
+ m_server(server) ,
m_server_address(server_address)
{
// dont prompt() here -- it confuses the poke program
@@ -146,7 +146,7 @@ void GSmtp::AdminPeer::prompt()
{
std::string p( "E-MailRelay> " ) ;
ssize_t rc = socket().write( p.data() , p.length() ) ;
- if( rc < p.length() )
+ if( rc < 0 || static_cast(rc) < p.length() )
doDelete() ; // onDelete() and "delete this"
}
@@ -154,7 +154,7 @@ void GSmtp::AdminPeer::send( std::string line )
{
line.append( crlf() ) ;
ssize_t rc = socket().write( line.data() , line.length() ) ;
- if( rc < line.length() )
+ if( rc < 0 || static_cast(rc) < line.length() )
doDelete() ; // onDelete() and "delete this"
}
diff --git a/src/main/gbase64.cpp b/src/main/gbase64.cpp
new file mode 100644
index 0000000..c218098
--- /dev/null
+++ b/src/main/gbase64.cpp
@@ -0,0 +1,183 @@
+//
+// Copyright (C) 2001 Graeme Walker
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gbase64.cpp
+//
+
+#include "gdef.h"
+#include "gsmtp.h"
+#include "gbase64.h"
+#include "gassert.h"
+#include "gstr.h"
+
+namespace
+{
+ const char * map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" ;
+ char pad = '=' ;
+} ;
+
+g_uint32_t GSmtp::Base64::numeric( char c )
+{
+ return static_cast( static_cast(c) ) ;
+}
+
+void GSmtp::Base64::accumulate_8( g_uint32_t & n , std::string::const_iterator & p ,
+ std::string::const_iterator end , int & i )
+{
+ char c = p == end ? '\0' : *p ;
+ n <<= 8U ;
+ n |= numeric(c) ;
+ if( p != end )
+ {
+ ++p ;
+ ++i ;
+ }
+}
+
+size_t GSmtp::Base64::hi_6( g_uint32_t n )
+{
+ return (n >> 18U) & 0x3F ;
+}
+
+void GSmtp::Base64::generate_6( g_uint32_t & n , int & i , std::string & result )
+{
+ char c = i-- >= 0 ? map[hi_6(n)] : pad ;
+ result.append( 1U , c ) ;
+ n <<= 6U ;
+}
+
+std::string GSmtp::Base64::crlf()
+{
+ return std::string( "\r\n" ) ;
+}
+
+std::string GSmtp::Base64::encode( const std::string & s_in , const std::string & eol )
+{
+ std::string result ;
+ size_t blocks = 0U ;
+ for( std::string::const_iterator p = s_in.begin() ; p != s_in.end() ; blocks++ )
+ {
+ if( blocks && (blocks % 19U) == 0U )
+ result.append( eol ) ;
+
+ g_uint32_t n = 0UL ;
+ int i = 0 ;
+ accumulate_8( n , p , s_in.end() , i ) ;
+ accumulate_8( n , p , s_in.end() , i ) ;
+ accumulate_8( n , p , s_in.end() , i ) ;
+ generate_6( n , i , result ) ;
+ generate_6( n , i , result ) ;
+ generate_6( n , i , result ) ;
+ generate_6( n , i , result ) ;
+ }
+
+ // delete when tested...
+ if( decode(result) != s_in )
+ {
+ std::string decode_result = decode(result) ;
+ G_ERROR( "GSmtp::Base64::encode: mismatch: "
+ << "in \"" << G::Str::toPrintableAscii(s_in) << "\", "
+ << "encoded \"" << G::Str::toPrintableAscii(result) << "\", "
+ << "decoded \"" << G::Str::toPrintableAscii(decode_result) << "\"" ) ;
+ G_ASSERT( !"encode/decode mismatch" ) ;
+ }
+
+ return result ;
+}
+
+// ---
+
+char GSmtp::Base64::to_char( g_uint32_t n )
+{
+ return static_cast(static_cast(n)) ;
+}
+
+size_t GSmtp::Base64::index( char c , bool & error )
+{
+ const char * p = std::strchr( map , c ) ;
+ error = error || !c || !p ;
+ return p ? (p-map) : 0U ;
+}
+
+size_t GSmtp::Base64::accumulate_6( g_uint32_t & n , char c_in , int & n_out , bool & error )
+{
+ n <<= 6U ;
+ if( c_in != pad )
+ {
+ n |= index(c_in,error) ;
+ n_out++ ;
+ }
+ return c_in != '\0' ;
+}
+
+g_uint32_t GSmtp::Base64::hi_8( g_uint32_t n )
+{
+ return (n >> 16U) & 0xff ;
+}
+
+void GSmtp::Base64::generate_8( g_uint32_t & n , int & n_out , std::string & result )
+{
+ if( n_out-- > 0 )
+ result.append( 1U , to_char(hi_8(n)) ) ;
+ n <<= 8U ;
+}
+
+std::string GSmtp::Base64::decode( const std::string & s )
+{
+ bool error = false ;
+ std::string result = decode( s , error ) ;
+ if( error )
+ throw Error() ;
+ return result ;
+}
+
+std::string GSmtp::Base64::decode( const std::string & s , bool & error )
+{
+ std::string result ;
+ for( const char * p = s.c_str() ; *p ; )
+ {
+ if( *p == '\r' || *p == '\n' )
+ {
+ p++ ;
+ continue ;
+ }
+
+ g_uint32_t n = 0UL ;
+ size_t i = 0U ;
+ int n_out = -1 ;
+ i += accumulate_6( n , p[i] , n_out , error ) ;
+ i += accumulate_6( n , p[i] , n_out , error ) ;
+ i += accumulate_6( n , p[i] , n_out , error ) ;
+ i += accumulate_6( n , p[i] , n_out , error ) ;
+ p += i ;
+ generate_8( n , n_out , result ) ;
+ generate_8( n , n_out , result ) ;
+ generate_8( n , n_out , result ) ;
+ }
+ return result ;
+}
+
+bool GSmtp::Base64::valid( const std::string & s )
+{
+ bool error = false ;
+ (void) decode( s , error ) ;
+ return !error ;
+}
+
diff --git a/src/main/gbase64.h b/src/main/gbase64.h
new file mode 100644
index 0000000..8ad2fa5
--- /dev/null
+++ b/src/main/gbase64.h
@@ -0,0 +1,75 @@
+//
+// Copyright (C) 2001 Graeme Walker
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gbase64.h
+//
+
+#ifndef G_BASE64_H
+#define G_BASE64_H
+
+#include "gdef.h"
+#include "gsmtp.h"
+#include "gexception.h"
+#include
+
+namespace GSmtp
+{
+ class Base64 ;
+} ;
+
+// Class: GSmtp::Base64
+// Description: A base64 codec class.
+// See also: RFC 1341 section 5.2
+//
+class GSmtp::Base64
+{
+public:
+ G_EXCEPTION( Error , "base64 encoding error" ) ;
+
+ static std::string encode( const std::string & s , const std::string & eol = crlf() ) ;
+ // Encodes the given string.
+
+ static std::string decode( const std::string & ) ;
+ // Decodes the given string. Throws an exception
+ // if not a valid encoding.
+
+ static bool valid( const std::string & ) ;
+ // Returns true if the string can be decoded.
+
+ static std::string crlf() ;
+ // Returns carriage-return-line-feed.
+
+private:
+ Base64() ;
+ static inline g_uint32_t numeric( char c ) ;
+ static inline void accumulate_8( g_uint32_t & n , std::string::const_iterator & ,
+ std::string::const_iterator , int & ) ;
+ static inline size_t hi_6( g_uint32_t n ) ;
+ static inline void generate_6( g_uint32_t & n , int & i , std::string & result ) ;
+ static inline char to_char( g_uint32_t n ) ;
+ static inline size_t index( char c , bool & error ) ;
+ static inline size_t accumulate_6( g_uint32_t & n , char c_in , int & , bool & error ) ;
+ static inline g_uint32_t hi_8( g_uint32_t n ) ;
+ static inline void generate_8( g_uint32_t & n , int & i , std::string & result ) ;
+ static std::string decode( const std::string & s , bool & error ) ;
+} ;
+
+#endif
+
diff --git a/src/main/gclientprotocol.cpp b/src/main/gclientprotocol.cpp
index a15a5bb..d558a03 100644
--- a/src/main/gclientprotocol.cpp
+++ b/src/main/gclientprotocol.cpp
@@ -26,24 +26,33 @@
#include "gsmtp.h"
#include "glocal.h"
#include "gfile.h"
+#include "gsasl.h"
+#include "gbase64.h"
#include "gstr.h"
#include "gmemory.h"
+#include "gxtext.h"
#include "gclientprotocol.h"
#include "gresolve.h"
#include "glog.h"
#include "gassert.h"
-GSmtp::ClientProtocol::ClientProtocol( Sender & sender , const std::string & thishost ) :
- m_state(sStart) ,
- m_thishost(thishost) ,
- m_sender(sender) ,
- m_callback(NULL) ,
- m_server_has_8bitmime(false) ,
- m_said_hello(false)
+GSmtp::ClientProtocol::ClientProtocol( Sender & sender , const std::string & thishost_name ,
+ unsigned int timeout , bool must_authenticate ) :
+ m_sender(sender) ,
+ m_thishost(thishost_name) ,
+ m_state(sStart) ,
+ m_callback(NULL) ,
+ m_server_has_8bitmime(false) ,
+ m_said_hello(false) ,
+ m_message_is_8bit(false) ,
+ m_authenticated_with_server(false) ,
+ m_must_authenticate(must_authenticate) ,
+ m_timeout(timeout)
{
}
void GSmtp::ClientProtocol::start( const std::string & from , const G::Strings & to , bool eight_bit ,
+ std::string authentication , std::string server_name ,
std::auto_ptr content , Callback & callback )
{
G_DEBUG( "GSmtp::ClientProtocol::start" ) ;
@@ -51,9 +60,10 @@ void GSmtp::ClientProtocol::start( const std::string & from , const G::Strings &
m_from = from ;
m_content = content ;
m_callback = &callback ;
- m_server_has_8bitmime = false ;
m_message_is_8bit = eight_bit ;
+ m_message_authentication = authentication ;
m_reply = Reply() ;
+ m_sasl <<= new SaslClient( server_name ) ;
if( m_state != sStart && m_state != sEnd )
throw NotReady() ;
@@ -78,9 +88,7 @@ void GSmtp::ClientProtocol::sendDone()
{
if( m_state == sData )
{
- size_t n = 0U ;
- while( sendLine() )
- n++ ;
+ size_t n = sendLines() ;
G_LOG( "GSmtp::ClientProtocol: tx>>: [" << n << " line(s) of content]" ) ;
if( endOfContent() )
@@ -141,15 +149,25 @@ void GSmtp::ClientProtocol::sendMail()
{
mail_from.append( " BODY=8BITMIME" ) ;
}
- else if( m_message_is_8bit )
+ if( !m_server_has_8bitmime && m_message_is_8bit )
{
throw NarrowPipe() ; // (could do better)
}
+ if( m_authenticated_with_server && !m_message_authentication.empty() )
+ {
+ mail_from.append( std::string(" AUTH=") + Xtext::encode(m_message_authentication) ) ;
+ }
+ else if( m_authenticated_with_server )
+ {
+ mail_from.append( " AUTH=<>" ) ;
+ }
send( mail_from ) ;
}
void GSmtp::ClientProtocol::applyEvent( const Reply & reply )
{
+ cancelTimer() ;
+
if( reply.is(Reply::ServiceReady_220) )
{
; // no-op
@@ -158,6 +176,7 @@ void GSmtp::ClientProtocol::applyEvent( const Reply & reply )
{
m_state = sStart ;
m_said_hello = false ;
+ m_authenticated_with_server = false ;
}
else if( m_state == sStart )
{
@@ -170,11 +189,61 @@ void GSmtp::ClientProtocol::applyEvent( const Reply & reply )
}
else if( (m_state==sSentEhlo || m_state==sSentHelo) && reply.is(Reply::Ok_250) )
{
- m_server_has_8bitmime = m_state == sSentEhlo && reply.textContains("8BITMIME") ;
+ G_ASSERT( m_sasl.get() != NULL ) ;
+ G_DEBUG( "GSmtp::ClientProtocol::applyEvent: ehlo reply \"" << G::Str::toPrintableAscii(reply.text()) << "\"" ) ;
+
+ m_auth_mechanism = m_sasl->preferred( serverAuthMechanisms(reply) ) ;
+ m_server_has_8bitmime = m_state == sSentEhlo && reply.textContains("\n8BITMIME") ;
m_said_hello = true ;
- m_state = sSentMail ;
- sendMail() ;
+ if( m_sasl->active() && !m_auth_mechanism.empty() )
+ {
+ m_state = sAuth1 ;
+ send( std::string("AUTH ") + m_auth_mechanism ) ;
+ }
+ else if( m_sasl->active() && m_must_authenticate )
+ {
+ std::string reason = "cannot do mandatory authentication" ; // eg. no suitable mechanism
+ G_WARNING( "GSmtp::ClientProtocol: " << reason ) ;
+ m_state = sEnd ;
+ doCallback( false , true , reason ) ;
+ }
+ else
+ {
+ m_state = sSentMail ;
+ sendMail() ;
+ }
+ }
+ else if( m_state == sAuth1 && reply.is(Reply::Challenge_334) && Base64::valid(reply.text()) )
+ {
+ bool done = true ;
+ bool error = false ;
+ std::string rsp = m_sasl->response( m_auth_mechanism , Base64::decode(reply.text()) , done , error ) ;
+ if( error )
+ {
+ m_state = sAuth2 ;
+ send( "*" ) ; // ie. cancel authentication
+ }
+ else
+ {
+ m_state = done ? sAuth2 : m_state ;
+ send( Base64::encode(rsp) ) ;
+ }
+ }
+ else if( m_state == sAuth2 )
+ {
+ m_authenticated_with_server = reply.is(Reply::Authenticated_235) ;
+
+ if( !m_authenticated_with_server && m_must_authenticate )
+ {
+ m_state = sEnd ;
+ doCallback( false , true , "mandatory authentication failed" ) ;
+ }
+ else
+ {
+ m_state = sSentMail ;
+ sendMail() ; // (with or without sucessful authentication)
+ }
}
else if( m_state == sSentMail && reply.is(Reply::Ok_250) )
{
@@ -203,15 +272,13 @@ void GSmtp::ClientProtocol::applyEvent( const Reply & reply )
{
G_WARNING( "GSmtp::ClientProtocol: recipient rejected" ) ;
m_state = sEnd ;
- doCallback( false , reply.text() ) ;
+ doCallback( false , false , reply.text() ) ;
}
else if( m_state == sSentData && reply.is(Reply::OkForData_354) )
{
m_state = sData ;
- size_t n = 0U ;
- while( sendLine() )
- n++ ;
+ size_t n = sendLines() ;
G_LOG( "GSmtp::ClientProtocol: tx>>: [" << n << " line(s) of content]" ) ;
if( endOfContent() )
@@ -224,38 +291,45 @@ void GSmtp::ClientProtocol::applyEvent( const Reply & reply )
{
const bool ok = reply.is(Reply::Ok_250) ;
m_state = sEnd ;
- doCallback( ok , ok ? std::string() : reply.text() ) ;
+ doCallback( ok , false , ok ? std::string() : reply.text() ) ;
}
else
{
G_WARNING( "GSmtp::ClientProtocol: failure in client protocol: " << static_cast(m_state) ) ;
m_state = sEnd ; // (was sReset)
- send( "RSET" ) ; // for good meausre
- doCallback( false , std::string("unexpected response: ")+reply.text() ) ;
+ if( 0 ) send( "RSET" ) ; // for good meausre
+ doCallback( false , true , std::string("unexpected response: ")+reply.text() ) ;
}
}
-void GSmtp::ClientProtocol::doCallback( bool ok , const std::string & reason )
+void GSmtp::ClientProtocol::onTimeout()
+{
+ G_WARNING( "GSmtp::ClientProtocol: timeout" ) ;
+ m_state = sEnd ;
+ doCallback( false , false , "timeout" ) ;
+}
+
+G::Strings GSmtp::ClientProtocol::serverAuthMechanisms( const ClientProtocolReply & reply ) const
+{
+ G::Strings result ;
+ std::string auth_line = reply.textLine("AUTH") ;
+ if( ! auth_line.empty() )
+ {
+ G::Str::splitIntoTokens( auth_line , result , " \t" ) ;
+ if( result.size() )
+ result.pop_front() ; // remove "AUTH" ;
+ }
+ return result ;
+}
+
+void GSmtp::ClientProtocol::doCallback( bool ok , bool abort , const std::string & reason )
{
m_content <<= 0 ;
if( m_callback )
{
Callback * cb = m_callback ;
m_callback = NULL ;
- cb->protocolDone( ok , reason ) ;
- }
-}
-
-bool GSmtp::ClientProtocol::sendLine()
-{
- std::string line = G::Str::readLineFrom( *(m_content.get()) , crlf() ) ;
- if( m_content->good() )
- {
- return send( line , false , false ) ;
- }
- else
- {
- return false ;
+ cb->protocolDone( ok , abort , reason ) ;
}
}
@@ -264,11 +338,37 @@ bool GSmtp::ClientProtocol::endOfContent() const
return !m_content->good() ;
}
+size_t GSmtp::ClientProtocol::sendLines()
+{
+ size_t n = 0U ;
+ std::string line ;
+ while( sendLine(line) )
+ n++ ;
+ return n ;
+}
+
+bool GSmtp::ClientProtocol::sendLine( std::string & line )
+{
+ G::Str::readLineFrom( *(m_content.get()) , crlf() , line ) ;
+ if( m_content->good() )
+ {
+ line.append( crlf() ) ;
+ return m_sender.protocolSend( line ) ;
+ }
+ else
+ {
+ return false ;
+ }
+}
+
bool GSmtp::ClientProtocol::send( const std::string & line , bool eot , bool log )
{
if( log )
G_LOG( "GSmtp::ClientProtocol: tx>>: \"" << G::Str::toPrintableAscii(line) << "\"" ) ;
+ if( m_timeout != 0U )
+ startTimer( m_timeout ) ;
+
if( !eot && line.length() && line.at(0U) == '.' )
return m_sender.protocolSend( std::string(".")+line+crlf() ) ;
else
@@ -276,16 +376,17 @@ bool GSmtp::ClientProtocol::send( const std::string & line , bool eot , bool log
}
//static
-std::string GSmtp::ClientProtocol::crlf()
+const std::string & GSmtp::ClientProtocol::crlf()
{
- return std::string("\015\012") ;
+ static std::string s("\015\012") ;
+ return s ;
}
// ===
GSmtp::ClientProtocolReply::ClientProtocolReply( const std::string & line ) :
- m_valid(false) ,
- m_complete(false)
+ m_complete(false) ,
+ m_valid(false)
{
if( line.length() >= 3U &&
is_digit(line.at(0U)) &&
@@ -297,9 +398,9 @@ GSmtp::ClientProtocolReply::ClientProtocolReply( const std::string & line ) :
m_valid = true ;
m_complete = line.length() == 3U || line.at(3U) == ' ' ;
m_value = G::Str::toUInt( line.substr(0U,3U) ) ;
- if( line.length() > 3U )
+ if( line.length() > 4U )
{
- m_text = line.substr(3U) ;
+ m_text = line.substr(4U) ;
G::Str::trimLeft( m_text , " \t" ) ;
}
}
@@ -335,6 +436,21 @@ std::string GSmtp::ClientProtocolReply::text() const
return m_text ;
}
+std::string GSmtp::ClientProtocolReply::textLine( const std::string & prefix ) const
+{
+ size_t start_pos = m_text.find( std::string("\n")+prefix ) ;
+ if( start_pos == std::string::npos )
+ {
+ return std::string() ;
+ }
+ else
+ {
+ start_pos++ ;
+ size_t end_pos = m_text.find( "\n" , start_pos + prefix.length() ) ;
+ return m_text.substr( start_pos , end_pos-start_pos ) ;
+ }
+}
+
//static
bool GSmtp::ClientProtocolReply::is_digit( char c )
{
diff --git a/src/main/gclientprotocol.h b/src/main/gclientprotocol.h
index 9e5e6b0..b6ad198 100644
--- a/src/main/gclientprotocol.h
+++ b/src/main/gclientprotocol.h
@@ -28,7 +28,10 @@
#include "gnet.h"
#include "gsmtp.h"
#include "gmessagestore.h"
+#include "gsasl.h"
+#include "gsecrets.h"
#include "gstrings.h"
+#include "gtimer.h"
#include "gexception.h"
#include
#include
@@ -64,13 +67,15 @@ public:
} ;
enum Value
{
- Invalid = 0 ,
ServiceReady_220 = 220 ,
- SyntaxError_500 = 500 ,
- BadSequence_503 = 503 ,
- NotImplemented_502 = 502 ,
+ Ok_250 = 250 ,
+ Authenticated_235 = 235 ,
+ Challenge_334 = 334 ,
OkForData_354 = 354 ,
- Ok_250 = 250
+ SyntaxError_500 = 500 ,
+ NotImplemented_502 = 502 ,
+ BadSequence_503 = 503 ,
+ Invalid = 0 ,
} ;
explicit ClientProtocolReply( const std::string & line = std::string() ) ;
bool incomplete() const ;
@@ -80,6 +85,7 @@ public:
bool is( Value v ) const ;
unsigned int value() const ;
std::string text() const ;
+ std::string textLine( const std::string & prefix ) const ;
Type type() const ;
SubType subType() const ;
bool textContains( std::string s ) const ;
@@ -95,7 +101,7 @@ private:
// Class: GSmtp::ClientProtocol
// Description: Implements the client-side SMTP protocol.
//
-class GSmtp::ClientProtocol
+class GSmtp::ClientProtocol : private GNet::Timer
{
public:
G_EXCEPTION( NotReady , "not ready" ) ;
@@ -121,26 +127,44 @@ public:
class Callback // A callback interface used by ClientProtocol.
{
- public: virtual void protocolDone( bool ok , const std::string & reason ) = 0 ;
+ public: virtual void protocolDone( bool ok , bool abort , const std::string & reason ) = 0 ;
// Called once the protocol has finished with
// a given message. See ClientProtocol::start().
+ //
+ // If 'ok' is false then 'abort' indicates
+ // whether there is any point in trying to
+ // send more messages to the same server.
+ // The 'abort' parameter will be true if,
+ // for example, authentication failed -- if
+ // it failed for one message then it will
+ // fail for all the others.
private: void operator=( const Callback & ) ; // not implemented
public: virtual ~Callback() ;
} ;
- ClientProtocol( Sender & sender , const std::string & thishost ) ;
- // Constructor. The sender reference is kept.
- // The Sender interface is used to send
- // protocol messages to the peer.
+ ClientProtocol( Sender & sender , const std::string & thishost_name ,
+ unsigned int timeout , bool must_authenticate ) ;
+ // Constructor. The 'sender' and 'secrets' references
+ // are kept.
+ //
+ // The Sender interface is used to send protocol
+ // messages to the peer.
+ //
+ // The 'thishost_name' parameter is used in the
+ // SMTP EHLO request.
void start( const std::string & from , const G::Strings & to , bool eight_bit ,
+ std::string authentication , std::string server_name ,
std::auto_ptr content , Callback & callback ) ;
// Starts transmission of the given message.
//
- // The 'callback' parameter is used to
- // signal that the message has been
- // processed.
+ // The 'callback' parameter is used to signal that the
+ // message has been processed.
+ //
+ // The 'server_name' parameter is passed to the SASL
+ // authentication code. It should be a fully-qualified
+ // domain name where possible.
void sendDone() ;
// Called when a blocked connection becomes unblocked.
@@ -154,16 +178,19 @@ public:
private:
bool send( const std::string & , bool eot = false , bool log = true ) ;
- bool sendLine() ;
+ bool sendLine( std::string & ) ;
+ size_t sendLines() ;
void sendMail() ;
bool endOfContent() const ;
- static std::string crlf() ;
+ static const std::string & crlf() ;
void applyEvent( const Reply & event ) ;
static bool parseReply( Reply & , const std::string & , std::string & ) ;
- void doCallback( bool , const std::string & ) ;
+ void doCallback( bool , bool , const std::string & ) ;
+ G::Strings serverAuthMechanisms( const ClientProtocolReply & reply ) const ;
+ void onTimeout() ;
private:
- enum State { sStart , sSentEhlo , sSentHelo , sSentMail ,
+ enum State { sStart , sSentEhlo , sSentHelo , sAuth1 , sAuth2 , sSentMail ,
sSentRcpt , sSentData , sData , sDone , sEnd , sReset } ;
Sender & m_sender ;
std::string m_thishost ;
@@ -175,7 +202,13 @@ private:
bool m_server_has_8bitmime ;
bool m_said_hello ;
bool m_message_is_8bit ;
+ std::string m_message_authentication ;
Reply m_reply ;
+ bool m_authenticated_with_server ;
+ std::string m_auth_mechanism ;
+ std::auto_ptr m_sasl ;
+ bool m_must_authenticate ;
+ unsigned int m_timeout ;
} ;
#endif
diff --git a/src/main/gfilestore.cpp b/src/main/gfilestore.cpp
index b3936f9..fa5312c 100644
--- a/src/main/gfilestore.cpp
+++ b/src/main/gfilestore.cpp
@@ -107,9 +107,12 @@ std::string GSmtp::FileStore::x()
}
//static
-std::string GSmtp::FileStore::format()
+std::string GSmtp::FileStore::format( int n )
{
- return "#2821.2" ;
+ if( n == 0 )
+ return "#2821.3" ; // current -- includes message authentication and client ip
+ else
+ return "#2821.2" ; // old
}
//static
@@ -168,7 +171,10 @@ G::Path GSmtp::FileStore::fullPath( const std::string & filename ) const
unsigned long GSmtp::FileStore::newSeq()
{
- return m_seq++ ;
+ m_seq++ ;
+ if( m_seq == 0UL )
+ m_seq++ ;
+ return m_seq ;
}
bool GSmtp::FileStore::empty() const
diff --git a/src/main/gfilestore.h b/src/main/gfilestore.h
index 3722583..7c0c617 100644
--- a/src/main/gfilestore.h
+++ b/src/main/gfilestore.h
@@ -63,7 +63,7 @@ public:
// directory by other processes.
unsigned long newSeq() ;
- // Hands out a new sequence number.
+ // Hands out a new non-zero sequence number.
std::auto_ptr stream( const G::Path & path );
// Returns a stream to the given content.
@@ -93,9 +93,10 @@ public:
static std::string x() ;
// Returns the prefix for envelope header lines.
- static std::string format() ;
+ static std::string format( int n = 0 ) ;
// Returns an identifier for the storage format
- // implemented by this class.
+ // implemented by this class. If n is -1 then
+ // it returns the previous format (etc.).
private:
static void checkPath( const G::Path & dir ) ;
diff --git a/src/main/gmessagestore.h b/src/main/gmessagestore.h
index 4f1e3fb..7f789c3 100644
--- a/src/main/gmessagestore.h
+++ b/src/main/gmessagestore.h
@@ -54,6 +54,7 @@ class GSmtp::MessageStore
{
public:
G_EXCEPTION( WriteError , "error writing file" ) ;
+ G_EXCEPTION( StorageError , "error storing message" ) ;
G_EXCEPTION( NoInstance , "no message store instance" ) ;
G_EXCEPTION( FormatError , "format error" ) ;
class IteratorImp // A base class for MessageStore::Iterator implementations.
diff --git a/src/main/gnewfile.cpp b/src/main/gnewfile.cpp
index aea31a0..a77f4e5 100644
--- a/src/main/gnewfile.cpp
+++ b/src/main/gnewfile.cpp
@@ -28,6 +28,7 @@
#include "gmemory.h"
#include "gprocess.h"
#include "gfile.h"
+#include "gxtext.h"
#include "gassert.h"
#include "glog.h"
#include
@@ -37,8 +38,8 @@ bool GSmtp::NewFile::m_preprocess = false ;
G::Path GSmtp::NewFile::m_preprocessor ;
GSmtp::NewFile::NewFile( const std::string & from , FileStore & store ) :
- m_from(from) ,
m_store(store),
+ m_from(from) ,
m_eight_bit(false)
{
m_seq = store.newSeq() ;
@@ -72,17 +73,17 @@ void GSmtp::NewFile::addText( const std::string & line )
bool GSmtp::NewFile::isEightBit( const std::string & line )
{
- const size_t n = line.length() ;
- for( size_t i = 0U ; i < n ; --i )
+ std::string::const_iterator end = line.end() ;
+ for( std::string::const_iterator p = line.begin() ; p != end ; ++p )
{
- const unsigned char c = static_cast(line.at(i)) ;
+ const unsigned char c = static_cast(*p) ;
if( c > 0x7fU )
return true ;
}
return false ;
}
-void GSmtp::NewFile::store()
+bool GSmtp::NewFile::store( const std::string & auth_id , const std::string & client_ip )
{
// flush the content file
//
@@ -99,17 +100,19 @@ void GSmtp::NewFile::store()
std::string reason = p0.str() ;
{
std::auto_ptr envelope_stream = m_store.stream( p0 ) ;
- ok = saveEnvelope( *(envelope_stream.get()) , p0.str() ) ;
+ ok = saveEnvelope( *(envelope_stream.get()) , p0.str() , auth_id , client_ip ) ;
}
// shell out to a message pre-processor
//
+ bool cancelled = false ;
if( ok )
{
- ok = preprocess( m_content_path ) ;
+ ok = preprocess( m_content_path , cancelled ) ;
if( !ok )
reason = "pre-processing failed" ;
}
+ G_ASSERT( !(ok&&cancelled) ) ;
// deliver to local mailboxes
//
@@ -124,18 +127,32 @@ void GSmtp::NewFile::store()
{
G_ASSERT( m_content_path.str().length() != 0U ) ;
G::File::remove( m_content_path , G::File::NoThrow() ) ;
- throw GSmtp::MessageStore::WriteError( reason ) ;
+ if( !cancelled )
+ throw GSmtp::MessageStore::StorageError( reason ) ;
}
+
+ return cancelled ;
}
-bool GSmtp::NewFile::preprocess( const G::Path & path )
+bool GSmtp::NewFile::preprocess( const G::Path & path , bool & cancelled )
{
if( m_preprocess )
{
G_LOG( "GSmtp::NewFile::preprocess: " << m_preprocessor << " " << path ) ;
int exit_code = G::Process::spawn( m_preprocessor , path.str() ) ;
G_LOG( "GSmtp::NewFile::preprocess: exit status " << exit_code ) ;
- if( exit_code != 0 )
+ if( exit_code == 100 )
+ {
+ // a special exit-code for pre-processors which
+ // do their own message handling -- the pre-processor
+ // should delete the files before returning this
+ // exit code
+ //
+ cancelled = true ;
+ G_LOG( "GSmtp::NewFile: message processing cancelled by preprocessor" ) ;
+ return false ;
+ }
+ else if( exit_code != 0 )
{
G_WARNING( "GSmtp::NewFile::preprocess: pre-processing failed: exit code " << exit_code ) ;
return false ;
@@ -144,7 +161,7 @@ bool GSmtp::NewFile::preprocess( const G::Path & path )
return true ;
}
-void GSmtp::NewFile::deliver( const G::Strings & to ,
+void GSmtp::NewFile::deliver( const G::Strings & /*to*/ ,
const G::Path & content_path , const G::Path & envelope_path_now ,
const G::Path & envelope_path_later )
{
@@ -158,7 +175,8 @@ void GSmtp::NewFile::deliver( const G::Strings & to ,
G::File::copy( envelope_path_now.str() , envelope_path_later.str()+".local" ) ;
}
-bool GSmtp::NewFile::saveEnvelope( std::ostream & stream , const std::string & where ) const
+bool GSmtp::NewFile::saveEnvelope( std::ostream & stream , const std::string & where ,
+ const std::string & auth_id , const std::string & client_ip ) const
{
G_LOG( "GSmtp::NewMessage: envelope file: " << where ) ;
@@ -178,14 +196,17 @@ bool GSmtp::NewFile::saveEnvelope( std::ostream & stream , const std::string & w
for( ; to_p != m_to_remote.end() ; ++to_p )
stream << x << "To-Remote: " << *to_p << crlf() ;
}
+ stream << x << "Authentication: " << Xtext::encode(auth_id) << crlf() ;
+ stream << x << "Client: " << client_ip << crlf() ;
stream << x << "End: 1" << crlf() ;
stream.flush() ;
return stream.good() ;
}
-std::string GSmtp::NewFile::crlf() const
+const std::string & GSmtp::NewFile::crlf() const
{
- return std::string( "\015\012" ) ;
+ static std::string s( "\015\012" ) ;
+ return s ;
}
unsigned long GSmtp::NewFile::id() const
diff --git a/src/main/gnewfile.h b/src/main/gnewfile.h
index f79432d..a981a7c 100644
--- a/src/main/gnewfile.h
+++ b/src/main/gnewfile.h
@@ -59,11 +59,13 @@ public:
virtual void addText( const std::string & line ) ;
// Adds a line of content.
- virtual void store() ;
+ virtual bool store( const std::string & auth_id , const std::string & client_ip ) ;
// Stores the message in the message store.
+ // Returns true if storage was deliberately
+ // cancelled.
virtual unsigned long id() const ;
- // Returns the message's unique identifier.
+ // Returns the message's unique non-zero identifier.
static void setPreprocessor( const G::Path & exe ) ;
// Defines a program which is used for pre-processing
@@ -82,11 +84,12 @@ private:
static G::Path m_preprocessor ;
private:
- bool saveEnvelope( std::ostream & stream , const std::string & where ) const ;
- std::string crlf() const ;
+ bool saveEnvelope( std::ostream & , const std::string & where ,
+ const std::string & auth_id , const std::string & client_ip ) const ;
+ const std::string & crlf() const ;
static bool isEightBit( const std::string & line ) ;
void deliver( const G::Strings & , const G::Path & , const G::Path & , const G::Path & ) ;
- bool preprocess( const G::Path & ) ;
+ bool preprocess( const G::Path & , bool & ) ;
} ;
#endif
diff --git a/src/main/gnewmessage.h b/src/main/gnewmessage.h
index cc4d6b9..752c498 100644
--- a/src/main/gnewmessage.h
+++ b/src/main/gnewmessage.h
@@ -47,11 +47,13 @@ public:
virtual void addText( const std::string & line ) = 0 ;
// Adds a line of content.
- virtual void store() = 0 ;
+ virtual bool store( const std::string & auth_id , const std::string & client_ip ) = 0 ;
// Stores the message in the message store.
+ // Returns true if storage was deliberately
+ // cancelled.
virtual unsigned long id() const = 0 ;
- // Returns the message's unique identifier.
+ // Returns the message's unique non-zero identifier.
virtual ~NewMessage() ;
// Destructor.
diff --git a/src/main/gprotocolmessage.h b/src/main/gprotocolmessage.h
index 595930c..3d80d23 100644
--- a/src/main/gprotocolmessage.h
+++ b/src/main/gprotocolmessage.h
@@ -51,6 +51,10 @@ public:
{
public: virtual ~Callback() ;
public: virtual void processDone( bool success , unsigned long id , const std::string & reason ) = 0 ;
+ // Signals that ProtocolMessage::process() has completed.
+ // As a special case, if success is true and id is zero then
+ // the message processing was cancelled.
+
private: void operator=( const Callback & ) ; // not implemented
} ;
@@ -86,12 +90,19 @@ public:
// Precondition: at least one
// successful addTo() call
- virtual void process( Callback & callback ) = 0 ;
- // Starts asynchronous processing of the
- // message. Once processing is complete the
- // message state is cleared and the callback
- // is triggered. The callback may be called
- // before process() returns.
+ virtual void process( Callback & callback , const std::string & authenticated_client_id ,
+ const std::string & peer_ip_address ) = 0 ;
+ // Starts asynchronous processing of the
+ // message. Once processing is complete the
+ // message state is cleared and the callback
+ // is triggered. The callback may be called
+ // before process() returns.
+ //
+ // The client-id parameter is used to propogate
+ // authentication information from the SMTP
+ // AUTH command into individual messages.
+ // It is the empty string for unauthenticated
+ // clients. See also GSmtp::Sasl::id().
private:
void operator=( const ProtocolMessage & ) ; // not implemented
diff --git a/src/main/gprotocolmessageforward.cpp b/src/main/gprotocolmessageforward.cpp
index 21d3bc8..50e2693 100644
--- a/src/main/gprotocolmessageforward.cpp
+++ b/src/main/gprotocolmessageforward.cpp
@@ -67,17 +67,18 @@ void GSmtp::ProtocolMessageForward::addText( const std::string & line )
m_pm.addText( line ) ;
}
-void GSmtp::ProtocolMessageForward::process( ProtocolMessage::Callback & callback )
+void GSmtp::ProtocolMessageForward::process( ProtocolMessage::Callback & callback , const std::string & auth_id ,
+ const std::string & client_ip )
{
m_callback = & callback ;
- m_pm.process( *this ) ;
+ m_pm.process( *this , auth_id , client_ip ) ;
}
void GSmtp::ProtocolMessageForward::processDone( bool success , unsigned long id , const std::string & reason_in )
{
std::string reason( reason_in ) ;
- bool nothing_to_do = false ;
- if( success )
+ bool nothing_to_do = success && id == 0UL ;
+ if( success && id != 0UL )
{
m_id = id ;
success = forward( id , nothing_to_do , &reason ) ;
diff --git a/src/main/gprotocolmessageforward.h b/src/main/gprotocolmessageforward.h
index 4f97b10..08fd950 100644
--- a/src/main/gprotocolmessageforward.h
+++ b/src/main/gprotocolmessageforward.h
@@ -39,10 +39,14 @@ namespace GSmtp
} ;
// Class: GSmtp::ProtocolMessageForward
-// Description: A concrete implementation of the
-// ProtocolMessage interface which stores incoming
-// messages in the message store and then immediately
-// forwards them on to the downstream server.
+// Description: A concrete implementation of the ProtocolMessage
+// interface which stores incoming messages in the message store
+// and then immediately forwards them on to the downstream server.
+//
+// The implementation delegates to an instance of the ProtocolMessageStore
+// class (ie. its sibling class) to do the storage, and to an instance
+// of the Client class to do the forwarding.
+//
// See also: ProtocolMessageStore
//
class GSmtp::ProtocolMessageForward : public GSmtp:: ProtocolMessage ,
@@ -71,8 +75,9 @@ public:
virtual void addText( const std::string & ) ;
// See ProtocolMessage.
- virtual void process( ProtocolMessage::Callback & callback ) ;
- // See ProtocolMessage.
+ virtual void process( ProtocolMessage::Callback & callback , const std::string & auth_id ,
+ const std::string & client_ip ) ;
+ // See ProtocolMessage.
private:
void operator=( const ProtocolMessageForward & ) ; // not implemented
diff --git a/src/main/gprotocolmessagestore.cpp b/src/main/gprotocolmessagestore.cpp
index 7c15a8b..8041102 100644
--- a/src/main/gprotocolmessagestore.cpp
+++ b/src/main/gprotocolmessagestore.cpp
@@ -101,16 +101,19 @@ void GSmtp::ProtocolMessageStore::addText( const std::string & line )
m_msg->addText( line ) ;
}
-void GSmtp::ProtocolMessageStore::process( Callback & callback )
+void GSmtp::ProtocolMessageStore::process( Callback & callback , const std::string & auth_id ,
+ const std::string & client_ip )
{
try
{
G_ASSERT( m_msg.get() != NULL ) ;
unsigned long id = 0UL ;
+ bool cancelled = false ;
if( m_msg.get() != NULL )
{
- m_msg->store() ;
- id = m_msg->id() ;
+ cancelled = m_msg->store( auth_id , client_ip ) ;
+ if( !cancelled )
+ id = m_msg->id() ;
}
clear() ;
callback.processDone( true , id , std::string() ) ;
diff --git a/src/main/gprotocolmessagestore.h b/src/main/gprotocolmessagestore.h
index c9ab612..8c06ded 100644
--- a/src/main/gprotocolmessagestore.h
+++ b/src/main/gprotocolmessagestore.h
@@ -66,8 +66,9 @@ public:
virtual void addText( const std::string & ) ;
// See ProtocolMessage.
- virtual void process( ProtocolMessage::Callback & callback ) ;
- // See ProtocolMessage.
+ virtual void process( ProtocolMessage::Callback & callback , const std::string & auth_id ,
+ const std::string & client_ip ) ;
+ // See ProtocolMessage.
private:
void operator=( const ProtocolMessageStore & ) ; // not implemented
diff --git a/src/main/gsasl.h b/src/main/gsasl.h
new file mode 100644
index 0000000..a024fd6
--- /dev/null
+++ b/src/main/gsasl.h
@@ -0,0 +1,198 @@
+//
+// Copyright (C) 2001 Graeme Walker
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// ===
+//
+// gsasl.h
+//
+
+#ifndef G_SASL_H
+#define G_SASL_H
+
+#include "gdef.h"
+#include "gsmtp.h"
+#include "gsecrets.h"
+#include "gexception.h"
+#include "gstrings.h"
+#include "gpath.h"
+#include