diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/configure.in libesmtp-1.0.3r1/configure.in
--- libesmtp-1.0.3r1-orig/configure.in	2004-04-21 10:21:32.000000000 +0200
+++ libesmtp-1.0.3r1/configure.in	2005-05-26 23:34:19.000000000 +0200
@@ -56,7 +56,7 @@
 dnl Miscellaneous stuff
 dnl #########################################################################
 
-EXTRA_CFLAGS=""
+AM_CFLAGS=""
 case $host_vendor-$host_os in
 sun*)
 	AC_DEFINE(__EXTENSIONS__,1,[Sun's netdb.h needs this for getaddrinfo])
@@ -79,13 +79,13 @@
 	      enable_more_warnings=yes)
 
 if test "$GCC" = "yes" -a "$enable_more_warnings" != "no"; then
-        EXTRA_CFLAGS="$EXTRA_CFLAGS \
+        AM_CFLAGS="$AM_CFLAGS \
         -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
         -Wstrict-prototypes -Wnested-externs -Wpointer-arith \
         -Wbad-function-cast -Wcast-align"
 fi
 if test "$GCC" = "yes" -a "$enable_more_warnings" = "picky"; then
-        EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-builtin -W -Werror -Wwrite-strings \
+        $AM_CFLAGS="$AM_CFLAGS -fno-builtin -W -Werror -Wwrite-strings \
         		-Wcast-qual"
 fi
 
@@ -538,7 +538,7 @@
 dnl #########################################################################
 
 AC_REPLACE_FUNCS(strdup strcasecmp strncasecmp memrchr)
-AC_CHECK_FUNCS(strtol uname gethostname)
+AC_CHECK_FUNCS(strtol uname gethostname snprintf vsnprintf)
 AC_SEARCH_LIBS(socket, socket)
 
 dnl Conditional check for functions needed in threaded code
@@ -582,9 +582,7 @@
 AC_SUBST(DIST_PLUGINS)
 AC_SUBST(LIBTOOL_DEPS)
 AC_SUBST(LIBS)
-AC_SUBST(CFLAGS)
-AC_SUBST(EXTRA_CFLAGS)
-AC_SUBST(CC)
+AC_SUBST(AM_CFLAGS)
 AC_SUBST(RANLIB)
 AC_SUBST(subdirs)
 
diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/crammd5/Makefile.am libesmtp-1.0.3r1/crammd5/Makefile.am
--- libesmtp-1.0.3r1-orig/crammd5/Makefile.am	2001-10-17 11:15:27.000000000 +0200
+++ libesmtp-1.0.3r1/crammd5/Makefile.am	2005-05-26 23:28:15.000000000 +0200
@@ -3,7 +3,6 @@
 libdir = @plugindir@
 
 INCLUDES = -I@srcdir@
-CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
 
 lib_LTLIBRARIES = sasl-cram-md5.la
 
diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/login/Makefile.am libesmtp-1.0.3r1/login/Makefile.am
--- libesmtp-1.0.3r1-orig/login/Makefile.am	2001-10-17 09:18:00.000000000 +0200
+++ libesmtp-1.0.3r1/login/Makefile.am	2005-05-26 23:28:12.000000000 +0200
@@ -5,7 +5,6 @@
 INCLUDES = -I@srcdir@
 
 lib_LTLIBRARIES = sasl-login.la
-CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
 
 sasl_login_la_SOURCES = client-login.c
 sasl_login_la_LDFLAGS = -module -avoid-version
diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/Makefile.am libesmtp-1.0.3r1/Makefile.am
--- libesmtp-1.0.3r1-orig/Makefile.am	2003-01-22 09:45:23.000000000 +0100
+++ libesmtp-1.0.3r1/Makefile.am	2005-05-26 23:28:20.000000000 +0200
@@ -4,7 +4,6 @@
 INCLUDES = -I$(srcdir) $(VERSION_FLAGS)
 SUBDIRS = @subdirs@ @SASL_PLUGINS@
 DIST_SUBDIRS = @subdirs@ @DIST_PLUGINS@
-CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
 
 lib_LTLIBRARIES = libesmtp.la
 
diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/ntlm/Makefile.am libesmtp-1.0.3r1/ntlm/Makefile.am
--- libesmtp-1.0.3r1-orig/ntlm/Makefile.am	2002-05-31 15:35:47.000000000 +0200
+++ libesmtp-1.0.3r1/ntlm/Makefile.am	2005-05-26 23:28:08.000000000 +0200
@@ -3,7 +3,6 @@
 libdir = @plugindir@
 
 INCLUDES = -I@srcdir@
-CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
 
 lib_LTLIBRARIES = sasl-ntlm.la
 
diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/plain/Makefile.am libesmtp-1.0.3r1/plain/Makefile.am
--- libesmtp-1.0.3r1-orig/plain/Makefile.am	2001-10-17 09:18:08.000000000 +0200
+++ libesmtp-1.0.3r1/plain/Makefile.am	2005-05-26 23:28:04.000000000 +0200
@@ -3,7 +3,6 @@
 libdir = @plugindir@
 
 INCLUDES = -I@srcdir@
-CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
 
 lib_LTLIBRARIES = sasl-plain.la