From 245a01d5273512d80d0074ae52ec852e20cbc3a3 Mon Sep 17 00:00:00 2001 From: Graeme Walker Date: Wed, 12 Sep 2001 12:00:00 +0000 Subject: [PATCH] v0.9.2 --- ChangeLog | 15 +- Makefile.in | 3 + bin/Makefile.am | 2 +- bin/Makefile.in | 5 +- ...elay-deliver.sh => emailrelay-deliver.sh_} | 0 ...lrelay-filter.sh => emailrelay-filter.sh_} | 0 ...lrelay-notify.sh => emailrelay-notify.sh_} | 0 ...emailrelay-test.sh => emailrelay-test.sh_} | 0 bin/{emailrelay.sh => emailrelay.sh_} | 0 bin/{txt2html.sh => txt2html.sh_} | 11 + config.h.in | 12 +- configure | 577 ++++++++++++------ configure.in | 39 +- doc/Makefile.am | 24 +- doc/Makefile.in | 27 +- doc/userguide.txt | 4 +- lib/Makefile.in | 3 + lib/gcc2.95/Makefile.am | 2 +- lib/gcc2.95/Makefile.in | 5 +- lib/gcc2.95/exception | 37 -- lib/msvc6.0/Makefile.in | 3 + lib/msvc6.0/cstdio | 2 + src/Makefile.in | 3 + src/glib/Makefile.in | 80 ++- src/glib/garg.h | 4 +- src/glib/gdatetime.h | 4 - src/glib/gdatetime_unix.cpp | 5 - src/glib/gdatetime_win32.cpp | 5 - src/glib/gdef.h | 61 +- src/glib/gdirectory.h | 2 +- src/glib/gdirectory_unix.cpp | 2 +- src/glib/gdirectory_win32.cpp | 14 +- src/gnet/Makefile.am | 2 +- src/gnet/Makefile.in | 104 +++- src/gnet/gaddress_ipv4.cpp | 2 +- src/gnet/glocal_unix.cpp | 11 +- src/gnet/gnet.h | 3 +- src/main/Makefile.am | 2 +- src/main/Makefile.in | 101 +++ src/main/doxygen.cfg | 32 +- src/main/mailrelay.cpp | 2 +- src/win32/Makefile.in | 3 + 42 files changed, 852 insertions(+), 361 deletions(-) rename bin/{emailrelay-deliver.sh => emailrelay-deliver.sh_} (100%) mode change 100755 => 100644 rename bin/{emailrelay-filter.sh => emailrelay-filter.sh_} (100%) mode change 100755 => 100644 rename bin/{emailrelay-notify.sh => emailrelay-notify.sh_} (100%) mode change 100755 => 100644 rename bin/{emailrelay-test.sh => emailrelay-test.sh_} (100%) mode change 100755 => 100644 rename bin/{emailrelay.sh => emailrelay.sh_} (100%) mode change 100755 => 100644 rename bin/{txt2html.sh => txt2html.sh_} (96%) mode change 100755 => 100644 delete mode 100644 lib/gcc2.95/exception diff --git a/ChangeLog b/ChangeLog index 3caad0d..c6b2ad8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,18 @@ Change Log ========== +0.9.1 -> 0.9.2 +-------------- +* Better autoconf detection. (Now builds on all SourceForge's + compile-farm environments, including FreeBSD and Solaris+gcc.) +* Workround for FreeBSD uname() feature. +* Added missing .sh_ files to the distribution. +* Fixed a benign directory iterator bug. +* Use of gcc's "exception" header. + 0.9 -> 0.9.1 ------------ -Improved documentation from doxygen. -More complete use of namespaces. -Experimental compile-time support for IPv6. +* Improved documentation from doxygen. +* More complete use of namespaces. +* Experimental compile-time support for IPv6. diff --git a/Makefile.in b/Makefile.in index 471f459..dfdae08 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,10 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ diff --git a/bin/Makefile.am b/bin/Makefile.am index abf7b0e..5e910cb 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,7 +1,7 @@ noinst_SCRIPTS = emailrelay-filter.sh emailrelay-test.sh libexec_SCRIPTS = emailrelay.sh pkgdata_DATA = emailrelay-notify.sh emailrelay-deliver.sh -EXTRA_DIST = txt2html.sh $(noinst_SCRIPTS) $(libexec_SCRIPTS) $(pkgdata_DATA) +EXTRA_DIST = emailrelay-filter.sh_ emailrelay-test.sh_ emailrelay.sh_ txt2html.sh_ emailrelay-notify.sh_ emailrelay-deliver.sh_ CLEANFILES = $(noinst_SCRIPTS) $(libexec_SCRIPTS) $(pkgdata_DATA) TESTS = emailrelay-test.sh SUFFIXES = .sh_ .sh diff --git a/bin/Makefile.in b/bin/Makefile.in index a8ffb1e..47248e0 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -57,10 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -69,7 +72,7 @@ VERSION = @VERSION@ noinst_SCRIPTS = emailrelay-filter.sh emailrelay-test.sh libexec_SCRIPTS = emailrelay.sh pkgdata_DATA = emailrelay-notify.sh emailrelay-deliver.sh -EXTRA_DIST = txt2html.sh $(noinst_SCRIPTS) $(libexec_SCRIPTS) $(pkgdata_DATA) +EXTRA_DIST = emailrelay-filter.sh_ emailrelay-test.sh_ emailrelay.sh_ txt2html.sh_ emailrelay-notify.sh_ emailrelay-deliver.sh_ CLEANFILES = $(noinst_SCRIPTS) $(libexec_SCRIPTS) $(pkgdata_DATA) TESTS = emailrelay-test.sh SUFFIXES = .sh_ .sh diff --git a/bin/emailrelay-deliver.sh b/bin/emailrelay-deliver.sh_ old mode 100755 new mode 100644 similarity index 100% rename from bin/emailrelay-deliver.sh rename to bin/emailrelay-deliver.sh_ diff --git a/bin/emailrelay-filter.sh b/bin/emailrelay-filter.sh_ old mode 100755 new mode 100644 similarity index 100% rename from bin/emailrelay-filter.sh rename to bin/emailrelay-filter.sh_ diff --git a/bin/emailrelay-notify.sh b/bin/emailrelay-notify.sh_ old mode 100755 new mode 100644 similarity index 100% rename from bin/emailrelay-notify.sh rename to bin/emailrelay-notify.sh_ diff --git a/bin/emailrelay-test.sh b/bin/emailrelay-test.sh_ old mode 100755 new mode 100644 similarity index 100% rename from bin/emailrelay-test.sh rename to bin/emailrelay-test.sh_ diff --git a/bin/emailrelay.sh b/bin/emailrelay.sh_ old mode 100755 new mode 100644 similarity index 100% rename from bin/emailrelay.sh rename to bin/emailrelay.sh_ diff --git a/bin/txt2html.sh b/bin/txt2html.sh_ old mode 100755 new mode 100644 similarity index 96% rename from bin/txt2html.sh rename to bin/txt2html.sh_ index ee487e1..695ed61 --- a/bin/txt2html.sh +++ b/bin/txt2html.sh_ @@ -21,8 +21,19 @@ # # txt2html.sh # +# usage: txt2html.sh [-a ] +# awk="awk" +if test "${1}" = "-a" +then + shift + if test "${1}" != "" + then + awk="${1}" + fi + shift +fi file="${1}" if test "${file}" = "" diff --git a/config.h.in b/config.h.in index 04f46c4..c18051a 100644 --- a/config.h.in +++ b/config.h.in @@ -1,8 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* Define to `unsigned' if doesn't define. */ -#undef size_t - /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -12,9 +9,6 @@ /* Define if you have the glob function. */ #undef HAVE_GLOB -/* Define if you have the socket function. */ -#undef HAVE_SOCKET - /* Define if you have the header file. */ #undef HAVE_DIRENT_H @@ -39,3 +33,9 @@ /* Version number of package */ #undef VERSION +/* have reentrant localtime */ +#undef HAVE_LOCALTIME_R + +/* have reentrant gmtime */ +#undef HAVE_GMTIME_R + diff --git a/configure b/configure index 6b3426f..ca82fce 100755 --- a/configure +++ b/configure @@ -691,7 +691,7 @@ fi PACKAGE=emailrelay -VERSION=0.9.1 +VERSION=0.9.2 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; } @@ -776,18 +776,11 @@ fi -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 - # 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:791: checking for $ac_word" >&5 +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 else @@ -817,7 +810,7 @@ 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:821: checking for $ac_word" >&5 +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 else @@ -868,7 +861,7 @@ fi # 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:872: checking for $ac_word" >&5 +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 else @@ -900,7 +893,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -911,12 +904,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 915 "configure" +#line 908 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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 @@ -930,24 +923,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* -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 +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_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:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +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 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:951: checking whether we are using GNU C" >&5 +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 else @@ -956,7 +949,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure: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 @@ -975,7 +968,7 @@ 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:979: checking whether ${CC-cc} accepts -g" >&5 +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 else @@ -1011,7 +1004,7 @@ 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:1015: checking for $ac_word" >&5 +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 else @@ -1043,7 +1036,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1047: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1040: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1054,12 +1047,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1058 "configure" +#line 1051 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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 @@ -1073,24 +1066,24 @@ else ac_cv_prog_cxx_works=no fi rm -fr conftest* -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 +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:1089: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +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:1094: checking whether we are using GNU C++" >&5 +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 @@ -1099,7 +1092,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1118,7 +1111,7 @@ 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:1122: checking whether ${CXX-g++} accepts -g" >&5 +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 else @@ -1152,7 +1145,7 @@ 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:1156: checking for $ac_word" >&5 +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 else @@ -1191,7 +1184,7 @@ fi # 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:1195: checking for a BSD compatible install" >&5 +echo "configure:1188: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1243,10 +1236,112 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' 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. +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 +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" +fi +fi +AWK="$ac_cv_prog_AWK" +if test -n "$AWK"; then + echo "$ac_t""$AWK" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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. +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 +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" +fi +fi +MAKE="$ac_cv_prog_MAKE" +if test -n "$MAKE"; then + echo "$ac_t""$MAKE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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. +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 +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" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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:1250: checking for $ac_word" >&5 +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 else @@ -1275,7 +1370,7 @@ 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:1279: checking for $ac_word" >&5 +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 else @@ -1302,27 +1397,161 @@ else 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 -echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1308: 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 "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 else - 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 - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < conftest.$ac_ext < +/* 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* + ac_cv_search_gethostbyname="none required" +else + echo "configure: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_gethostbyname="-l$i" +break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +LIBS="$ac_func_search_save_LIBS" +fi + +echo "$ac_t""$ac_cv_search_gethostbyname" 1>&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 +else + ac_func_search_save_LIBS="$LIBS" +ac_cv_search_connect="no" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_connect="none required" +else + echo "configure: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_connect="-l$i" +break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +LIBS="$ac_func_search_save_LIBS" +fi + +echo "$ac_t""$ac_cv_search_connect" 1>&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 +# 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 +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" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < +Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (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 : @@ -1331,28 +1560,62 @@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - CXXCPP=/lib/cpp + 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 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 +rm -f conftest* fi -CXXCPP="$ac_cv_prog_CXXCPP" -echo "$ac_t""$CXXCPP" 1>&6 +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 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1351: checking for ANSI C header files" >&5 +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 else cat > conftest.$ac_ext < #include @@ -1360,7 +1623,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (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* @@ -1377,7 +1640,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1395,7 +1658,7 @@ 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 < EOF @@ -1416,11 +1679,8 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -1430,7 +1690,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +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 : else @@ -1458,12 +1718,12 @@ 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:1462: checking for $ac_hdr that defines DIR" >&5 +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 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1471,7 +1731,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +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" else @@ -1496,7 +1756,7 @@ 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:1500: checking for opendir in -ldir" >&5 +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 @@ -1504,12 +1764,9 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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" else @@ -1540,7 +1797,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1544: checking for opendir in -lx" >&5 +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 @@ -1548,12 +1805,9 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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" else @@ -1585,12 +1839,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1589: checking whether time.h and sys/time.h may both be included" >&5 +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 else cat > conftest.$ac_ext < #include @@ -1599,7 +1853,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1623,17 +1877,17 @@ for ac_hdr 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:1627: checking for $ac_hdr" >&5 +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 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (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* @@ -1663,17 +1917,17 @@ for ac_hdr 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:1667: checking for $ac_hdr" >&5 +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 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (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* @@ -1699,56 +1953,20 @@ else fi done -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1704: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes -else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned -EOF - -fi - for ac_func in glob do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1739: checking for $ac_func" >&5 +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 else cat > conftest.$ac_ext < /* 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(); @@ -1766,7 +1984,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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" else @@ -1790,64 +2008,37 @@ else fi done -for ac_func in socket -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1797: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < conftest.$ac_ext < -/* 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() { - -/* 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(); -#endif - -; return 0; } +#include EOF -if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "localtime_r" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + cat >> confdefs.h <<\EOF +#define HAVE_LOCALTIME_R 1 +EOF + fi rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h < conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "gmtime_r" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define HAVE_GMTIME_R 1 EOF - -else - echo "$ac_t""no" 1>&6 -fi -done +fi +rm -f conftest* + +SET_MAKE="" trap '' 1 2 15 cat > confcache <<\EOF @@ -1996,9 +2187,12 @@ 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%@CXXCPP@%$CXXCPP%g +s%@CPP@%$CPP%g CEOF EOF @@ -2220,3 +2414,4 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + diff --git a/configure.in b/configure.in index 71898b7..f3a62e0 100644 --- a/configure.in +++ b/configure.in @@ -18,29 +18,50 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. dnl dnl === dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/main/gsmtp.h) -AM_INIT_AUTOMAKE(emailrelay,0.9.1) -AM_CONFIG_HEADER(config.h) -AC_LANG_CPLUSPLUS -dnl Checks for programs. +AC_INIT(src/main/gsmtp.h) +AM_INIT_AUTOMAKE(emailrelay,0.9.2) +AM_CONFIG_HEADER(config.h) + +dnl === +dnl check for programs... +dnl AC_PROG_CC AC_PROG_CXX AC_PROG_RANLIB AC_PROG_INSTALL +AC_PROG_AWK +AC_CHECK_PROGS(MAKE,make gmake) +AC_CHECK_PROGS(AR,ar gar) AC_CHECK_PROG(HAVE_DOXYGEN,doxygen,yes) AC_CHECK_PROG(HAVE_MAN2HTML,man2html,yes) -dnl Checks for libraries. +dnl === +dnl check for libraries... +dnl +AC_LANG_C +AC_SEARCH_LIBS(gethostbyname,nsl) +AC_SEARCH_LIBS(connect,socket) -dnl Checks for header files, functions and typedefs +dnl === +dnl check for header files, functions and typedefs... +dnl AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(sys/time.h) -AC_TYPE_SIZE_T AC_CHECK_FUNCS(glob) -AC_CHECK_FUNCS(socket) +dnl check for *_r() declarations -- using ac_check_funcs +dnl is no good here since they may be in the library but +dnl not the header (depending on preprocessor switches) +AC_EGREP_HEADER(localtime_r,time.h,AC_DEFINE(HAVE_LOCALTIME_R,1,have reentrant localtime)) +AC_EGREP_HEADER(gmtime_r,time.h,AC_DEFINE(HAVE_GMTIME_R,1,have reentrant gmtime)) +dnl attempt to fix recursive makes where make is gmake -- may break something else +SET_MAKE="" +dnl === +dnl generate files... +dnl AC_OUTPUT(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) + diff --git a/doc/Makefile.am b/doc/Makefile.am index 4c118be..e7306c8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,30 +5,32 @@ CLEANFILES = $(pkgdata_DATA) $(noinst_SCRIPTS) html SUFFIXES = .txt .html -filter=$(srcdir)/../bin/emailrelay-filter.sh -converter=$(srcdir)/../bin/txt2html.sh +filter=$(top_builddir)/bin/emailrelay-filter.sh +filter_src=$(top_srcdir)/bin/emailrelay-filter.sh_ +converter=$(top_builddir)/bin/txt2html.sh +converter_src=$(top_srcdir)/bin/txt2html.sh_ .txt.html: - $(converter) $< > $*.html + $(converter) -a "$(AWK)" $< > $*.html .dox: $(filter) - if test "$(HAVE_DOXYGEN)" = "yes" ; then cat $(top_srcdir)/src/main/doxygen.cfg | sed "s:__TOP__:$(top_srcdir):g" | doxygen - && touch .dox ; else echo no doxygen ; fi + if test "$(HAVE_DOXYGEN)" = "yes" ; then cat $(top_srcdir)/src/main/doxygen.cfg | sed "s:__TOP_SRC__:$(top_srcdir):g" | sed "s:__TOP_BUILD__:$(top_builddir):g" | doxygen - && touch .dox ; else echo no doxygen ; fi man.html: emailrelay.1 if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html emailrelay.1 > man.html ; else echo no man2html ; fi -$(filter): $(filter)_ - @cp $(filter)_ $(filter) - @chmod ugo+x $(filter) +$(filter): $(filter_src) + cp $< $(filter) + chmod ugo+x $(filter) -$(converter): $(converter)_ - @cp $(converter)_ $(converter) - @chmod ugo+x $(converter) +$(converter): $(converter_src) + cp $< $(converter) + chmod ugo+x $(converter) developer.html reference.html userguide.html: $(converter) readme.html: $(top_srcdir)/README $(converter) - $(converter) $(top_srcdir)/README > readme.html + $(converter) -a "$(AWK)" $(top_srcdir)/README > readme.html install-data-local: $(mkinstalldirs) $(destdir)$(mandir)/man1 diff --git a/doc/Makefile.in b/doc/Makefile.in index 0eb93b1..6c8e3bc 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -57,10 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -73,8 +76,10 @@ CLEANFILES = $(pkgdata_DATA) $(noinst_SCRIPTS) html SUFFIXES = .txt .html -filter = $(srcdir)/../bin/emailrelay-filter.sh -converter = $(srcdir)/../bin/txt2html.sh +filter = $(top_builddir)/bin/emailrelay-filter.sh +filter_src = $(top_srcdir)/bin/emailrelay-filter.sh_ +converter = $(top_builddir)/bin/txt2html.sh +converter_src = $(top_srcdir)/bin/txt2html.sh_ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -206,26 +211,26 @@ maintainer-clean .txt.html: - $(converter) $< > $*.html + $(converter) -a "$(AWK)" $< > $*.html .dox: $(filter) - if test "$(HAVE_DOXYGEN)" = "yes" ; then cat $(top_srcdir)/src/main/doxygen.cfg | sed "s:__TOP__:$(top_srcdir):g" | doxygen - && touch .dox ; else echo no doxygen ; fi + if test "$(HAVE_DOXYGEN)" = "yes" ; then cat $(top_srcdir)/src/main/doxygen.cfg | sed "s:__TOP_SRC__:$(top_srcdir):g" | sed "s:__TOP_BUILD__:$(top_builddir):g" | doxygen - && touch .dox ; else echo no doxygen ; fi man.html: emailrelay.1 if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html emailrelay.1 > man.html ; else echo no man2html ; fi -$(filter): $(filter)_ - @cp $(filter)_ $(filter) - @chmod ugo+x $(filter) +$(filter): $(filter_src) + cp $< $(filter) + chmod ugo+x $(filter) -$(converter): $(converter)_ - @cp $(converter)_ $(converter) - @chmod ugo+x $(converter) +$(converter): $(converter_src) + cp $< $(converter) + chmod ugo+x $(converter) developer.html reference.html userguide.html: $(converter) readme.html: $(top_srcdir)/README $(converter) - $(converter) $(top_srcdir)/README > readme.html + $(converter) -a "$(AWK)" $(top_srcdir)/README > readme.html install-data-local: $(mkinstalldirs) $(destdir)$(mandir)/man1 diff --git a/doc/userguide.txt b/doc/userguide.txt index 4fa0368..f3225fd 100644 --- a/doc/userguide.txt +++ b/doc/userguide.txt @@ -53,8 +53,8 @@ need to store mail while away from the network. The source code for E-MailRelay is well-structured, portable ANSI C++, without any thrid-party library dependencies. It could therefore be the basis for other SMTP -projects such as, for example, a protocol bridge between SMTP and proprietary mail -transfer protocols used in private e-mail networks. +projects such as, for example, an anonymising remailer or a protocol bridge between +SMTP and proprietary mail transfer protocols used in private e-mail networks. Running E-MailRelay ------------------- diff --git a/lib/Makefile.in b/lib/Makefile.in index 0b0dace..c666021 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -57,10 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ diff --git a/lib/gcc2.95/Makefile.am b/lib/gcc2.95/Makefile.am index af457e2..80495a7 100644 --- a/lib/gcc2.95/Makefile.am +++ b/lib/gcc2.95/Makefile.am @@ -18,5 +18,5 @@ # # === -EXTRA_DIST = exception iostream limits sstream xlocale +EXTRA_DIST = iostream limits sstream xlocale diff --git a/lib/gcc2.95/Makefile.in b/lib/gcc2.95/Makefile.in index 889ce4d..500f172 100644 --- a/lib/gcc2.95/Makefile.in +++ b/lib/gcc2.95/Makefile.in @@ -77,16 +77,19 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -EXTRA_DIST = exception iostream limits sstream xlocale +EXTRA_DIST = iostream limits sstream xlocale mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = diff --git a/lib/gcc2.95/exception b/lib/gcc2.95/exception deleted file mode 100644 index 120c6e9..0000000 --- a/lib/gcc2.95/exception +++ /dev/null @@ -1,37 +0,0 @@ -// -// 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. -// -// === -// -// exception -// - -#ifndef G_STD_EXCEPTION -#define G_STD_EXCEPTION - -namespace std -{ - class exception - { - public: - virtual const char * what() const = 0 ; - } ; -} ; - -#endif - diff --git a/lib/msvc6.0/Makefile.in b/lib/msvc6.0/Makefile.in index 55048fb..dacf9fe 100644 --- a/lib/msvc6.0/Makefile.in +++ b/lib/msvc6.0/Makefile.in @@ -77,10 +77,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ diff --git a/lib/msvc6.0/cstdio b/lib/msvc6.0/cstdio index f6a3fe7..b4a4745 100644 --- a/lib/msvc6.0/cstdio +++ b/lib/msvc6.0/cstdio @@ -29,6 +29,8 @@ namespace std { using ::remove ; using ::rename ; + using ::sscanf ; + using ::sprintf ; } ; #endif diff --git a/src/Makefile.in b/src/Makefile.in index 945f528..d898f7f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -57,10 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ diff --git a/src/glib/Makefile.in b/src/glib/Makefile.in index d38499a..b1abec2 100644 --- a/src/glib/Makefile.in +++ b/src/glib/Makefile.in @@ -77,10 +77,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -107,7 +110,6 @@ libglib_a_OBJECTS = garg.o garg_unix.o gdaemon_unix.o gdate.o \ gdatetime.o gdatetime_unix.o gdirectory.o gdirectory_unix.o \ gexception.o gfile.o gfile_unix.o gfs_unix.o ggetopt.o glog.o \ glogoutput.o glogoutput_unix.o gpath.o gpid_unix.o gstr.o gtime.o -AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -216,6 +218,82 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +garg.o: garg.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits garg.h gpath.h gstrings.h gstr.h \ + gexception.h gdebug.h glogoutput.h glog.h gassert.h +garg_unix.o: garg_unix.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits garg.h \ + gdebug.h glogoutput.h glog.h gassert.h +gdaemon_unix.o: gdaemon_unix.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdaemon.h \ + gexception.h gpath.h gstrings.h gpid.h +gdate.o: gdate.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits gdate.h gdatetime.h gexception.h \ + gdebug.h glogoutput.h glog.h gassert.h +gdatetime.o: gdatetime.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdatetime.h \ + gexception.h gstr.h gstrings.h gassert.h glogoutput.h glog.h +gdatetime_unix.o: gdatetime_unix.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gdatetime.h \ + gexception.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 +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 +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 +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 +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 +ggetopt.o: ggetopt.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits glog.h gstrings.h gstr.h gexception.h \ + ggetopt.h garg.h gassert.h glogoutput.h gdebug.h +glog.o: glog.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits glog.h glogoutput.h +glogoutput.o: glogoutput.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glogoutput.h \ + glog.h +glogoutput_unix.o: glogoutput_unix.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glogoutput.h \ + glog.h +gpath.o: gpath.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits gpath.h gstrings.h gfs.h gstr.h \ + gexception.h gdebug.h glogoutput.h glog.h gassert.h +gpid_unix.o: gpid_unix.cpp gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits gpid.h +gstr.o: gstr.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits gstr.h gexception.h gstrings.h \ + gdebug.h glogoutput.h glog.h gassert.h +gtime.o: gtime.cpp gdef.h ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits gtime.h gexception.h gdatetime.h \ + gassert.h glogoutput.h glog.h info-am: info: info-am diff --git a/src/glib/garg.h b/src/glib/garg.h index 7afdb56..1e81934 100644 --- a/src/glib/garg.h +++ b/src/glib/garg.h @@ -61,11 +61,11 @@ public: ~Arg() ; // Destructor. - unsigned int c() const ; + size_t c() const ; // Returns the number of tokens in the // command line, including the program // name. - + std::string v( size_t i ) const ; // Returns the i'th argument. // Precondition: i < c() diff --git a/src/glib/gdatetime.h b/src/glib/gdatetime.h index f2620dc..a88bdbf 100644 --- a/src/glib/gdatetime.h +++ b/src/glib/gdatetime.h @@ -24,7 +24,6 @@ #ifndef G_DATE_TIME_H #define G_DATE_TIME_H -#include #include "gdef.h" #include "gexception.h" #include @@ -71,9 +70,6 @@ public: // Uses the five-character format "+/-hhmm". // See also RFC2822. - static void tzset() ; - // Calls std::tzset() (portably). Used for testing. - private: static bool equivalent( EpochTime , const BrokenDownTime & ) ; static bool same( const BrokenDownTime & , const BrokenDownTime & ) ; diff --git a/src/glib/gdatetime_unix.cpp b/src/glib/gdatetime_unix.cpp index d396945..20b43d9 100644 --- a/src/glib/gdatetime_unix.cpp +++ b/src/glib/gdatetime_unix.cpp @@ -24,11 +24,6 @@ #include "gdef.h" #include "gdatetime.h" -void G::DateTime::tzset() -{ - std::tzset() ; -} - std::tm * G::DateTime::gmtime_r( const std::time_t * t , std::tm * p ) { return std::gmtime_r(t,p) ; diff --git a/src/glib/gdatetime_win32.cpp b/src/glib/gdatetime_win32.cpp index 0c95d5f..f742895 100644 --- a/src/glib/gdatetime_win32.cpp +++ b/src/glib/gdatetime_win32.cpp @@ -24,11 +24,6 @@ #include "gdef.h" #include "gdatetime.h" -void G::DateTime::tzset() -{ - std::_tzset() ; -} - struct std::tm * G::DateTime::gmtime_r( const time_t * t , struct std::tm * p ) { *p = *(std::gmtime(t)) ; diff --git a/src/glib/gdef.h b/src/glib/gdef.h index 149b079..f4d6f3d 100644 --- a/src/glib/gdef.h +++ b/src/glib/gdef.h @@ -32,43 +32,36 @@ #ifndef G_DEF_H #define G_DEF_H - // Autoconf stuff (mostly commented out) + // Autoconf stuff // #if HAVE_CONFIG_H - #if 0 - #include - #if HAVE_UNISTD_H - #include - #include - #endif + #include - #if HAVE_DIRENT_H - #include - #else - #define dirent direct - #if HAVE_SYS_NDIR_H - #include - #endif - #if HAVE_SYS_DIR_H - #include - #endif - #if HAVE_NDIR_H - #include - #endif - #endif - - #if TIME_WITH_SYS_TIME - #include - #include - #else - #if HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif + #if ! HAVE_GMTIME_R + #include + namespace std + { + inline struct tm * gmtime_r( const time_t * tp , struct tm * tm_p ) + { + * tm_p = * gmtime( tp ) ; + return tm_p ; + } + } ; #endif + + #if ! HAVE_LOCALTIME_R + #include + namespace std + { + inline struct tm * localtime_r( const time_t * tp , struct tm * tm_p ) + { + * tm_p = * localtime( tp ) ; + return tm_p ; + } + } ; + #endif + #if ! defined( G_UNIX ) #define G_UNIX #endif @@ -118,7 +111,7 @@ #include #else #include - #include + #include // ?? #endif // Restore complier error handling @@ -163,7 +156,7 @@ // Define missing standard types // #if defined( G_WINDOWS ) - typedef int ssize_t ; // (should be in sys/types.h) + typedef int ssize_t ; #endif // STL portability macros diff --git a/src/glib/gdirectory.h b/src/glib/gdirectory.h index 481a166..061770d 100644 --- a/src/glib/gdirectory.h +++ b/src/glib/gdirectory.h @@ -96,7 +96,7 @@ private: class G::DirectoryIterator { public: - explicit DirectoryIterator( const Directory &dir , const char *wc = NULL ) ; + explicit DirectoryIterator( const Directory &dir , const std::string & wc = std::string() ) ; // Constructor taking a directory reference // and an optional wildcard specification. diff --git a/src/glib/gdirectory_unix.cpp b/src/glib/gdirectory_unix.cpp index 7e46b7c..3f39acf 100644 --- a/src/glib/gdirectory_unix.cpp +++ b/src/glib/gdirectory_unix.cpp @@ -100,7 +100,7 @@ private: // === -G::DirectoryIterator::DirectoryIterator( const Directory &dir , const char *wc ) +G::DirectoryIterator::DirectoryIterator( const Directory &dir , const std::string & wc ) { m_imp = new DirectoryIteratorImp( dir , wc ) ; } diff --git a/src/glib/gdirectory_win32.cpp b/src/glib/gdirectory_win32.cpp index c06bee5..1169ccc 100644 --- a/src/glib/gdirectory_win32.cpp +++ b/src/glib/gdirectory_win32.cpp @@ -60,7 +60,7 @@ private: bool m_special ; // if wc = ".." -- FindFirstFile returns ".."'s proper name -- this class returns ".." public: - DirectoryIteratorImp( const Directory &dir , const char *wildcard ) ; + DirectoryIteratorImp( const Directory &dir , const std::string & wildcard ) ; ~DirectoryIteratorImp() ; bool isDir() const ; bool more() ; @@ -77,7 +77,7 @@ private: // === -G::DirectoryIterator::DirectoryIterator( const Directory &dir , const char *wc ) +G::DirectoryIterator::DirectoryIterator( const Directory &dir , const std::string & wc ) { m_imp = new DirectoryIteratorImp( dir , wc ) ; } @@ -125,17 +125,13 @@ G::DirectoryIterator::~DirectoryIterator() // === G::DirectoryIteratorImp::DirectoryIteratorImp( const Directory & dir , - const char *wildcard ) : + const std::string & wildcard ) : m_dir(dir) , m_error(false) , m_first(true) , m_special(false) { - if( wildcard == NULL ) - { - wildcard = "*.*" ; - } - else if( std::string(wildcard) == ".." ) + if( std::string(wildcard) == ".." ) { G_DEBUG( "DirectoryIteratorImp: special work-round for .." ) ; m_special = true ; @@ -143,7 +139,7 @@ G::DirectoryIteratorImp::DirectoryIteratorImp( const Directory & dir , } Path wild_path( m_dir.path() ) ; - wild_path.pathAppend( wildcard ) ; + wild_path.pathAppend( wildcard.empty() ? std::string("*.*") : wildcard ) ; G_DEBUG( "G::DirectoryIteratorImp::ctor: FindFirstFile(\"" << wild_path << "\")" ) ; diff --git a/src/gnet/Makefile.am b/src/gnet/Makefile.am index 5634bfe..4bf2ac9 100644 --- a/src/gnet/Makefile.am +++ b/src/gnet/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST=gclient_win32.cpp \ gresolve_win32.cpp \ gsocket_win32.cpp \ gwinsock.cpp -INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib +INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib noinst_LIBRARIES = libgnet.a libgnet_a_SOURCES = gaddress_ipv4.cpp \ gclient.cpp \ diff --git a/src/gnet/Makefile.in b/src/gnet/Makefile.in index 5d6ac1b..11f988e 100644 --- a/src/gnet/Makefile.in +++ b/src/gnet/Makefile.in @@ -77,10 +77,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -88,7 +91,7 @@ VERSION = @VERSION@ EXTRA_DIST = gclient_win32.cpp gdescriptor_win32.cpp gevent_win32.cpp glocal_win32.cpp grequest.cpp gresolve_win32.cpp gsocket_win32.cpp gwinsock.cpp -INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib +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 gdescriptor_unix.cpp gevent.cpp gevent_unix.cpp geventserver.cpp glinebuffer.cpp glocal_unix.cpp gresolve.cpp gresolve_ipv4.cpp gresolve_unix.cpp gselect.cpp gserver.cpp gsocket.cpp gsocket_unix.cpp gaddress.h gclient.h gdescriptor.h gevent.h geventserver.h glinebuffer.h glocal.h gnet.h grequest.h gresolve.h gselect.h gserver.h gsocket.h gwinsock.h @@ -107,7 +110,6 @@ libgnet_a_OBJECTS = gaddress_ipv4.o gclient.o gclient_unix.o \ gdescriptor_unix.o gevent.o gevent_unix.o geventserver.o glinebuffer.o \ glocal_unix.o gresolve.o gresolve_ipv4.o gresolve_unix.o gselect.o \ gserver.o gsocket.o gsocket_unix.o -AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -216,6 +218,104 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +gaddress_ipv4.o: gaddress_ipv4.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 \ + ../../src/glib/gconvert.h ../../src/glib/gstrings.h \ + ../../src/glib/gstr.h ../../src/glib/gassert.h \ + ../../src/glib/glogoutput.h ../../src/glib/glog.h \ + ../../src/glib/gdebug.h +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 gclient.h \ + ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ + ../../src/glib/glog.h ../../src/glib/gassert.h +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 gsocket.h \ + gevent.h gdescriptor.h +gdescriptor_unix.o: gdescriptor_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 gdescriptor.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 \ + ../../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 +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 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 \ + glinebuffer.h ../../src/glib/gstrings.h ../../src/glib/gdebug.h \ + ../../src/glib/glogoutput.h ../../src/glib/glog.h \ + ../../src/glib/gassert.h +glocal_unix.o: glocal_unix.cpp ../../src/glib/gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits glocal.h \ + gnet.h gaddress.h ../../src/glib/gexception.h gresolve.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 +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 \ + gnet.h gaddress.h ../../src/glib/gexception.h +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 +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 +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 gselect.h ../../src/glib/gdebug.h \ + ../../src/glib/glogoutput.h ../../src/glib/glog.h \ + ../../src/glib/gassert.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 +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/glogoutput.h ../../src/glib/glog.h \ + ../../src/glib/gassert.h info-am: info: info-am diff --git a/src/gnet/gaddress_ipv4.cpp b/src/gnet/gaddress_ipv4.cpp index 12d1399..8cbcaab 100644 --- a/src/gnet/gaddress_ipv4.cpp +++ b/src/gnet/gaddress_ipv4.cpp @@ -169,7 +169,7 @@ bool GNet::AddressImp::setAddress( const std::string & display_string , std::str void GNet::AddressImp::setPort( unsigned int port ) { G_ASSERT( validPort(port) ) ; - const in_port_t in_port = ::GConvert(port) ; + const g_port_t in_port = ::GConvert(port) ; m_inet.sin_port = htons( in_port ) ; } diff --git a/src/gnet/glocal_unix.cpp b/src/gnet/glocal_unix.cpp index 37205eb..bb03e83 100644 --- a/src/gnet/glocal_unix.cpp +++ b/src/gnet/glocal_unix.cpp @@ -31,8 +31,15 @@ std::string GNet::Local::hostname() { struct ::utsname info ; int rc = ::uname( &info ) ; - if( rc == -1 ) throw Error("uname") ; - return std::string(info.nodename) ; + if( rc == -1 ) + throw Error("uname") ; + + std::string name = std::string(info.nodename) ; + size_t pos = name.find('.') ; + if( pos != std::string::npos ) + name = name.substr( 0U , pos ) ; + + return name ; } std::string GNet::Local::domainname() diff --git a/src/gnet/gnet.h b/src/gnet/gnet.h index 1b856d4..93e750b 100644 --- a/src/gnet/gnet.h +++ b/src/gnet/gnet.h @@ -38,9 +38,10 @@ #else #include typedef int socklen_t ; - typedef unsigned short in_port_t ; #endif +typedef unsigned short g_port_t ; // ('in_port_t' is not defined on many systems) + #ifndef INADDR_NONE #define INADDR_NONE 0xffffffff // (should be in netinet/in.h) #endif diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 0d3bf9e..561c0e8 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -25,7 +25,7 @@ AM_INSTALL_PROGRAM_FLAGS=-s localstatedir = ${prefix}/var/spool/emailrelay EXTRA_DIST=gmessagestore_win32.cpp emailrelay.dsp empty_file doxygen.cfg -INCLUDES = -I$(top_srcdir)/lib/gcc2.95 -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gnet +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 diff --git a/src/main/Makefile.in b/src/main/Makefile.in index b412f81..01730ef 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -78,10 +78,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -294,6 +297,104 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +gadminserver.o: gadminserver.cpp ../../src/glib/gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \ + ../../src/gnet/gnet.h gsmtp.h ../../src/glib/glog.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/gselect.h \ + ../../src/gnet/glinebuffer.h ../../src/glib/gstrings.h \ + gserverprotocol.h gprotocolmessage.h gsmtpclient.h \ + ../../src/gnet/gclient.h gclientprotocol.h gmessagestore.h \ + ../../src/glib/gpath.h ../../src/glib/gstr.h \ + ../../src/glib/gmemory.h +gclientprotocol.o: gclientprotocol.cpp ../../src/glib/gdef.h \ + ../../config.h ../../lib/gcc2.95/iostream \ + ../../lib/gcc2.95/sstream ../../lib/gcc2.95/xlocale \ + ../../lib/gcc2.95/limits ../../src/gnet/gnet.h gsmtp.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 \ + ../../src/gnet/gresolve.h ../../src/glib/gassert.h \ + ../../src/glib/glogoutput.h +gmessagestore.o: gmessagestore.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 \ + ../../src/glib/gpid.h ../../src/glib/gdirectory.h \ + ../../src/glib/gpath.h ../../src/glib/gstrings.h \ + gmessagestore.h ../../src/glib/gexception.h \ + ../../src/glib/gmemory.h ../../src/glib/gfile.h \ + ../../src/glib/gstr.h ../../src/glib/gassert.h \ + ../../src/glib/glogoutput.h +gmessagestore_unix.o: gmessagestore_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 ../../src/gnet/gnet.h \ + ../../src/glib/glog.h gmessagestore.h \ + ../../src/glib/gexception.h ../../src/glib/gstrings.h \ + ../../src/glib/gpath.h +gprotocolmessage.o: gprotocolmessage.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 gprotocolmessage.h \ + ../../src/glib/gstrings.h gmessagestore.h \ + ../../src/glib/gexception.h ../../src/glib/gpath.h \ + ../../src/glib/gmemory.h ../../src/glib/gstr.h \ + ../../src/glib/gassert.h ../../src/glib/glogoutput.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 ../../src/glib/gdate.h \ + ../../src/glib/gdatetime.h ../../src/glib/gexception.h \ + ../../src/glib/gdebug.h ../../src/glib/glogoutput.h \ + ../../src/glib/gassert.h ../../src/glib/gtime.h \ + ../../src/glib/gstr.h +gsmtpclient.o: gsmtpclient.cpp ../../src/glib/gdef.h ../../config.h \ + ../../lib/gcc2.95/iostream ../../lib/gcc2.95/sstream \ + ../../lib/gcc2.95/xlocale ../../lib/gcc2.95/limits \ + ../../src/gnet/gnet.h gsmtp.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 gsmtpclient.h \ + ../../src/gnet/glinebuffer.h ../../src/gnet/gclient.h \ + ../../src/gnet/gsocket.h ../../src/gnet/gevent.h \ + ../../src/gnet/gdescriptor.h gclientprotocol.h gmessagestore.h \ + ../../src/gnet/gresolve.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/gselect.h ../../src/gnet/glinebuffer.h \ + ../../src/glib/gstrings.h gserverprotocol.h gprotocolmessage.h \ + ../../src/gnet/glocal.h ../../src/glib/gdebug.h \ + ../../src/glib/glogoutput.h ../../src/glib/gassert.h +mailrelay.o: mailrelay.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/gselect.h ../../src/gnet/glinebuffer.h \ + ../../src/glib/gstrings.h gserverprotocol.h gprotocolmessage.h \ + gsmtpclient.h ../../src/gnet/gclient.h gclientprotocol.h \ + gmessagestore.h ../../src/glib/gpath.h ../../src/glib/garg.h \ + ../../src/glib/gdaemon.h ../../src/glib/gstr.h gadminserver.h \ + ../../src/glib/ggetopt.h ../../src/glib/gdebug.h \ + ../../src/glib/glogoutput.h ../../src/glib/gassert.h +poke.o: poke.c info-am: info: info-am diff --git a/src/main/doxygen.cfg b/src/main/doxygen.cfg index abd1a3e..7fb3cdb 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.1 +PROJECT_NUMBER = 0.9.2 OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English EXTRACT_ALL = YES @@ -18,7 +18,7 @@ FULL_PATH_NAMES = STRIP_FROM_PATH = INTERNAL_DOCS = CLASS_DIAGRAMS = -SOURCE_BROWSER = +SOURCE_BROWSER = YES INLINE_SOURCES = STRIP_CODE_COMMENTS = CASE_SENSE_NAMES = @@ -51,27 +51,27 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = __TOP__/src/glib \ - __TOP__/src/gnet \ - __TOP__/src/main +INPUT = __TOP_SRC__/src/glib \ + __TOP_SRC__/src/gnet \ + __TOP_SRC__/src/main FILE_PATTERNS = *.cpp \ *.h RECURSIVE = YES -EXCLUDE = src/glib/gdef.h \ - src/gnet/gnet.h \ +EXCLUDE = src/glib/gdef.h gdef.h \ + src/gnet/gnet.h gnet.h \ src/win32 \ - src/gnet/resolverd.cpp \ - src/gnet/gwinsock.cpp \ - src/gnet/gwinsock.h \ - src/gnet/gaddress_ipv6.cpp \ - src/gnet/gresolve_ipv6.cpp \ - src/gnet/grequest.cpp \ - src/gnet/grequest.h -EXCLUDE_PATTERNS = */*_win32.* */old/* + src/gnet/resolverd.cpp resolverd.cpp \ + src/gnet/gwinsock.cpp gwinsock.cpp \ + src/gnet/gwinsock.h gwinsock.h \ + src/gnet/gaddress_ipv6.cpp gaddress_ipv6.cpp \ + src/gnet/gresolve_ipv6.cpp gresolve_ipv6.cpp \ + src/gnet/grequest.cpp grequest.cpp \ + src/gnet/grequest.h grequest.h +EXCLUDE_PATTERNS = */*_win32.* */*_ipv6.cpp */old/* */resolverd.cpp EXAMPLE_PATH = EXAMPLE_PATTERNS = IMAGE_PATH = -INPUT_FILTER = __TOP__/bin/emailrelay-filter.sh +INPUT_FILTER = __TOP_BUILD__/bin/emailrelay-filter.sh FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index diff --git a/src/main/mailrelay.cpp b/src/main/mailrelay.cpp index 9eaa551..fe94370 100644 --- a/src/main/mailrelay.cpp +++ b/src/main/mailrelay.cpp @@ -116,7 +116,7 @@ void Main::version() const std::string Main::versionNumber() const { - return "0.9.1" ; + return "0.9.2" ; } std::string Main::smtpIdent() const diff --git a/src/win32/Makefile.in b/src/win32/Makefile.in index 1e99461..238e5cf 100644 --- a/src/win32/Makefile.in +++ b/src/win32/Makefile.in @@ -77,10 +77,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AR = @AR@ +AWK = @AWK@ CC = @CC@ CXX = @CXX@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_MAN2HTML = @HAVE_MAN2HTML@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@