20110127

 - (tim) [configure.ac] Consistent M4 quoting throughout, updated obsolete
   AC_TRY_COMPILE with AC_COMPILE_IFELSE, updated obsolete AC_TRY_LINK with
   AC_LINK_IFELSE, updated obsolete AC_TRY_RUN with AC_RUN_IFELSE, misc white
   space changes for consistency/readability. Makes autoconf 2.68 happy.
   "Nice work" djm

2 files changed, 1198 insertions, 1308 deletions

diff --git a/ChangeLog b/ChangeLog
index 31345b0a..79e93eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 20110127
  - (tim) [config.guess config.sub] Sync with upstream.
+ - (tim) [configure.ac] Consistent M4 quoting throughout, updated obsolete
+   AC_TRY_COMPILE with AC_COMPILE_IFELSE, updated obsolete AC_TRY_LINK with
+   AC_LINK_IFELSE, updated obsolete AC_TRY_RUN with AC_RUN_IFELSE, misc white
+   space changes for consistency/readability. Makes autoconf 2.68 happy.
+   "Nice work" djm
 
 20110125
  - (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c
diff --git a/configure.ac b/configure.ac
index 0c46aebe..c8d90ea0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.470 2011/01/25 01:16:17 djm Exp $
+# $Id: configure.ac,v 1.471 2011/01/26 20:38:58 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -14,9 +14,10 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.470 $)
+AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
+AC_REVISION($Revision: 1.471 $)
 AC_CONFIG_SRCDIR([ssh.c])
+AC_LANG([C])
 
 # local macros
 AC_DEFUN([OPENSSH_CHECK_CFLAG_COMPILE], [{
@@ -24,13 +25,13 @@ AC_DEFUN([OPENSSH_CHECK_CFLAG_COMPILE], [{
 	saved_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $1"
 	AC_COMPILE_IFELSE([void main(void) { return 0; }],
-		[ AC_MSG_RESULT(yes) ],
-		[ AC_MSG_RESULT(no)
+		[ AC_MSG_RESULT([yes]) ],
+		[ AC_MSG_RESULT([no])
 		  CFLAGS="$saved_CFLAGS" ]
 	)
 }])
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
 AC_PROG_CC
 AC_CANONICAL_HOST
 AC_C_BIGENDIAN
@@ -41,22 +42,22 @@ AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_EGREP
-AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(CAT, cat)
-AC_PATH_PROG(KILL, kill)
-AC_PATH_PROGS(PERL, perl5 perl)
-AC_PATH_PROG(SED, sed)
-AC_SUBST(PERL)
-AC_PATH_PROG(ENT, ent)
-AC_SUBST(ENT)
-AC_PATH_PROG(TEST_MINUS_S_SH, bash)
-AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
-AC_PATH_PROG(TEST_MINUS_S_SH, sh)
-AC_PATH_PROG(SH, sh)
-AC_PATH_PROG(GROFF, groff)
-AC_PATH_PROG(NROFF, nroff)
-AC_PATH_PROG(MANDOC, mandoc)
-AC_SUBST(TEST_SHELL,sh)
+AC_PATH_PROG([AR], [ar])
+AC_PATH_PROG([CAT], [cat])
+AC_PATH_PROG([KILL], [kill])
+AC_PATH_PROGS([PERL], [perl5 perl])
+AC_PATH_PROG([SED], [sed])
+AC_SUBST([PERL])
+AC_PATH_PROG([ENT], [ent])
+AC_SUBST([ENT])
+AC_PATH_PROG([TEST_MINUS_S_SH], [bash])
+AC_PATH_PROG([TEST_MINUS_S_SH], [ksh])
+AC_PATH_PROG([TEST_MINUS_S_SH], [sh])
+AC_PATH_PROG([SH], [sh])
+AC_PATH_PROG([GROFF], [groff])
+AC_PATH_PROG([NROFF], [nroff])
+AC_PATH_PROG([MANDOC], [mandoc])
+AC_SUBST([TEST_SHELL], [sh])
 
 dnl select manpage formatter
 if test "x$MANDOC" != "x" ; then
@@ -69,18 +70,18 @@ else
 	AC_MSG_WARN([no manpage formatted found])
 	MANFMT="false"
 fi
-AC_SUBST(MANFMT)
+AC_SUBST([MANFMT])
 
 dnl for buildpkg.sh
-AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd,
+AC_PATH_PROG([PATH_GROUPADD_PROG], [groupadd], [groupadd],
 	[/usr/sbin${PATH_SEPARATOR}/etc])
-AC_PATH_PROG(PATH_USERADD_PROG, useradd, useradd,
+AC_PATH_PROG([PATH_USERADD_PROG], [useradd], [useradd],
 	[/usr/sbin${PATH_SEPARATOR}/etc])
-AC_CHECK_PROG(MAKE_PACKAGE_SUPPORTED, pkgmk, yes, no)
+AC_CHECK_PROG([MAKE_PACKAGE_SUPPORTED], [pkgmk], [yes], [no])
 if test -x /sbin/sh; then
-	AC_SUBST(STARTUP_SCRIPT_SHELL,/sbin/sh)
+	AC_SUBST([STARTUP_SCRIPT_SHELL], [/sbin/sh])
 else
-	AC_SUBST(STARTUP_SCRIPT_SHELL,/bin/sh)
+	AC_SUBST([STARTUP_SCRIPT_SHELL], [/bin/sh])
 fi
 
 # System features
@@ -92,34 +93,34 @@ fi
 
 # Use LOGIN_PROGRAM from environment if possible
 if test ! -z "$LOGIN_PROGRAM" ; then
-	AC_DEFINE_UNQUOTED(LOGIN_PROGRAM_FALLBACK, "$LOGIN_PROGRAM",
+	AC_DEFINE_UNQUOTED([LOGIN_PROGRAM_FALLBACK], ["$LOGIN_PROGRAM"],
 		[If your header files don't define LOGIN_PROGRAM,
 		then use this (detected) from environment and PATH])
 else
 	# Search for login
-	AC_PATH_PROG(LOGIN_PROGRAM_FALLBACK, login)
+	AC_PATH_PROG([LOGIN_PROGRAM_FALLBACK], [login])
 	if test ! -z "$LOGIN_PROGRAM_FALLBACK" ; then
-		AC_DEFINE_UNQUOTED(LOGIN_PROGRAM_FALLBACK, "$LOGIN_PROGRAM_FALLBACK")
+		AC_DEFINE_UNQUOTED([LOGIN_PROGRAM_FALLBACK], ["$LOGIN_PROGRAM_FALLBACK"])
 	fi
 fi
 
-AC_PATH_PROG(PATH_PASSWD_PROG, passwd)
+AC_PATH_PROG([PATH_PASSWD_PROG], [passwd])
 if test ! -z "$PATH_PASSWD_PROG" ; then
-	AC_DEFINE_UNQUOTED(_PATH_PASSWD_PROG, "$PATH_PASSWD_PROG",
+	AC_DEFINE_UNQUOTED([_PATH_PASSWD_PROG], ["$PATH_PASSWD_PROG"],
 		[Full path of your "passwd" program])
 fi
 
 if test -z "$LD" ; then
 	LD=$CC
 fi
-AC_SUBST(LD)
+AC_SUBST([LD])
 
 AC_C_INLINE
 
-AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
+AC_CHECK_DECL([LLONG_MAX], [have_llong_max=1], , [#include <limits.h>])
 
 use_stack_protector=1
-AC_ARG_WITH(stackprotect,
+AC_ARG_WITH([stackprotect],
     [  --without-stackprotect  Don't use compiler's stack protection], [
     if test "x$withval" = "xno"; then
 	use_stack_protector=0
@@ -135,7 +136,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
 	OPENSSH_CHECK_CFLAG_COMPILE([-Wno-pointer-sign])
 	OPENSSH_CHECK_CFLAG_COMPILE([-Wno-unused-result])
 	OPENSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
-	AC_MSG_CHECKING(gcc version)
+	AC_MSG_CHECKING([gcc version])
 	GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'`
 	case $GCC_VER in
 		1.*) no_attrib_nonnull=1 ;;
@@ -145,52 +146,52 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
 		2.*) no_attrib_nonnull=1 ;;
 		*) ;;
 	esac
-	AC_MSG_RESULT($GCC_VER)
+	AC_MSG_RESULT([$GCC_VER])
 
-	AC_MSG_CHECKING(if $CC accepts -fno-builtin-memset)
+	AC_MSG_CHECKING([if $CC accepts -fno-builtin-memset])
 	saved_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fno-builtin-memset"
-	AC_LINK_IFELSE( [AC_LANG_SOURCE([[
-#include <string.h>
-int main(void){char b[10]; memset(b, 0, sizeof(b));}
-		]])],
-		[ AC_MSG_RESULT(yes) ],
-		[ AC_MSG_RESULT(no)
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <string.h> ]],
+			[[ char b[10]; memset(b, 0, sizeof(b)); ]])],
+		[ AC_MSG_RESULT([yes]) ],
+		[ AC_MSG_RESULT([no])
 		  CFLAGS="$saved_CFLAGS" ]
-)
+	)
 
 	# -fstack-protector-all doesn't always work for some GCC versions
 	# and/or platforms, so we test if we can.  If it's not supported
 	# on a given platform gcc will emit a warning so we use -Werror.
 	if test "x$use_stack_protector" = "x1"; then
 	    for t in -fstack-protector-all -fstack-protector; do
-		AC_MSG_CHECKING(if $CC supports $t)
+		AC_MSG_CHECKING([if $CC supports $t])
 		saved_CFLAGS="$CFLAGS"
 		saved_LDFLAGS="$LDFLAGS"
 		CFLAGS="$CFLAGS $t -Werror"
 		LDFLAGS="$LDFLAGS $t -Werror"
 		AC_LINK_IFELSE(
-			[AC_LANG_SOURCE([
-#include <stdio.h>
-int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;}
-			 ])],
-		    [ AC_MSG_RESULT(yes)
+			[AC_LANG_PROGRAM([[ #include <stdio.h> ]],
+			[[
+	char x[256];
+	snprintf(x, sizeof(x), "XXX");
+			 ]])],
+		    [ AC_MSG_RESULT([yes])
 		      CFLAGS="$saved_CFLAGS $t"
 		      LDFLAGS="$saved_LDFLAGS $t"
-		      AC_MSG_CHECKING(if $t works)
+		      AC_MSG_CHECKING([if $t works])
 		      AC_RUN_IFELSE(
-			[AC_LANG_SOURCE([
-#include <stdio.h>
-int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;}
-			])],
-			[ AC_MSG_RESULT(yes)
+			[AC_LANG_PROGRAM([[ #include <stdio.h> ]],
+			[[
+	char x[256];
+	snprintf(x, sizeof(x), "XXX");
+			]])],
+			[ AC_MSG_RESULT([yes])
 			  break ],
-			[ AC_MSG_RESULT(no) ],
+			[ AC_MSG_RESULT([no]) ],
 			[ AC_MSG_WARN([cross compiling: cannot test])
 			  break ]
 		      )
 		    ],
-		    [ AC_MSG_RESULT(no) ]
+		    [ AC_MSG_RESULT([no]) ]
 		)
 		CFLAGS="$saved_CFLAGS"
 		LDFLAGS="$saved_LDFLAGS"
@@ -202,7 +203,7 @@ int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;}
 		unset ac_cv_have_decl_LLONG_MAX
 		saved_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -std=gnu99"
-		AC_CHECK_DECL(LLONG_MAX,
+		AC_CHECK_DECL([LLONG_MAX],
 		    [have_llong_max=1],
 		    [CFLAGS="$saved_CFLAGS"],
 		    [#include <limits.h>]
@@ -211,10 +212,10 @@ int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;}
 fi
 
 if test "x$no_attrib_nonnull" != "x1" ; then
-	AC_DEFINE(HAVE_ATTRIBUTE__NONNULL__, 1, [Have attribute nonnull])
+	AC_DEFINE([HAVE_ATTRIBUTE__NONNULL__], [1], [Have attribute nonnull])
 fi
 
-AC_ARG_WITH(rpath,
+AC_ARG_WITH([rpath],
 	[  --without-rpath         Disable auto-added -R linker paths],
 	[
 		if test "x$withval" = "xno" ; then
@@ -227,7 +228,7 @@ AC_ARG_WITH(rpath,
 )
 
 # Allow user to specify flags
-AC_ARG_WITH(cflags,
+AC_ARG_WITH([cflags],
 	[  --with-cflags           Specify additional flags to pass to compiler],
 	[
 		if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
@@ -236,7 +237,7 @@ AC_ARG_WITH(cflags,
 		fi
 	]
 )
-AC_ARG_WITH(cppflags,
+AC_ARG_WITH([cppflags],
 	[  --with-cppflags         Specify additional flags to pass to preprocessor] ,
 	[
 		if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
@@ -245,7 +246,7 @@ AC_ARG_WITH(cppflags,
 		fi
 	]
 )
-AC_ARG_WITH(ldflags,
+AC_ARG_WITH([ldflags],
 	[  --with-ldflags          Specify additional flags to pass to linker],
 	[
 		if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
@@ -254,7 +255,7 @@ AC_ARG_WITH(ldflags,
 		fi
 	]
 )
-AC_ARG_WITH(libs,
+AC_ARG_WITH([libs],
 	[  --with-libs             Specify additional libraries to link with],
 	[
 		if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
@@ -263,7 +264,7 @@ AC_ARG_WITH(libs,
 		fi
 	]
 )
-AC_ARG_WITH(Werror,
+AC_ARG_WITH([Werror],
 	[  --with-Werror           Build main code with -Werror],
 	[
 		if test -n "$withval"  &&  test "x$withval" != "xno"; then
@@ -275,7 +276,7 @@ AC_ARG_WITH(Werror,
 	]
 )
 
-AC_CHECK_HEADERS( \
+AC_CHECK_HEADERS([ \
 	bstring.h \
 	crypt.h \
 	crypto/sha2.h \
@@ -339,29 +340,29 @@ AC_CHECK_HEADERS( \
 	utmp.h \
 	utmpx.h \
 	vis.h \
-)
+])
 
 # lastlog.h requires sys/time.h to be included first on Solaris
-AC_CHECK_HEADERS(lastlog.h, [], [], [
+AC_CHECK_HEADERS([lastlog.h], [], [], [
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 ])
 
 # sys/ptms.h requires sys/stream.h to be included first on Solaris
-AC_CHECK_HEADERS(sys/ptms.h, [], [], [
+AC_CHECK_HEADERS([sys/ptms.h], [], [], [
 #ifdef HAVE_SYS_STREAM_H
 # include <sys/stream.h>
 #endif
 ])
 
 # login_cap.h requires sys/types.h on NetBSD
-AC_CHECK_HEADERS(login_cap.h, [], [], [
+AC_CHECK_HEADERS([login_cap.h], [], [], [
 #include <sys/types.h>
 ])
 
 # older BSDs need sys/param.h before sys/mount.h
-AC_CHECK_HEADERS(sys/mount.h, [], [], [
+AC_CHECK_HEADERS([sys/mount.h], [], [], [
 #include <sys/param.h>
 ])
 
@@ -378,15 +379,14 @@ case "$host" in
 	# particularly with older versions of vac or xlc.
 	# It also throws errors about null macro argments, but these are
 	# not fatal.
-	AC_MSG_CHECKING(if compiler allows macro redefinitions)
+	AC_MSG_CHECKING([if compiler allows macro redefinitions])
 	AC_COMPILE_IFELSE(
-	    [AC_LANG_SOURCE([[
+	    [AC_LANG_PROGRAM([[
 #define testmacro foo
-#define testmacro bar
-int main(void) { exit(0); }
-	    ]])],
-	    [ AC_MSG_RESULT(yes) ],
-	    [ AC_MSG_RESULT(no)
+#define testmacro bar]],
+	    [[ exit(0); ]])],
+	    [ AC_MSG_RESULT([yes]) ],
+	    [ AC_MSG_RESULT([no])
 	      CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
 	      LD="`echo $LD | sed 's/-qlanglvl\=ansi//g'`"
 	      CFLAGS="`echo $CFLAGS | sed 's/-qlanglvl\=ansi//g'`"
@@ -407,21 +407,22 @@ int main(void) { exit(0); }
 	for tryflags in $flags ;do
 		if (test -z "$blibflags"); then
 			LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
-			AC_TRY_LINK([], [], [blibflags=$tryflags])
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+			[blibflags=$tryflags], [])
 		fi
 	done
 	if (test -z "$blibflags"); then
-		AC_MSG_RESULT(not found)
+		AC_MSG_RESULT([not found])
 		AC_MSG_ERROR([*** must be able to specify blibpath on AIX - check config.log])
 	else
-		AC_MSG_RESULT($blibflags)
+		AC_MSG_RESULT([$blibflags])
 	fi
 	LDFLAGS="$saved_LDFLAGS"
 	dnl Check for authenticate.  Might be in libs.a on older AIXes
-	AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE, 1,
+	AC_CHECK_FUNC([authenticate], [AC_DEFINE([WITH_AIXAUTHENTICATE], [1],
 		[Define if you want to enable AIX4's authenticate function])],
-		[AC_CHECK_LIB(s,authenticate,
-			[ AC_DEFINE(WITH_AIXAUTHENTICATE)
+		[AC_CHECK_LIB([s], [authenticate],
+			[ AC_DEFINE([WITH_AIXAUTHENTICATE])
 				LIBS="$LIBS -ls"
 			])
 		])
@@ -429,96 +430,98 @@ int main(void) { exit(0); }
 	AC_CHECK_DECLS([authenticate, loginrestrictions, loginsuccess,
 	    passwdexpired, setauthdb], , , [#include <usersec.h>])
 	dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
-	AC_CHECK_DECLS(loginfailed,
-		 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
-		  AC_TRY_COMPILE(
-			[#include <usersec.h>],
-			[(void)loginfailed("user","host","tty",0);],
-			[AC_MSG_RESULT(yes)
-			 AC_DEFINE(AIX_LOGINFAILED_4ARG, 1,
-				[Define if your AIX loginfailed() function
-				takes 4 arguments (AIX >= 5.2)])],
-			[AC_MSG_RESULT(no)]
-		)],
-		[],
-		[#include <usersec.h>]
+	AC_CHECK_DECLS([loginfailed],
+	    [AC_MSG_CHECKING([if loginfailed takes 4 arguments])
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <usersec.h> ]],
+		[[ (void)loginfailed("user","host","tty",0); ]])],
+		[AC_MSG_RESULT([yes])
+		AC_DEFINE([AIX_LOGINFAILED_4ARG], [1],
+			[Define if your AIX loginfailed() function
+			takes 4 arguments (AIX >= 5.2)])], [AC_MSG_RESULT([no])
+	    ])],
+	    [],
+	    [#include <usersec.h>]
 	)
-	AC_CHECK_FUNCS(getgrset setauthdb)
-	AC_CHECK_DECL(F_CLOSEM,
-	    AC_DEFINE(HAVE_FCNTL_CLOSEM, 1, [Use F_CLOSEM fcntl for closefrom]),
+	AC_CHECK_FUNCS([getgrset setauthdb])
+	AC_CHECK_DECL([F_CLOSEM],
+	    AC_DEFINE([HAVE_FCNTL_CLOSEM], [1], [Use F_CLOSEM fcntl for closefrom]),
 	    [],
 	    [ #include <limits.h>
 	      #include <fcntl.h> ]
 	)
 	check_for_aix_broken_getaddrinfo=1
-	AC_DEFINE(BROKEN_REALPATH, 1, [Define if you have a broken realpath.])
-	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	AC_DEFINE([BROKEN_REALPATH], [1], [Define if you have a broken realpath.])
+	AC_DEFINE([SETEUID_BREAKS_SETUID], [1],
 	    [Define if your platform breaks doing a seteuid before a setuid])
-	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
-	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
+	AC_DEFINE([BROKEN_SETREUID], [1], [Define if your setreuid() is broken])
+	AC_DEFINE([BROKEN_SETREGID], [1], [Define if your setregid() is broken])
 	dnl AIX handles lastlog as part of its login message
-	AC_DEFINE(DISABLE_LASTLOG, 1, [Define if you don't want to use lastlog])
-	AC_DEFINE(LOGIN_NEEDS_UTMPX, 1,
+	AC_DEFINE([DISABLE_LASTLOG], [1], [Define if you don't want to use lastlog])
+	AC_DEFINE([LOGIN_NEEDS_UTMPX], [1],
 		[Some systems need a utmpx entry for /bin/login to work])
-	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV,
+	AC_DEFINE([SPT_TYPE], [SPT_REUSEARGV],
 		[Define to a Set Process Title type if your system is
 		supported by bsd-setproctitle.c])
-	AC_DEFINE(SSHPAM_CHAUTHTOK_NEEDS_RUID, 1,
+	AC_DEFINE([SSHPAM_CHAUTHTOK_NEEDS_RUID], [1],
 	    [AIX 5.2 and 5.3 (and presumably newer) require this])
-	AC_DEFINE(PTY_ZEROREAD, 1, [read(1) can return 0 for a non-closed fd])
+	AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd])
 	;;
 *-*-cygwin*)
 	check_for_libcrypt_later=1
 	LIBS="$LIBS /usr/lib/textreadmode.o"
-	AC_DEFINE(HAVE_CYGWIN, 1, [Define if you are on Cygwin])
-	AC_DEFINE(USE_PIPES, 1, [Use PIPES instead of a socketpair()])
-	AC_DEFINE(DISABLE_SHADOW, 1,
+	AC_DEFINE([HAVE_CYGWIN], [1], [Define if you are on Cygwin])
+	AC_DEFINE([USE_PIPES], [1], [Use PIPES instead of a socketpair()])
+	AC_DEFINE([DISABLE_SHADOW], [1],
 		[Define if you want to disable shadow passwords])
-	AC_DEFINE(NO_X11_UNIX_SOCKETS, 1,
+	AC_DEFINE([NO_X11_UNIX_SOCKETS], [1],
 		[Define if X11 doesn't support AF_UNIX sockets on that system])
-	AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT, 1,
+	AC_DEFINE([NO_IPPORT_RESERVED_CONCEPT], [1],
 		[Define if the concept of ports only accessible to
 		superusers isn't known])
-	AC_DEFINE(DISABLE_FD_PASSING, 1,
+	AC_DEFINE([DISABLE_FD_PASSING], [1],
 		[Define if your platform needs to skip post auth
 		file descriptor passing])
-	AC_DEFINE(SSH_IOBUFSZ, 65535, [Windows is sensitive to read buffer size])
-	AC_DEFINE(FILESYSTEM_NO_BACKSLASH, 1, [File names may not contain backslash characters]) 
+	AC_DEFINE([SSH_IOBUFSZ], [65535], [Windows is sensitive to read buffer size])
+	AC_DEFINE([FILESYSTEM_NO_BACKSLASH], [1], [File names may not contain backslash characters]) 
 	;;
 *-*-dgux*)
-	AC_DEFINE(IP_TOS_IS_BROKEN, 1,
+	AC_DEFINE([IP_TOS_IS_BROKEN], [1],
 		[Define if your system choked on IP TOS setting])
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
 	;;
 *-*-darwin*)
-	AC_MSG_CHECKING(if we have working getaddrinfo)
-	AC_TRY_RUN([#include <mach-o/dyld.h>
+	AC_MSG_CHECKING([if we have working getaddrinfo])
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <mach-o/dyld.h>
 main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 		exit(0);
 	else
 		exit(1);
-}], [AC_MSG_RESULT(working)],
-	[AC_MSG_RESULT(buggy)
-	AC_DEFINE(BROKEN_GETADDRINFO, 1, [getaddrinfo is broken (if present)])],
-	[AC_MSG_RESULT(assume it is working)])
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
-	AC_DEFINE(BROKEN_GLOB, 1, [OS X glob does not do what we expect])
-	AC_DEFINE_UNQUOTED(BIND_8_COMPAT, 1,
+}
+			]])],
+	[AC_MSG_RESULT([working])],
+	[AC_MSG_RESULT([buggy])
+	AC_DEFINE([BROKEN_GETADDRINFO], [1],
+		[getaddrinfo is broken (if present)])
+	],
+	[AC_MSG_RESULT([assume it is working])])
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
+	AC_DEFINE([BROKEN_GLOB], [1], [OS X glob does not do what we expect])
+	AC_DEFINE_UNQUOTED([BIND_8_COMPAT], [1],
 		[Define if your resolver libs need this for getrrsetbyname])
-	AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD way])
-	AC_DEFINE(SSH_TUN_COMPAT_AF, 1,
+	AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
+	AC_DEFINE([SSH_TUN_COMPAT_AF], [1],
 	    [Use tunnel device compatibility to OpenBSD])
-	AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
+	AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
 	    [Prepend the address family to IP tunnel traffic])
-	m4_pattern_allow(AU_IPv)
-	AC_CHECK_DECL(AU_IPv4, [], 
-	    AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records])
+	m4_pattern_allow([AU_IPv])
+	AC_CHECK_DECL([AU_IPv4], [], 
+	    AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
 	    [#include <bsm/audit.h>]
-	AC_DEFINE(LASTLOG_WRITE_PUTUTXLINE, 1,
+	AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1],
 	    [Define if pututxline updates lastlog too])
 	)
 	;;
@@ -527,25 +530,25 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	;;
 *-*-haiku*) 
     LIBS="$LIBS -lbsd "
-    AC_CHECK_LIB(network, socket)
-    AC_DEFINE(HAVE_U_INT64_T)
+    AC_CHECK_LIB([network], [socket])
+    AC_DEFINE([HAVE_U_INT64_T])
     MANTYPE=man 
     ;; 
 *-*-hpux*)
 	# first we define all of the options common to all HP-UX releases
 	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
 	IPADDR_IN_DISPLAY=yes
-	AC_DEFINE(USE_PIPES)
-	AC_DEFINE(LOGIN_NO_ENDOPT, 1,
+	AC_DEFINE([USE_PIPES])
+	AC_DEFINE([LOGIN_NO_ENDOPT], [1],
 	    [Define if your login program cannot handle end of options ("--")])
-	AC_DEFINE(LOGIN_NEEDS_UTMPX)
-	AC_DEFINE(LOCKED_PASSWD_STRING, "*",
+	AC_DEFINE([LOGIN_NEEDS_UTMPX])
+	AC_DEFINE([LOCKED_PASSWD_STRING], ["*"],
 		[String used in /etc/passwd to denote locked account])
-	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
+	AC_DEFINE([SPT_TYPE], [SPT_PSTAT])
 	MAIL="/var/mail/username"
 	LIBS="$LIBS -lsec"
-	AC_CHECK_LIB(xnet, t_error, ,
-	    AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
+	AC_CHECK_LIB([xnet], [t_error], ,
+	    [AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])])
 
 	# next, we define all of the options specific to major releases
 	case "$host" in
@@ -555,13 +558,13 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 		fi
 		;;
 	*-*-hpux11*)
-		AC_DEFINE(PAM_SUN_CODEBASE, 1,
+		AC_DEFINE([PAM_SUN_CODEBASE], [1],
 			[Define if you are using Solaris-derived PAM which
 			passes pam_messages to the conversation function
 			with an extra level of indirection])
-		AC_DEFINE(DISABLE_UTMP, 1,
+		AC_DEFINE([DISABLE_UTMP], [1],
 			[Define if you don't want to use utmp])
-		AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins])
+		AC_DEFINE([USE_BTMP], [1], [Use btmp to log bad logins])
 		check_for_hpux_broken_getaddrinfo=1
 		check_for_conflicting_getspnam=1
 		;;
@@ -570,7 +573,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	# lastly, we define options specific to minor releases
 	case "$host" in
 	*-*-hpux10.26)
-		AC_DEFINE(HAVE_SECUREWARE, 1,
+		AC_DEFINE([HAVE_SECUREWARE], [1],
 			[Define if you have SecureWare-based
 			protected password database])
 		disable_ptmx_check=yes
@@ -580,79 +583,79 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	;;
 *-*-irix5*)
 	PATH="$PATH:/usr/etc"
-	AC_DEFINE(BROKEN_INET_NTOA, 1,
+	AC_DEFINE([BROKEN_INET_NTOA], [1],
 		[Define if you system's inet_ntoa is busted
 		(e.g. Irix gcc issue)])
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
-	AC_DEFINE(WITH_ABBREV_NO_TTY, 1,
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
+	AC_DEFINE([WITH_ABBREV_NO_TTY], [1],
 		[Define if you shouldn't strip 'tty' from your
 		ttyname in [uw]tmp])
-	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+	AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
 	;;
 *-*-irix6*)
 	PATH="$PATH:/usr/etc"
-	AC_DEFINE(WITH_IRIX_ARRAY, 1,
+	AC_DEFINE([WITH_IRIX_ARRAY], [1],
 		[Define if you have/want arrays
 		(cluster-wide session managment, not C arrays)])
-	AC_DEFINE(WITH_IRIX_PROJECT, 1,
+	AC_DEFINE([WITH_IRIX_PROJECT], [1],
 		[Define if you want IRIX project management])
-	AC_DEFINE(WITH_IRIX_AUDIT, 1,
+	AC_DEFINE([WITH_IRIX_AUDIT], [1],
 		[Define if you want IRIX audit trails])
-	AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS, 1,
+	AC_CHECK_FUNC([jlimit_startjob], [AC_DEFINE([WITH_IRIX_JOBS], [1],
 		[Define if you want IRIX kernel jobs])])
-	AC_DEFINE(BROKEN_INET_NTOA)
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
-	AC_DEFINE(BROKEN_UPDWTMPX, 1, [updwtmpx is broken (if present)])
-	AC_DEFINE(WITH_ABBREV_NO_TTY)
-	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+	AC_DEFINE([BROKEN_INET_NTOA])
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
+	AC_DEFINE([BROKEN_UPDWTMPX], [1], [updwtmpx is broken (if present)])
+	AC_DEFINE([WITH_ABBREV_NO_TTY])
+	AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
 	;;
 *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
 	check_for_libcrypt_later=1
-	AC_DEFINE(PAM_TTY_KLUDGE)
-	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
-	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
-	AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
-	AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins])
+	AC_DEFINE([PAM_TTY_KLUDGE])
+	AC_DEFINE([LOCKED_PASSWD_PREFIX], ["!"])
+	AC_DEFINE([SPT_TYPE], [SPT_REUSEARGV])
+	AC_DEFINE([_PATH_BTMP], ["/var/log/btmp"], [log for bad login attempts])
+	AC_DEFINE([USE_BTMP], [1], [Use btmp to log bad logins])
 	;;
 *-*-linux*)
 	no_dev_ptmx=1
 	check_for_libcrypt_later=1
 	check_for_openpty_ctty_bug=1
-	AC_DEFINE(PAM_TTY_KLUDGE, 1,
+	AC_DEFINE([PAM_TTY_KLUDGE], [1],
 		[Work around problematic Linux PAM modules handling of PAM_TTY])
-	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!",
+	AC_DEFINE([LOCKED_PASSWD_PREFIX], ["!"],
 		[String used in /etc/passwd to denote locked account])
-	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
-	AC_DEFINE(LINK_OPNOTSUPP_ERRNO, EPERM,
+	AC_DEFINE([SPT_TYPE], [SPT_REUSEARGV])
+	AC_DEFINE([LINK_OPNOTSUPP_ERRNO], [EPERM],
 		[Define to whatever link() returns for "not supported"
 		if it doesn't return EOPNOTSUPP.])
-	AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
-	AC_DEFINE(USE_BTMP)
-	AC_DEFINE(LINUX_OOM_ADJUST, 1, [Adjust Linux out-of-memory killer])
+	AC_DEFINE([_PATH_BTMP], ["/var/log/btmp"], [log for bad login attempts])
+	AC_DEFINE([USE_BTMP])
+	AC_DEFINE([LINUX_OOM_ADJUST], [1], [Adjust Linux out-of-memory killer])
 	inet6_default_4in6=yes
 	case `uname -r` in
 	1.*|2.0.*)
-		AC_DEFINE(BROKEN_CMSG_TYPE, 1,
+		AC_DEFINE([BROKEN_CMSG_TYPE], [1],
 			[Define if cmsg_type is not passed correctly])
 		;;
 	esac
 	# tun(4) forwarding compat code
-	AC_CHECK_HEADERS(linux/if_tun.h)
+	AC_CHECK_HEADERS([linux/if_tun.h])
 	if test "x$ac_cv_header_linux_if_tun_h" = "xyes" ; then
-		AC_DEFINE(SSH_TUN_LINUX, 1,
+		AC_DEFINE([SSH_TUN_LINUX], [1],
 		    [Open tunnel devices the Linux tun/tap way])
-		AC_DEFINE(SSH_TUN_COMPAT_AF, 1,
+		AC_DEFINE([SSH_TUN_COMPAT_AF], [1],
 		    [Use tunnel device compatibility to OpenBSD])
-		AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
+		AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
 		    [Prepend the address family to IP tunnel traffic])
 	fi
 	;;
 mips-sony-bsd|mips-sony-newsos4)
-	AC_DEFINE(NEED_SETPGRP, 1, [Need setpgrp to acquire controlling tty])
+	AC_DEFINE([NEED_SETPGRP], [1], [Need setpgrp to acquire controlling tty])
 	SONY=1
 	;;
 *-*-netbsd*)
@@ -660,91 +663,91 @@ mips-sony-bsd|mips-sony-newsos4)
 	if test "x$withval" != "xno" ; then
 		need_dash_r=1
 	fi
-	AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD way])
+	AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
 	AC_CHECK_HEADER([net/if_tap.h], ,
-	    AC_DEFINE(SSH_TUN_NO_L2, 1, [No layer 2 tunnel support]))
-	AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
+	    AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
+	AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
 	    [Prepend the address family to IP tunnel traffic])
 	;;
 *-*-freebsd*)
 	check_for_libcrypt_later=1
-	AC_DEFINE(LOCKED_PASSWD_PREFIX, "*LOCKED*", [Account locked with pw(1)])
-	AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD way])
+	AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)])
+	AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
 	AC_CHECK_HEADER([net/if_tap.h], ,
-	    AC_DEFINE(SSH_TUN_NO_L2, 1, [No layer 2 tunnel support]))
-	AC_DEFINE(BROKEN_GLOB, 1, [FreeBSD glob does not do what we need])
+	    AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
+	AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need])
 	;;
 *-*-bsdi*)
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
 	;;
 *-next-*)
 	conf_lastlog_location="/usr/adm/lastlog"
 	conf_utmp_location=/etc/utmp
 	conf_wtmp_location=/usr/adm/wtmp
 	MAIL=/usr/spool/mail
-	AC_DEFINE(HAVE_NEXT, 1, [Define if you are on NeXT])
-	AC_DEFINE(BROKEN_REALPATH)
-	AC_DEFINE(USE_PIPES)
-	AC_DEFINE(BROKEN_SAVED_UIDS, 1, [Needed for NeXT])
+	AC_DEFINE([HAVE_NEXT], [1], [Define if you are on NeXT])
+	AC_DEFINE([BROKEN_REALPATH])
+	AC_DEFINE([USE_PIPES])
+	AC_DEFINE([BROKEN_SAVED_UIDS], [1], [Needed for NeXT])
 	;;
 *-*-openbsd*)
-	AC_DEFINE(HAVE_ATTRIBUTE__SENTINEL__, 1, [OpenBSD's gcc has sentinel])
-	AC_DEFINE(HAVE_ATTRIBUTE__BOUNDED__, 1, [OpenBSD's gcc has bounded])
-	AC_DEFINE(SSH_TUN_OPENBSD, 1, [Open tunnel devices the OpenBSD way])
-	AC_DEFINE(SYSLOG_R_SAFE_IN_SIGHAND, 1,
+	AC_DEFINE([HAVE_ATTRIBUTE__SENTINEL__], [1], [OpenBSD's gcc has sentinel])
+	AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD's gcc has bounded])
+	AC_DEFINE([SSH_TUN_OPENBSD], [1], [Open tunnel devices the OpenBSD way])
+	AC_DEFINE([SYSLOG_R_SAFE_IN_SIGHAND], [1],
 	    [syslog_r function is safe to use in in a signal handler])
 	;;
 *-*-solaris*)
 	if test "x$withval" != "xno" ; then
 		need_dash_r=1
 	fi
-	AC_DEFINE(PAM_SUN_CODEBASE)
-	AC_DEFINE(LOGIN_NEEDS_UTMPX)
-	AC_DEFINE(LOGIN_NEEDS_TERM, 1,
+	AC_DEFINE([PAM_SUN_CODEBASE])
+	AC_DEFINE([LOGIN_NEEDS_UTMPX])
+	AC_DEFINE([LOGIN_NEEDS_TERM], [1],
 		[Some versions of /bin/login need the TERM supplied
 		on the commandline])
-	AC_DEFINE(PAM_TTY_KLUDGE)
-	AC_DEFINE(SSHPAM_CHAUTHTOK_NEEDS_RUID, 1,
+	AC_DEFINE([PAM_TTY_KLUDGE])
+	AC_DEFINE([SSHPAM_CHAUTHTOK_NEEDS_RUID], [1],
 		[Define if pam_chauthtok wants real uid set
 		to the unpriv'ed user])
-	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+	AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
 	# Pushing STREAMS modules will cause sshd to acquire a controlling tty.
-	AC_DEFINE(SSHD_ACQUIRES_CTTY, 1,
+	AC_DEFINE([SSHD_ACQUIRES_CTTY], [1],
 		[Define if sshd somehow reacquires a controlling TTY
 		after setsid()])
-	AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd
+	AC_DEFINE([PASSWD_NEEDS_USERNAME], [1], [must supply username to passwd
 		in case the name is longer than 8 chars])
-	AC_DEFINE(BROKEN_TCGETATTR_ICANON, 1, [tcgetattr with ICANON may hang])
+	AC_DEFINE([BROKEN_TCGETATTR_ICANON], [1], [tcgetattr with ICANON may hang])
 	external_path_file=/etc/default/login
 	# hardwire lastlog location (can't detect it on some versions)
 	conf_lastlog_location="/var/adm/lastlog"
-	AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x)
+	AC_MSG_CHECKING([for obsolete utmp and wtmp in solaris2.x])
 	sol2ver=`echo "$host"| sed -e 's/.*[[0-9]]\.//'`
 	if test "$sol2ver" -ge 8; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(DISABLE_UTMP)
-		AC_DEFINE(DISABLE_WTMP, 1,
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([DISABLE_UTMP])
+		AC_DEFINE([DISABLE_WTMP], [1],
 			[Define if you don't want to use wtmp])
 	else
-		AC_MSG_RESULT(no)
+		AC_MSG_RESULT([no])
 	fi
-	AC_ARG_WITH(solaris-contracts,
+	AC_ARG_WITH([solaris-contracts],
 		[  --with-solaris-contracts Enable Solaris process contracts (experimental)],
 		[
-		AC_CHECK_LIB(contract, ct_tmpl_activate,
-			[ AC_DEFINE(USE_SOLARIS_PROCESS_CONTRACTS, 1,
+		AC_CHECK_LIB([contract], [ct_tmpl_activate],
+			[ AC_DEFINE([USE_SOLARIS_PROCESS_CONTRACTS], [1],
 				[Define if you have Solaris process contracts])
 			  SSHDLIBS="$SSHDLIBS -lcontract"
 			  SPC_MSG="yes" ], )
 		],
 	)
-	AC_ARG_WITH(solaris-projects,
+	AC_ARG_WITH([solaris-projects],
 		[  --with-solaris-projects Enable Solaris projects (experimental)],
 		[
-		AC_CHECK_LIB(project, setproject,
-			[ AC_DEFINE(USE_SOLARIS_PROJECTS, 1,
+		AC_CHECK_LIB([project], [setproject],
+			[ AC_DEFINE([USE_SOLARIS_PROJECTS], [1],
 				[Define if you have Solaris projects])
 			SSHDLIBS="$SSHDLIBS -lproject"
 			SP_MSG="yes" ], )
@@ -753,33 +756,33 @@ mips-sony-bsd|mips-sony-newsos4)
 	;;
 *-*-sunos4*)
 	CPPFLAGS="$CPPFLAGS -DSUNOS4"
-	AC_CHECK_FUNCS(getpwanam)
-	AC_DEFINE(PAM_SUN_CODEBASE)
+	AC_CHECK_FUNCS([getpwanam])
+	AC_DEFINE([PAM_SUN_CODEBASE])
 	conf_utmp_location=/etc/utmp
 	conf_wtmp_location=/var/adm/wtmp
 	conf_lastlog_location=/var/adm/lastlog
-	AC_DEFINE(USE_PIPES)
+	AC_DEFINE([USE_PIPES])
 	;;
 *-ncr-sysv*)
 	LIBS="$LIBS -lc89"
-	AC_DEFINE(USE_PIPES)
-	AC_DEFINE(SSHD_ACQUIRES_CTTY)
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
+	AC_DEFINE([USE_PIPES])
+	AC_DEFINE([SSHD_ACQUIRES_CTTY])
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
 	;;
 *-sni-sysv*)
 	# /usr/ucblib MUST NOT be searched on ReliantUNIX
-	AC_CHECK_LIB(dl, dlsym, ,)
+	AC_CHECK_LIB([dl], [dlsym], ,)
 	# -lresolv needs to be at the end of LIBS or DNS lookups break
-	AC_CHECK_LIB(resolv, res_query, [ LIBS="$LIBS -lresolv" ])
+	AC_CHECK_LIB([resolv], [res_query], [ LIBS="$LIBS -lresolv" ])
 	IPADDR_IN_DISPLAY=yes
-	AC_DEFINE(USE_PIPES)
-	AC_DEFINE(IP_TOS_IS_BROKEN)
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
-	AC_DEFINE(SSHD_ACQUIRES_CTTY)
+	AC_DEFINE([USE_PIPES])
+	AC_DEFINE([IP_TOS_IS_BROKEN])
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
+	AC_DEFINE([SSHD_ACQUIRES_CTTY])
 	external_path_file=/etc/default/login
 	# /usr/ucblib/libucb.a no longer needed on ReliantUNIX
 	# Attention: always take care to bind libsocket and libnsl before libc,
@@ -787,36 +790,36 @@ mips-sony-bsd|mips-sony-newsos4)
 	;;
 # UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
 *-*-sysv4.2*)
-	AC_DEFINE(USE_PIPES)
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
-	AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd])
-	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+	AC_DEFINE([USE_PIPES])
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
+	AC_DEFINE([PASSWD_NEEDS_USERNAME], [1], [must supply username to passwd])
+	AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
 	;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
 	CPPFLAGS="$CPPFLAGS -Dvsnprintf=_xvsnprintf -Dsnprintf=_xsnprintf"
-	AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
-	AC_DEFINE(USE_PIPES)
-	AC_DEFINE(SETEUID_BREAKS_SETUID)
-	AC_DEFINE(BROKEN_GETADDRINFO)
-	AC_DEFINE(BROKEN_SETREUID)
-	AC_DEFINE(BROKEN_SETREGID)
-	AC_DEFINE(PASSWD_NEEDS_USERNAME)
+	AC_DEFINE([UNIXWARE_LONG_PASSWORDS], [1], [Support passwords > 8 chars])
+	AC_DEFINE([USE_PIPES])
+	AC_DEFINE([SETEUID_BREAKS_SETUID])
+	AC_DEFINE([BROKEN_GETADDRINFO])
+	AC_DEFINE([BROKEN_SETREUID])
+	AC_DEFINE([BROKEN_SETREGID])
+	AC_DEFINE([PASSWD_NEEDS_USERNAME])
 	case "$host" in
 	*-*-sysv5SCO_SV*)	# SCO OpenServer 6.x
 		TEST_SHELL=/u95/bin/sh
-		AC_DEFINE(BROKEN_LIBIAF, 1,
+		AC_DEFINE([BROKEN_LIBIAF], [1],
 			[ia_uinfo routines not supported by OS yet])
-		AC_DEFINE(BROKEN_UPDWTMPX)
-		AC_CHECK_LIB(prot, getluid,[ LIBS="$LIBS -lprot"
-			AC_CHECK_FUNCS(getluid setluid,,,-lprot)
-			AC_DEFINE(HAVE_SECUREWARE)
-			AC_DEFINE(DISABLE_SHADOW)
-			],,)
+		AC_DEFINE([BROKEN_UPDWTMPX])
+		AC_CHECK_LIB([prot], [getluid], [ LIBS="$LIBS -lprot"
+			AC_CHECK_FUNCS([getluid setluid], , , [-lprot])
+			AC_DEFINE([HAVE_SECUREWARE])
+			AC_DEFINE([DISABLE_SHADOW])
+			], , )
 		;;
-	*)	AC_DEFINE(LOCKED_PASSWD_STRING, "