autoconf.ac [was Re: Call for testing: OpenSSH-5.7]
Tim Rice
tim at multitalents.net
Sat Jan 15 17:16:36 EST 2011
On Sat, 15 Jan 2011, Ã~Angel González wrote:
> Tim Rice wrote:
> > On Fri, 14 Jan 2011, �ngel Gonz�lez wrote:
> >> $ autoreconf --version
> >> autoreconf (GNU Autoconf) 2.68
> > That said, we could be consistant on the use of AC_LANG_SOURCE.
> > Does this patch make your 2.68 happy?
> It does seem to make it happier. 81 error lines instead of 288.
> The errors may be coming from some included file, though.
OK, I couldn't resist. Here is a patch (attached so mailers don't mangle it)
that adds some additional M4 quoting, and uses AC_LANG_PROGRAM as sugested
by Roumen. Autoconf 2.68 is happy with it and autoconf 2.61 still likes it.
Using it with autoconf 2.61, there are no regressions on the 8 machines I
tested on (config.h identical). It may be to late to get this in for 5.7.
I'll let Damien decide.
> Here are the errors after applying your patch http://pastebin.com/hywKkavP
Best to post the output to the list.
--
Tim Rice Multitalents (707) 887-1469
tim at multitalents.net
-------------- next part --------------
--- openssh/configure.ac 2011-01-14 21:19:32.677494041 -0800
+++ tst/configure.ac 2011-01-14 21:10:30.201542002 -0800
@@ -23,7 +23,7 @@
AC_MSG_CHECKING([if $CC supports $1])
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1"
- AC_COMPILE_IFELSE([void main(void) { return 0; }],
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no)
CFLAGS="$saved_CFLAGS" ]
@@ -92,20 +92,20 @@
# 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)
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)
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
@@ -150,14 +150,12 @@
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_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
@@ -170,19 +168,19 @@
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_LANG_PROGRAM([[#include <stdio.h>]],
+ [[
+ char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;
+ ]])],
[ AC_MSG_RESULT(yes)
CFLAGS="$saved_CFLAGS $t"
LDFLAGS="$saved_LDFLAGS $t"
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_LANG_PROGRAM([[#include <stdio.h>]],
+ [[
+ char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;
+ ]])],
[ AC_MSG_RESULT(yes)
break ],
[ AC_MSG_RESULT(no) ],
@@ -211,7 +209,7 @@
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,
@@ -380,11 +378,10 @@
# not fatal.
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); }
- ]])],
+#define testmacro bar]],
+ [[exit(0);]])],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no)
CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
@@ -418,10 +415,10 @@
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_DEFINE([WITH_AIXAUTHENTICATE])
LIBS="$LIBS -ls"
])
])
@@ -435,7 +432,7 @@
[#include <usersec.h>],
[(void)loginfailed("user","host","tty",0);],
[AC_MSG_RESULT(yes)
- AC_DEFINE(AIX_LOGINFAILED_4ARG, 1,
+ AC_DEFINE([AIX_LOGINFAILED_4ARG], [1],
[Define if your AIX loginfailed() function
takes 4 arguments (AIX >= 5.2)])],
[AC_MSG_RESULT(no)]
@@ -445,51 +442,51 @@
)
AC_CHECK_FUNCS(getgrset setauthdb)
AC_CHECK_DECL(F_CLOSEM,
- AC_DEFINE(HAVE_FCNTL_CLOSEM, 1, [Use F_CLOSEM fcntl for closefrom]),
+ 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([SSH_IOBUFSZ], [65535], [Windows is sensitive to read buffer size])
;;
*-*-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)
@@ -500,24 +497,24 @@
exit(1);
}], [AC_MSG_RESULT(working)],
[AC_MSG_RESULT(buggy)
- AC_DEFINE(BROKEN_GETADDRINFO, 1, [getaddrinfo is broken (if present)])],
+ 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_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])
+ 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,20 +524,20 @@
*-*-haiku*)
LIBS="$LIBS -lbsd "
AC_CHECK_LIB(network, socket)
- AC_DEFINE(HAVE_U_INT64_T)
+ 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, ,
@@ -554,13 +551,13 @@
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
;;
@@ -569,7 +566,7 @@
# 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
@@ -579,79 +576,79 @@
;;
*-*-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)
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*)
@@ -659,63 +656,63 @@
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"
@@ -723,8 +720,8 @@
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_DEFINE([DISABLE_UTMP])
+ AC_DEFINE([DISABLE_WTMP], [1],
[Define if you don't want to use wtmp])
else
AC_MSG_RESULT(no)
@@ -733,7 +730,7 @@
[ --with-solaris-contracts Enable Solaris process contracts (experimental)],
[
AC_CHECK_LIB(contract, ct_tmpl_activate,
- [ AC_DEFINE(USE_SOLARIS_PROCESS_CONTRACTS, 1,
+ [ AC_DEFINE([USE_SOLARIS_PROCESS_CONTRACTS], [1],
[Define if you have Solaris process contracts])
SSHDLIBS="$SSHDLIBS -lcontract"
AC_SUBST(SSHDLIBS)
@@ -744,7 +741,7 @@
[ --with-solaris-projects Enable Solaris projects (experimental)],
[
AC_CHECK_LIB(project, setproject,
- [ AC_DEFINE(USE_SOLARIS_PROJECTS, 1,
+ [ AC_DEFINE([USE_SOLARIS_PROJECTS], [1],
[Define if you have Solaris projects])
SSHDLIBS="$SSHDLIBS -lproject"
AC_SUBST(SSHDLIBS)
@@ -755,19 +752,19 @@
*-*-sunos4*)
CPPFLAGS="$CPPFLAGS -DSUNOS4"
AC_CHECK_FUNCS(getpwanam)
- AC_DEFINE(PAM_SUN_CODEBASE)
+ 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
@@ -775,12 +772,12 @@
# -lresolv needs to be at the end of LIBS or DNS lookups break
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,
@@ -788,36 +785,36 @@
;;
# 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_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([HAVE_SECUREWARE])
+ AC_DEFINE([DISABLE_SHADOW])
],,)
;;
- *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+ *) AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
check_for_libcrypt_later=1
;;
esac
@@ -835,51 +832,51 @@
fi
LIBS="$LIBS -lprot -lx -ltinfo -lm"
no_dev_ptmx=1
- AC_DEFINE(USE_PIPES)
- AC_DEFINE(HAVE_SECUREWARE)
- AC_DEFINE(DISABLE_SHADOW)
- AC_DEFINE(DISABLE_FD_PASSING)
- AC_DEFINE(SETEUID_BREAKS_SETUID)
- AC_DEFINE(BROKEN_GETADDRINFO)
- AC_DEFINE(BROKEN_SETREUID)
- AC_DEFINE(BROKEN_SETREGID)
- AC_DEFINE(WITH_ABBREV_NO_TTY)
- AC_DEFINE(BROKEN_UPDWTMPX)
- AC_DEFINE(PASSWD_NEEDS_USERNAME)
+ AC_DEFINE([USE_PIPES])
+ AC_DEFINE([HAVE_SECUREWARE])
+ AC_DEFINE([DISABLE_SHADOW])
+ AC_DEFINE([DISABLE_FD_PASSING])
+ AC_DEFINE([SETEUID_BREAKS_SETUID])
+ AC_DEFINE([BROKEN_GETADDRINFO])
+ AC_DEFINE([BROKEN_SETREUID])
+ AC_DEFINE([BROKEN_SETREGID])
+ AC_DEFINE([WITH_ABBREV_NO_TTY])
+ AC_DEFINE([BROKEN_UPDWTMPX])
+ AC_DEFINE([PASSWD_NEEDS_USERNAME])
AC_CHECK_FUNCS(getluid setluid)
MANTYPE=man
TEST_SHELL=ksh
;;
*-*-unicosmk*)
- AC_DEFINE(NO_SSH_LASTLOG, 1,
+ AC_DEFINE([NO_SSH_LASTLOG], [1],
[Define if you don't want to use lastlog in session.c])
- AC_DEFINE(SETEUID_BREAKS_SETUID)
- AC_DEFINE(BROKEN_SETREUID)
- AC_DEFINE(BROKEN_SETREGID)
- AC_DEFINE(USE_PIPES)
- AC_DEFINE(DISABLE_FD_PASSING)
+ AC_DEFINE([SETEUID_BREAKS_SETUID])
+ AC_DEFINE([BROKEN_SETREUID])
+ AC_DEFINE([BROKEN_SETREGID])
+ AC_DEFINE([USE_PIPES])
+ AC_DEFINE([DISABLE_FD_PASSING])
LDFLAGS="$LDFLAGS"
LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
MANTYPE=cat
;;
*-*-unicosmp*)
- AC_DEFINE(SETEUID_BREAKS_SETUID)
- AC_DEFINE(BROKEN_SETREUID)
- AC_DEFINE(BROKEN_SETREGID)
- AC_DEFINE(WITH_ABBREV_NO_TTY)
- AC_DEFINE(USE_PIPES)
- AC_DEFINE(DISABLE_FD_PASSING)
+ AC_DEFINE([SETEUID_BREAKS_SETUID])
+ AC_DEFINE([BROKEN_SETREUID])
+ AC_DEFINE([BROKEN_SETREGID])
+ AC_DEFINE([WITH_ABBREV_NO_TTY])
+ AC_DEFINE([USE_PIPES])
+ AC_DEFINE([DISABLE_FD_PASSING])
LDFLAGS="$LDFLAGS"
LIBS="$LIBS -lgen -lacid -ldb"
MANTYPE=cat
;;
*-*-unicos*)
- AC_DEFINE(SETEUID_BREAKS_SETUID)
- AC_DEFINE(BROKEN_SETREUID)
- AC_DEFINE(BROKEN_SETREGID)
- AC_DEFINE(USE_PIPES)
- AC_DEFINE(DISABLE_FD_PASSING)
- AC_DEFINE(NO_SSH_LASTLOG)
+ AC_DEFINE([SETEUID_BREAKS_SETUID])
+ AC_DEFINE([BROKEN_SETREUID])
+ AC_DEFINE([BROKEN_SETREGID])
+ AC_DEFINE([USE_PIPES])
+ AC_DEFINE([DISABLE_FD_PASSING])
+ AC_DEFINE([NO_SSH_LASTLOG])
LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal"
LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
MANTYPE=cat
@@ -899,65 +896,61 @@
if test -z "$no_osfsia" ; then
if test -f /etc/sia/matrix.conf; then
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_OSF_SIA, 1,
+ AC_DEFINE([HAVE_OSF_SIA], [1],
[Define if you have Digital Unix Security
Integration Architecture])
- AC_DEFINE(DISABLE_LOGIN, 1,
+ AC_DEFINE([DISABLE_LOGIN], [1],
[Define if you don't want to use your
system's login() call])
- AC_DEFINE(DISABLE_FD_PASSING)
+ AC_DEFINE([DISABLE_FD_PASSING])
LIBS="$LIBS -lsecurity -ldb -lm -laud"
SIA_MSG="yes"
else
AC_MSG_RESULT(no)
- AC_DEFINE(LOCKED_PASSWD_SUBSTR, "Nologin",
+ AC_DEFINE([LOCKED_PASSWD_SUBSTR], ["Nologin"],
[String used in /etc/passwd to denote locked account])
fi
fi
- AC_DEFINE(BROKEN_GETADDRINFO)
- AC_DEFINE(SETEUID_BREAKS_SETUID)
- AC_DEFINE(BROKEN_SETREUID)
- AC_DEFINE(BROKEN_SETREGID)
- AC_DEFINE(BROKEN_READV_COMPARISON, 1, [Can't do comparisons on readv])
+ AC_DEFINE([BROKEN_GETADDRINFO])
+ AC_DEFINE([SETEUID_BREAKS_SETUID])
+ AC_DEFINE([BROKEN_SETREUID])
+ AC_DEFINE([BROKEN_SETREGID])
+ AC_DEFINE([BROKEN_READV_COMPARISON], [1], [Can't do comparisons on readv])
;;
*-*-nto-qnx*)
- AC_DEFINE(USE_PIPES)
- AC_DEFINE(NO_X11_UNIX_SOCKETS)
- AC_DEFINE(MISSING_NFDBITS, 1, [Define on *nto-qnx systems])
- AC_DEFINE(MISSING_HOWMANY, 1, [Define on *nto-qnx systems])
- AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems])
- AC_DEFINE(DISABLE_LASTLOG)
- AC_DEFINE(SSHD_ACQUIRES_CTTY)
- AC_DEFINE(BROKEN_SHADOW_EXPIRE, 1, [QNX shadow support is broken])
+ AC_DEFINE([USE_PIPES])
+ AC_DEFINE([NO_X11_UNIX_SOCKETS])
+ AC_DEFINE([MISSING_NFDBITS], [1], [Define on *nto-qnx systems])
+ AC_DEFINE([MISSING_HOWMANY], [1], [Define on *nto-qnx systems])
+ AC_DEFINE([MISSING_FD_MASK], [1], [Define on *nto-qnx systems])
+ AC_DEFINE([DISABLE_LASTLOG])
+ AC_DEFINE([SSHD_ACQUIRES_CTTY])
+ AC_DEFINE([BROKEN_SHADOW_EXPIRE], [1], [QNX shadow support is broken])
enable_etc_default_login=no # has incompatible /etc/default/login
case "$host" in
*-*-nto-qnx6*)
- AC_DEFINE(DISABLE_FD_PASSING)
+ AC_DEFINE([DISABLE_FD_PASSING])
;;
esac
;;
*-*-ultrix*)
- AC_DEFINE(BROKEN_GETGROUPS, 1, [getgroups(0,NULL) will return -1])
- AC_DEFINE(BROKEN_MMAP, 1, [Ultrix mmap can't map files])
- AC_DEFINE(NEED_SETPGRP)
- AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix])
+ AC_DEFINE([BROKEN_GETGROUPS], [1], [getgroups(0,NULL) will return -1])
+ AC_DEFINE([BROKEN_MMAP], [1], [Ultrix mmap can't map files])
+ AC_DEFINE([NEED_SETPGRP])
+ AC_DEFINE([HAVE_SYS_SYSLOG_H], [1], [Force use of sys/syslog.h on Ultrix])
;;
*-*-lynxos)
CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
- AC_DEFINE(MISSING_HOWMANY)
- AC_DEFINE(BROKEN_SETVBUF, 1, [LynxOS has broken setvbuf() implementation])
+ AC_DEFINE([MISSING_HOWMANY])
+ AC_DEFINE([BROKEN_SETVBUF], [1], [LynxOS has broken setvbuf() implementation])
;;
esac
AC_MSG_CHECKING(compiler and flags for sanity)
-AC_RUN_IFELSE(
- [AC_LANG_SOURCE([
-#include <stdio.h>
-int main(){exit(0);}
- ])],
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[exit(0);]])],
[ AC_MSG_RESULT(yes) ],
[
AC_MSG_RESULT(no)
@@ -1003,7 +996,7 @@
])
if test "x$ac_cv_have_broken_dirname" = "xno" ; then
LIBS="$LIBS -lgen"
- AC_DEFINE(HAVE_DIRNAME)
+ AC_DEFINE([HAVE_DIRNAME])
AC_CHECK_HEADERS(libgen.h)
fi
])
@@ -1011,7 +1004,7 @@
AC_CHECK_FUNC(getspnam, ,
AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen"))
-AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME, 1,
+AC_SEARCH_LIBS(basename, gen, AC_DEFINE([HAVE_BASENAME], [1],
[Define if you have the basename function.]))
dnl zlib is required
@@ -1055,7 +1048,7 @@
fi
CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}"
LIBS="$LIBS -lz"
- AC_TRY_LINK_FUNC(deflate, AC_DEFINE(HAVE_LIBZ),
+ AC_TRY_LINK_FUNC(deflate, AC_DEFINE([HAVE_LIBZ]),
[
AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***])
]
@@ -1072,11 +1065,10 @@
)
AC_MSG_CHECKING(for possibly buggy zlib)
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
-#include <zlib.h>
-int main()
-{
+#include <zlib.h>]],
+ [[
int a=0, b=0, c=0, d=0, n, v;
n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
if (n != 3 && n != 4)
@@ -1093,7 +1085,6 @@
exit(0);
exit(2);
-}
]])],
AC_MSG_RESULT(no),
[ AC_MSG_RESULT(yes)
@@ -1117,13 +1108,13 @@
[], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ]
)
AC_CHECK_FUNCS(utimes,
- [], [ AC_CHECK_LIB(c89, utimes, [AC_DEFINE(HAVE_UTIMES)
+ [], [ AC_CHECK_LIB(c89, utimes, [AC_DEFINE([HAVE_UTIMES])
LIBS="$LIBS -lc89"]) ]
)
dnl Checks for libutil functions
AC_CHECK_HEADERS(libutil.h)
-AC_SEARCH_LIBS(login, util bsd, [AC_DEFINE(HAVE_LOGIN, 1,
+AC_SEARCH_LIBS(login, util bsd, [AC_DEFINE([HAVE_LOGIN], [1],
[Define if your libraries define login()])])
AC_CHECK_FUNCS(fmt_scaled logout updwtmp logwtmp)
@@ -1139,7 +1130,7 @@
#endif
],
[
- AC_DEFINE(GLOB_HAS_ALTDIRFUNC, 1,
+ AC_DEFINE([GLOB_HAS_ALTDIRFUNC], [1],
[Define if your system glob() function has
the GLOB_ALTDIRFUNC extension])
AC_MSG_RESULT(yes)
@@ -1155,7 +1146,7 @@
[ #include <glob.h> ],
[glob_t g; g.gl_matchc = 1;],
[
- AC_DEFINE(GLOB_HAS_GL_MATCHC, 1,
+ AC_DEFINE([GLOB_HAS_GL_MATCHC], [1],
[Define if your system glob() function has
gl_matchc options in glob_t])
AC_MSG_RESULT(yes)
@@ -1177,7 +1168,7 @@
g.gl_statv = NULL;
],
[
- AC_DEFINE(GLOB_HAS_GL_STATV, 1,
+ AC_DEFINE([GLOB_HAS_GL_STATV], [1],
[Define if your system glob() function has
gl_statv options in glob_t])
AC_MSG_RESULT(yes)
@@ -1191,27 +1182,27 @@
AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <sys/types.h>
-#include <dirent.h>
-int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
+#include <dirent.h>]],
+ [[struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));
]])],
[AC_MSG_RESULT(yes)],
[
AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1,
+ AC_DEFINE([BROKEN_ONE_BYTE_DIRENT_D_NAME], [1],
[Define if your struct dirent expects you to
allocate extra space for d_name])
],
[
AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME])
- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
+ AC_DEFINE([BROKEN_ONE_BYTE_DIRENT_D_NAME])
]
)
AC_MSG_CHECKING([for /proc/pid/fd directory])
if test -d "/proc/$$/fd" ; then
- AC_DEFINE(HAVE_PROC_PID, 1, [Define if you have /proc/$pid/fd])
+ AC_DEFINE([HAVE_PROC_PID], [1], [Define if you have /proc/$pid/fd])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -1229,16 +1220,17 @@
LDFLAGS="$LDFLAGS -L${withval}/lib"
fi
- AC_DEFINE(SKEY, 1, [Define if you want S/Key support])
+ AC_DEFINE([SKEY], [1], [Define if you want S/Key support])
LIBS="-lskey $LIBS"
SKEY_MSG="yes"
AC_MSG_CHECKING([for s/key support])
AC_LINK_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
#include <skey.h>
-int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
+ ]],
+ [[char *ff = skey_keyinfo(""); ff=""; exit(0);
]])],
[AC_MSG_RESULT(yes)],
[
@@ -1251,7 +1243,7 @@
#include <skey.h>],
[(void)skeychallenge(NULL,"name","",0);],
[AC_MSG_RESULT(yes)
- AC_DEFINE(SKEYCHALLENGE_4ARG, 1,
+ AC_DEFINE([SKEYCHALLENGE_4ARG], [1],
[Define if your skeychallenge()
function takes 4 arguments (NetBSD)])],
[AC_MSG_RESULT(no)]
@@ -1303,7 +1295,7 @@
[hosts_access(0);],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(LIBWRAP, 1,
+ AC_DEFINE([LIBWRAP], [1],
[Define if you want
TCP Wrappers support])
SSHDLIBS="$SSHDLIBS -lwrap"
@@ -1350,7 +1342,7 @@
fi
OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
AC_CHECK_LIB(edit, el_init,
- [ AC_DEFINE(USE_LIBEDIT, 1, [Use libedit for sftp])
+ [ AC_DEFINE([USE_LIBEDIT], [1], [Use libedit for sftp])
LIBEDIT_MSG="yes"
AC_SUBST(LIBEDIT)
],
@@ -1359,14 +1351,11 @@
)
AC_MSG_CHECKING(if libedit version is compatible)
AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE([[
-#include <histedit.h>
-int main(void)
-{
- int i = H_SETSIZE;
- el_init("", NULL, NULL, NULL);
- exit(0);
-}
+ [AC_LANG_PROGRAM([[#include <histedit.h>]],
+ [[
+ int i = H_SETSIZE;
+ el_init("", NULL, NULL, NULL);
+ exit(0);
]])],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no)
@@ -1399,12 +1388,12 @@
[AC_MSG_ERROR(BSM enabled and required function not found)])
# These are optional
AC_CHECK_FUNCS(getaudit_addr aug_get_machine)
- AC_DEFINE(USE_BSM_AUDIT, 1, [Use BSM audit module])
+ AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module])
;;
debug)
AUDIT_MODULE=debug
AC_MSG_RESULT(debug)
- AC_DEFINE(SSH_AUDIT_EVENTS, 1, Use audit debugging module)
+ AC_DEFINE([SSH_AUDIT_EVENTS], [1], Use audit debugging module)
;;
no)
AC_MSG_RESULT(no)
@@ -1515,14 +1504,10 @@
)
AC_LINK_IFELSE(
-[
-#include <ctype.h>
-int main(void)
-{
- return (isblank('a'));
-}
-],
- [AC_DEFINE(HAVE_ISBLANK, 1, [Define if you have isblank(3C).])
+ [AC_LANG_PROGRAM(
+ [[#include <ctype.h>]],
+ [[return (isblank('a'));]])],
+ [AC_DEFINE([HAVE_ISBLANK], [1], [Define if you have isblank(3C).])
])
# PKCS#11 support requires dlopen() and co
@@ -1532,7 +1517,7 @@
# IRIX has a const char return value for gai_strerror()
AC_CHECK_FUNCS(gai_strerror,[
- AC_DEFINE(HAVE_GAI_STRERROR)
+ AC_DEFINE([HAVE_GAI_STRERROR])
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
@@ -1542,10 +1527,10 @@
char *str;
str = gai_strerror(0);],[
- AC_DEFINE(HAVE_CONST_GAI_STRERROR_PROTO, 1,
+ AC_DEFINE([HAVE_CONST_GAI_STRERROR_PROTO], [1],
[Define if gai_strerror() returns const char *])])])
-AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP, 1,
+AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE([HAVE_NANOSLEEP], [1],
[Some systems put nanosleep outside of libc]))
dnl Make sure prototypes are defined for these before using them.
@@ -1561,7 +1546,7 @@
dnl tcsendbreak might be a macro
AC_CHECK_DECL(tcsendbreak,
- [AC_DEFINE(HAVE_TCSENDBREAK)],
+ [AC_DEFINE([HAVE_TCSENDBREAK])],
[AC_CHECK_FUNCS(tcsendbreak)],
[#include <termios.h>]
)
@@ -1603,13 +1588,14 @@
dnl Some platorms have setresuid that isn't implemented, test for this
AC_MSG_CHECKING(if setresuid seems to work)
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdlib.h>
-#include <errno.h>
-int main(){errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+#include <errno.h>]],
+ [[
+ errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);
]])],
[AC_MSG_RESULT(yes)],
- [AC_DEFINE(BROKEN_SETRESUID, 1,
+ [AC_DEFINE([BROKEN_SETRESUID], [1],
[Define if your setresuid() is broken])
AC_MSG_RESULT(not implemented)],
[AC_MSG_WARN([cross compiling: not checking setresuid])]
@@ -1620,13 +1606,14 @@
dnl Some platorms have setresgid that isn't implemented, test for this
AC_MSG_CHECKING(if setresgid seems to work)
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdlib.h>
-#include <errno.h>
-int main(){errno=0; setresgid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+#include <errno.h>]],
+ [[
+ errno=0; setresgid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);
]])],
[AC_MSG_RESULT(yes)],
- [AC_DEFINE(BROKEN_SETRESGID, 1,
+ [AC_DEFINE([BROKEN_SETRESGID], [1],
[Define if your setresgid() is broken])
AC_MSG_RESULT(not implemented)],
[AC_MSG_WARN([cross compiling: not checking setresuid])]
@@ -1645,30 +1632,28 @@
AC_CHECK_FUNCS(getlastlogxbyname)
AC_CHECK_FUNC(daemon,
- [AC_DEFINE(HAVE_DAEMON, 1, [Define if your libraries define daemon()])],
+ [AC_DEFINE([HAVE_DAEMON], [1], [Define if your libraries define daemon()])],
[AC_CHECK_LIB(bsd, daemon,
- [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)])]
+ [LIBS="$LIBS -lbsd"; AC_DEFINE([HAVE_DAEMON])])]
)
AC_CHECK_FUNC(getpagesize,
- [AC_DEFINE(HAVE_GETPAGESIZE, 1,
+ [AC_DEFINE([HAVE_GETPAGESIZE], [1],
[Define if your libraries define getpagesize()])],
[AC_CHECK_LIB(ucb, getpagesize,
- [LIBS="$LIBS -lucb"; AC_DEFINE(HAVE_GETPAGESIZE)])]
+ [LIBS="$LIBS -lucb"; AC_DEFINE([HAVE_GETPAGESIZE])])]
)
# Check for broken snprintf
if test "x$ac_cv_func_snprintf" = "xyes" ; then
AC_MSG_CHECKING([whether snprintf correctly terminates long strings])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
-#include <stdio.h>
-int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
- ]])],
+ [AC_LANG_PROGRAM([[#include <stdio.h>]],
+ [[char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');]])],
[AC_MSG_RESULT(yes)],
[
AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_SNPRINTF, 1,
+ AC_DEFINE([BROKEN_SNPRINTF], [1],
[Define if your snprintf is busted])
AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
],
@@ -1683,7 +1668,7 @@
test "x$ac_cv_func_vsnprintf" = "xyes" ; then
AC_MSG_CHECKING([whether vsnprintf returns correct values on overflow])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <stdio.h>
#include <stdarg.h>
@@ -1693,16 +1678,15 @@
size_t ret; va_list ap;
va_start(ap, fmt); ret = vsnprintf(str, count, fmt, ap); va_end(ap);
return ret;
-}
-int main(void)
-{
+}]],
+ [[
char x[1];
exit(x_snprintf(x, 1, "%s %d", "hello", 12345) == 11 ? 0 : 1);
-} ]])],
+ ]])],
[AC_MSG_RESULT(yes)],
[
AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_SNPRINTF, 1,
+ AC_DEFINE([BROKEN_SNPRINTF], [1],
[Define if your snprintf is busted])
AC_MSG_WARN([****** Your vsnprintf() function is broken, complain to your vendor])
],
@@ -1714,15 +1698,14 @@
# check that the fmt argument is const char * or just char *.
# This is only useful for when BROKEN_SNPRINTF
AC_MSG_CHECKING([whether snprintf can declare const char *fmt])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- int snprintf(char *a, size_t b, const char *c, ...) { return 0; }
- int main(void) { snprintf(0, 0, 0); }
- ]])],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ int snprintf(char *a, size_t b, const char *c, ...) { return 0; }]],
+ [[snprintf(0, 0, 0);]])],
[AC_MSG_RESULT(yes)
- AC_DEFINE(SNPRINTF_CONST, [const],
+ AC_DEFINE([SNPRINTF_CONST], [const],
[Define as const if snprintf() can declare const char *fmt])],
[AC_MSG_RESULT(no)
- AC_DEFINE(SNPRINTF_CONST, [/* not const */])])
+ AC_DEFINE([SNPRINTF_CONST], [/* not const */])])
# Check for missing getpeereid (or equiv) support
NO_PEERCHECK=""
@@ -1733,7 +1716,7 @@
#include <sys/socket.h>],
[int i = SO_PEERCRED;],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_SO_PEERCRED, 1, [Have PEERCRED socket option])
+ AC_DEFINE([HAVE_SO_PEERCRED], [1], [Have PEERCRED socket option])
],
[AC_MSG_RESULT(no)
NO_PEERCHECK=1]
@@ -1744,24 +1727,24 @@
if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
AC_MSG_CHECKING([for (overly) strict mkstemp])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
-#include <stdlib.h>
-main() { char template[]="conftest.mkstemp-test";
+ [AC_LANG_PROGRAM([[
+#include <stdlib.h>]],
+ [[
+char template[]="conftest.mkstemp-test";
if (mkstemp(template) == -1)
exit(1);
unlink(template); exit(0);
-}
]])],
[
AC_MSG_RESULT(no)
],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STRICT_MKSTEMP, 1, [Silly mkstemp()])
+ AC_DEFINE([HAVE_STRICT_MKSTEMP], [1], [Silly mkstemp()])
],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STRICT_MKSTEMP)
+ AC_DEFINE([HAVE_STRICT_MKSTEMP])
]
)
fi
@@ -1770,15 +1753,12 @@
if test ! -z "$check_for_openpty_ctty_bug"; then
AC_MSG_CHECKING(if openpty correctly handles controlling tty)
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
#include <sys/fcntl.h>
#include <sys/types.h>
-#include <sys/wait.h>
-
-int
-main()
-{
+#include <sys/wait.h>]],
+ [[
pid_t pid;
int fd, ptyfd, ttyfd, status;
@@ -1801,14 +1781,13 @@
else
exit(0); /* Did not acquire ctty: OK */
}
-}
]])],
[
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
- AC_DEFINE(SSHD_ACQUIRES_CTTY)
+ AC_DEFINE([SSHD_ACQUIRES_CTTY])
],
[
AC_MSG_RESULT(cross-compiling, assuming yes)
@@ -1820,7 +1799,7 @@
test "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
AC_MSG_CHECKING(if getaddrinfo seems to work)
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
#include <sys/socket.h>
#include <netdb.h>
@@ -1828,10 +1807,8 @@
#include <netinet/in.h>
#define TEST_PORT "2222"
-
-int
-main(void)
-{
+ ]],
+ [[
int err, sock;
struct addrinfo *gai_ai, *ai, hints;
char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL;
@@ -1873,14 +1850,13 @@
}
}
exit(0);
-}
]])],
[
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_GETADDRINFO)
+ AC_DEFINE([BROKEN_GETADDRINFO])
],
[
AC_MSG_RESULT(cross-compiling, assuming yes)
@@ -1892,7 +1868,7 @@
test "x$check_for_aix_broken_getaddrinfo" = "x1"; then
AC_MSG_CHECKING(if getaddrinfo seems to work)
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
#include <sys/socket.h>
#include <netdb.h>
@@ -1900,10 +1876,8 @@
#include <netinet/in.h>
#define TEST_PORT "2222"
-
-int
-main(void)
-{
+ ]],
+ [[
int err, sock;
struct addrinfo *gai_ai, *ai, hints;
char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL;
@@ -1933,17 +1907,16 @@
}
}
exit(0);
-}
]])],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(AIX_GETNAMEINFO_HACK, 1,
+ AC_DEFINE([AIX_GETNAMEINFO_HACK], [1],
[Define if you have a getaddrinfo that fails
for the all-zeros IPv6 address])
],
[
AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_GETADDRINFO)
+ AC_DEFINE([BROKEN_GETADDRINFO])
],
[
AC_MSG_RESULT(cross-compiling, assuming no)
@@ -1953,17 +1926,14 @@
if test "x$check_for_conflicting_getspnam" = "x1"; then
AC_MSG_CHECKING(for conflicting getspnam in shadow.h)
- AC_COMPILE_IFELSE(
- [
-#include <shadow.h>
-int main(void) {exit(0);}
- ],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <shadow.h>]],
+ [[exit(0);]])],
[
AC_MSG_RESULT(no)
],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(GETSPNAM_CONFLICTING_DEFS, 1,
+ AC_DEFINE([GETSPNAM_CONFLICTING_DEFS], [1],
[Conflicting defs for getspnam])
]
)
@@ -2010,7 +1980,7 @@
]
)
LIBS="-lcrypto $LIBS"
-AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL, 1,
+AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE([HAVE_OPENSSL], [1],
[Define if your ssl headers are included
with #include <openssl/header.h>]),
[
@@ -2023,7 +1993,7 @@
CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
AC_CHECK_HEADER([openssl/opensslv.h], ,
AC_MSG_ERROR([*** OpenSSL headers missing - please install first or check config.log ***]))
- AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
+ AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE([HAVE_OPENSSL]),
[
AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])
]
@@ -2034,12 +2004,13 @@
# Determine OpenSSL header version
AC_MSG_CHECKING([OpenSSL header version])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
#include <string.h>
#include <openssl/opensslv.h>
#define DATA "conftest.sslincver"
-int main(void) {
+ ]],
+ [[
FILE *fd;
int rc;
@@ -2051,7 +2022,6 @@
exit(1);
exit(0);
-}
]])],
[
ssl_header_ver=`cat conftest.sslincver`
@@ -2069,13 +2039,14 @@
# Determine OpenSSL library version
AC_MSG_CHECKING([OpenSSL library version])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
#include <string.h>
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
#define DATA "conftest.ssllibver"
-int main(void) {
+ ]],
+ [[
FILE *fd;
int rc;
@@ -2087,7 +2058,6 @@
exit(1);
exit(0);
-}
]])],
[
ssl_library_ver=`cat conftest.ssllibver`
@@ -2113,11 +2083,10 @@
# Sanity check OpenSSL headers
AC_MSG_CHECKING([whether OpenSSL's headers match the library])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <string.h>
-#include <openssl/opensslv.h>
-int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
- ]])],
+#include <openssl/opensslv.h>]],
+ [[exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1);]])],
[
AC_MSG_RESULT(yes)
],
@@ -2143,10 +2112,8 @@
AC_MSG_CHECKING([if programs using OpenSSL functions will link])
AC_LINK_IFELSE(
- [AC_LANG_SOURCE([[
-#include <openssl/evp.h>
-int main(void) { SSLeay_add_all_algorithms(); }
- ]])],
+ [AC_LANG_PROGRAM([[#include <openssl/evp.h>]],
+ [[SSLeay_add_all_algorithms();]])],
[
AC_MSG_RESULT(yes)
],
@@ -2156,10 +2123,8 @@
LIBS="$LIBS -ldl"
AC_MSG_CHECKING([if programs using OpenSSL need -ldl])
AC_LINK_IFELSE(
- [AC_LANG_SOURCE([[
-#include <openssl/evp.h>
-int main(void) { SSLeay_add_all_algorithms(); }
- ]])],
+ [AC_LANG_PROGRAM([[#include <openssl/evp.h>]],
+ [[SSLeay_add_all_algorithms();]])],
[
AC_MSG_RESULT(yes)
],
@@ -2183,7 +2148,7 @@
ENGINE_load_builtin_engines();ENGINE_register_all_complete();
],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(USE_OPENSSL_ENGINE, 1,
+ AC_DEFINE([USE_OPENSSL_ENGINE], [1],
[Enable OpenSSL engine support])
],
[ AC_MSG_ERROR(OpenSSL ENGINE support not found)]
@@ -2194,34 +2159,32 @@
# Check for OpenSSL without EVP_aes_{192,256}_cbc
AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
AC_LINK_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <string.h>
-#include <openssl/evp.h>
-int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);}
- ]])],
+#include <openssl/evp.h>]],
+ [[exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);]])],
[
AC_MSG_RESULT(no)
],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(OPENSSL_LOBOTOMISED_AES, 1,
+ AC_DEFINE([OPENSSL_LOBOTOMISED_AES], [1],
[libcrypto is missing AES 192 and 256 bit functions])
]
)
AC_MSG_CHECKING([if EVP_DigestUpdate returns an int])
AC_LINK_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <string.h>
-#include <openssl/evp.h>
-int main(void) { if(EVP_DigestUpdate(NULL, NULL,0)) exit(0); }
- ]])],
+#include <openssl/evp.h>]],
+ [[if(EVP_DigestUpdate(NULL, NULL,0)) exit(0);]])],
[
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
- AC_DEFINE(OPENSSL_EVP_DIGESTUPDATE_VOID, 1,
+ AC_DEFINE([OPENSSL_EVP_DIGESTUPDATE_VOID], [1],
[Define if EVP_DigestUpdate returns void])
]
)
@@ -2244,18 +2207,17 @@
# Check complete ECC support in OpenSSL
AC_MSG_CHECKING([whether OpenSSL has complete ECC support])
AC_LINK_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <openssl/ec.h>
#include <openssl/evp.h>
-#include <openssl/objects.h>
-int main(void) {
+#include <openssl/objects.h>]],
+ [[
EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp521r1);
const EVP_MD *m = EVP_sha512(); /* We need this too */
-}
]])],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(OPENSSL_HAS_ECC, 1,
+ AC_DEFINE([OPENSSL_HAS_ECC], [1],
[libcrypto includes complete ECC support])
TEST_SSH_ECC=yes
COMMENT_OUT_ECC=""
@@ -2273,7 +2235,7 @@
AC_CHECK_LIB(iaf, ia_openinfo, [
LIBS="$LIBS -liaf"
AC_CHECK_FUNCS(set_id, [SSHDLIBS="$SSHDLIBS -liaf"
- AC_DEFINE(HAVE_LIBIAF, 1,
+ AC_DEFINE([HAVE_LIBIAF], [1],
[Define if system has libiaf that supports set_id])
])
])
@@ -2284,11 +2246,10 @@
# Check wheter OpenSSL seeds itself
AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <string.h>
-#include <openssl/rand.h>
-int main(void) { exit(RAND_status() == 1 ? 0 : 1); }
- ]])],
+#include <openssl/rand.h>]],
+ [[exit(RAND_status() == 1 ? 0 : 1);]])],
[
OPENSSL_SEEDS_ITSELF=yes
AC_MSG_RESULT(yes)
@@ -2328,7 +2289,7 @@
PAM_MSG="yes"
SSHDLIBS="$SSHDLIBS -lpam"
- AC_DEFINE(USE_PAM, 1,
+ AC_DEFINE([USE_PAM], [1],
[Define if you want to enable PAM support])
if test $ac_cv_lib_dl_dlopen = yes; then
@@ -2361,7 +2322,7 @@
[(void)pam_strerror((pam_handle_t *)NULL, -1);],
[AC_MSG_RESULT(no)],
[
- AC_DEFINE(HAVE_OLD_PAM, 1,
+ AC_DEFINE([HAVE_OLD_PAM], [1],
[Define if you have an old version of PAM
which takes only one argument to pam_strerror])
AC_MSG_RESULT(yes)
@@ -2391,7 +2352,7 @@
# Which randomness source do we use?
if test ! -z "$OPENSSL_SEEDS_ITSELF" && test -z "$USE_RAND_HELPER" ; then
# OpenSSL only
- AC_DEFINE(OPENSSL_PRNG_ONLY, 1,
+ AC_DEFINE([OPENSSL_PRNG_ONLY], [1],
[Define if you want OpenSSL's internally seeded PRNG only])
RAND_MSG="OpenSSL internal ONLY"
INSTALL_SSH_RAND_HELPER=""
@@ -2420,7 +2381,7 @@
esac
if test ! -z "$withval" ; then
PRNGD_PORT="$withval"
- AC_DEFINE_UNQUOTED(PRNGD_PORT, $PRNGD_PORT,
+ AC_DEFINE_UNQUOTED([PRNGD_PORT], [$PRNGD_PORT],
[Port number of PRNGD/EGD random number socket])
fi
]
@@ -2452,7 +2413,7 @@
AC_MSG_WARN(Entropy socket is not readable)
fi
PRNGD_SOCKET="$withval"
- AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET",
+ AC_DEFINE_UNQUOTED([PRNGD_SOCKET], ["$PRNGD_SOCKET"],
[Location of PRNGD/EGD random number socket])
fi
],
@@ -2464,7 +2425,7 @@
for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do
if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then
PRNGD_SOCKET="$sock"
- AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET")
+ AC_DEFINE_UNQUOTED([PRNGD_SOCKET], ["$PRNGD_SOCKET"])
break;
fi
done
@@ -2488,7 +2449,7 @@
fi
]
)
-AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout,
+AC_DEFINE_UNQUOTED([ENTROPY_TIMEOUT_MSEC], [$entropy_timeout],
[Builtin PRNG command timeout])
SSH_PRIVSEP_USER=sshd
@@ -2501,7 +2462,7 @@
fi
]
)
-AC_DEFINE_UNQUOTED(SSH_PRIVSEP_USER, "$SSH_PRIVSEP_USER",
+AC_DEFINE_UNQUOTED([SSH_PRIVSEP_USER], ["$SSH_PRIVSEP_USER"],
[non-privileged user for privilege separation])
AC_SUBST(SSH_PRIVSEP_USER)
@@ -2579,7 +2540,7 @@
if test -z "$have_llong_max"; then
AC_MSG_CHECKING([for max value of long long])
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
#include <stdio.h>
/* Why is this so damn hard? */
#ifdef __GNUC__
@@ -2615,8 +2576,8 @@
return -1;
return 0;
}
-
-int main(void) {
+ ]],
+ [[
FILE *f;
long long i, llmin, llmax = 0;
@@ -2650,18 +2611,17 @@
if (fclose(f) < 0)
exit(5);
exit(0);
-}
]])],
[
llong_min=`$AWK '{print $1}' conftest.llminmax`
llong_max=`$AWK '{print $2}' conftest.llminmax`
AC_MSG_RESULT($llong_max)
- AC_DEFINE_UNQUOTED(LLONG_MAX, [${llong_max}LL],
+ AC_DEFINE_UNQUOTED([LLONG_MAX], [${llong_max}LL],
[max value of long long calculated by configure])
AC_MSG_CHECKING([for min value of long long])
AC_MSG_RESULT($llong_min)
- AC_DEFINE_UNQUOTED(LLONG_MIN, [${llong_min}LL],
+ AC_DEFINE_UNQUOTED([LLONG_MIN], [${llong_min}LL],
[min value of long long calculated by configure])
],
[
@@ -2684,7 +2644,7 @@
)
])
if test "x$ac_cv_have_u_int" = "xyes" ; then
- AC_DEFINE(HAVE_U_INT, 1, [define if you have u_int data type])
+ AC_DEFINE([HAVE_U_INT], [1], [define if you have u_int data type])
have_u_int=1
fi
@@ -2697,7 +2657,7 @@
)
])
if test "x$ac_cv_have_intxx_t" = "xyes" ; then
- AC_DEFINE(HAVE_INTXX_T, 1, [define if you have intxx_t data type])
+ AC_DEFINE([HAVE_INTXX_T], [1], [define if you have intxx_t data type])
have_intxx_t=1
fi
@@ -2709,7 +2669,7 @@
[ #include <stdint.h> ],
[ int8_t a; int16_t b; int32_t c; a = b = c = 1;],
[
- AC_DEFINE(HAVE_INTXX_T)
+ AC_DEFINE([HAVE_INTXX_T])
AC_MSG_RESULT(yes)
],
[ AC_MSG_RESULT(no) ]
@@ -2734,7 +2694,7 @@
)
])
if test "x$ac_cv_have_int64_t" = "xyes" ; then
- AC_DEFINE(HAVE_INT64_T, 1, [define if you have int64_t data type])
+ AC_DEFINE([HAVE_INT64_T], [1], [define if you have int64_t data type])
fi
AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
@@ -2746,7 +2706,7 @@
)
])
if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
- AC_DEFINE(HAVE_U_INTXX_T, 1, [define if you have u_intxx_t data type])
+ AC_DEFINE([HAVE_U_INTXX_T], [1], [define if you have u_intxx_t data type])
have_u_intxx_t=1
fi
@@ -2756,7 +2716,7 @@
[ #include <sys/socket.h> ],
[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;],
[
- AC_DEFINE(HAVE_U_INTXX_T)
+ AC_DEFINE([HAVE_U_INTXX_T])
AC_MSG_RESULT(yes)
],
[ AC_MSG_RESULT(no) ]
@@ -2772,7 +2732,7 @@
)
])
if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
- AC_DEFINE(HAVE_U_INT64_T, 1, [define if you have u_int64_t data type])
+ AC_DEFINE([HAVE_U_INT64_T], [1], [define if you have u_int64_t data type])
have_u_int64_t=1
fi
@@ -2782,7 +2742,7 @@
[ #include <sys/bitypes.h> ],
[ u_int64_t a; a = 1],
[
- AC_DEFINE(HAVE_U_INT64_T)
+ AC_DEFINE([HAVE_U_INT64_T])
AC_MSG_RESULT(yes)
],
[ AC_MSG_RESULT(no) ]
@@ -2801,7 +2761,7 @@
)
])
if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
- AC_DEFINE(HAVE_UINTXX_T, 1,
+ AC_DEFINE([HAVE_UINTXX_T], [1],
[define if you have uintxx_t data type])
fi
fi
@@ -2812,7 +2772,7 @@
[ #include <stdint.h> ],
[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;],
[
- AC_DEFINE(HAVE_UINTXX_T)
+ AC_DEFINE([HAVE_UINTXX_T])
AC_MSG_RESULT(yes)
],
[ AC_MSG_RESULT(no) ]
@@ -2833,8 +2793,8 @@
a = b = c = e = f = g = 1;
],
[
- AC_DEFINE(HAVE_U_INTXX_T)
- AC_DEFINE(HAVE_INTXX_T)
+ AC_DEFINE([HAVE_U_INTXX_T])
+ AC_DEFINE([HAVE_INTXX_T])
AC_MSG_RESULT(yes)
],
[AC_MSG_RESULT(no)]
@@ -2853,7 +2813,7 @@
)
])
if test "x$ac_cv_have_u_char" = "xyes" ; then
- AC_DEFINE(HAVE_U_CHAR, 1, [define if you have u_char data type])
+ AC_DEFINE([HAVE_U_CHAR], [1], [define if you have u_char data type])
fi
TYPE_SOCKLEN_T
@@ -2887,7 +2847,7 @@
)
])
if test "x$ac_cv_have_size_t" = "xyes" ; then
- AC_DEFINE(HAVE_SIZE_T, 1, [define if you have size_t data type])
+ AC_DEFINE([HAVE_SIZE_T], [1], [define if you have size_t data type])
fi
AC_CACHE_CHECK([for ssize_t], ac_cv_have_ssize_t, [
@@ -2901,7 +2861,7 @@
)
])
if test "x$ac_cv_have_ssize_t" = "xyes" ; then
- AC_DEFINE(HAVE_SSIZE_T, 1, [define if you have ssize_t data type])
+ AC_DEFINE([HAVE_SSIZE_T], [1], [define if you have ssize_t data type])
fi
AC_CACHE_CHECK([for clock_t], ac_cv_have_clock_t, [
@@ -2915,7 +2875,7 @@
)
])
if test "x$ac_cv_have_clock_t" = "xyes" ; then
- AC_DEFINE(HAVE_CLOCK_T, 1, [define if you have clock_t data type])
+ AC_DEFINE([HAVE_CLOCK_T], [1], [define if you have clock_t data type])
fi
AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [
@@ -2940,7 +2900,7 @@
)
])
if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
- AC_DEFINE(HAVE_SA_FAMILY_T, 1,
+ AC_DEFINE([HAVE_SA_FAMILY_T], [1],
[define if you have sa_family_t data type])
fi
@@ -2955,7 +2915,7 @@
)
])
if test "x$ac_cv_have_pid_t" = "xyes" ; then
- AC_DEFINE(HAVE_PID_T, 1, [define if you have pid_t data type])
+ AC_DEFINE([HAVE_PID_T], [1], [define if you have pid_t data type])
fi
AC_CACHE_CHECK([for mode_t], ac_cv_have_mode_t, [
@@ -2969,7 +2929,7 @@
)
])
if test "x$ac_cv_have_mode_t" = "xyes" ; then
- AC_DEFINE(HAVE_MODE_T, 1, [define if you have mode_t data type])
+ AC_DEFINE([HAVE_MODE_T], [1], [define if you have mode_t data type])
fi
@@ -2985,7 +2945,7 @@
)
])
if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
- AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
+ AC_DEFINE([HAVE_STRUCT_SOCKADDR_STORAGE], [1],
[define if you have struct sockaddr_storage data type])
fi
@@ -3001,7 +2961,7 @@
)
])
if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
- AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1,
+ AC_DEFINE([HAVE_STRUCT_SOCKADDR_IN6], [1],
[define if you have struct sockaddr_in6 data type])
fi
@@ -3017,7 +2977,7 @@
)
])
if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
- AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1,
+ AC_DEFINE([HAVE_STRUCT_IN6_ADDR], [1],
[define if you have struct in6_addr data type])
dnl Now check for sin6_scope_id
@@ -3043,7 +3003,7 @@
)
])
if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
- AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1,
+ AC_DEFINE([HAVE_STRUCT_ADDRINFO], [1],
[define if you have struct addrinfo data type])
fi
@@ -3056,7 +3016,7 @@
)
])
if test "x$ac_cv_have_struct_timeval" = "xyes" ; then
- AC_DEFINE(HAVE_STRUCT_TIMEVAL, 1, [define if you have struct timeval])
+ AC_DEFINE([HAVE_STRUCT_TIMEVAL], [1], [define if you have struct timeval])
have_struct_timeval=1
fi
@@ -3096,7 +3056,7 @@
#else
main() { exit(0); }
#endif
- ]])], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ],
+ ]])], [ true ], [ AC_DEFINE([BROKEN_SNPRINTF]) ],
AC_MSG_WARN([cross compiling: Assuming working snprintf()])
)
fi
@@ -3121,7 +3081,7 @@
OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX)
AC_CHECK_MEMBERS([struct stat.st_blksize])
-AC_CHECK_MEMBER([struct __res_state.retrans], [], [AC_DEFINE(__res_state, state,
+AC_CHECK_MEMBER([struct __res_state.retrans], [], [AC_DEFINE([__res_state], [state],
[Define if we don't have struct __res_state in resolv.h])],
[
#include <stdio.h>
@@ -3146,7 +3106,7 @@
)
])
if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then
- AC_DEFINE(HAVE_SS_FAMILY_IN_SS, 1, [Fields in struct sockaddr_storage])
+ AC_DEFINE([HAVE_SS_FAMILY_IN_SS], [1], [Fields in struct sockaddr_storage])
fi
AC_CACHE_CHECK([for __ss_family field in struct sockaddr_storage],
@@ -3162,7 +3122,7 @@
)
])
if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
- AC_DEFINE(HAVE___SS_FAMILY_IN_SS, 1,
+ AC_DEFINE([HAVE___SS_FAMILY_IN_SS], [1],
[Fields in struct sockaddr_storage])
fi
@@ -3178,7 +3138,7 @@
)
])
if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then
- AC_DEFINE(HAVE_PW_CLASS_IN_PASSWD, 1,
+ AC_DEFINE([HAVE_PW_CLASS_IN_PASSWD], [1],
[Define if your password has a pw_class field])
fi
@@ -3194,7 +3154,7 @@
)
])
if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then
- AC_DEFINE(HAVE_PW_EXPIRE_IN_PASSWD, 1,
+ AC_DEFINE([HAVE_PW_EXPIRE_IN_PASSWD], [1],
[Define if your password has a pw_expire field])
fi
@@ -3210,19 +3170,20 @@
)
])
if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then
- AC_DEFINE(HAVE_PW_CHANGE_IN_PASSWD, 1,
+ AC_DEFINE([HAVE_PW_CHANGE_IN_PASSWD], [1],
[Define if your password has a pw_change field])
fi
dnl make sure we're using the real structure members and not defines
AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
ac_cv_have_accrights_in_msghdr, [
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
[
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
-int main() {
+ ]],
+ [[
#ifdef msg_accrights
#error "msg_accrights is a macro"
exit(1);
@@ -3230,14 +3191,13 @@
struct msghdr m;
m.msg_accrights = 0;
exit(0);
-}
- ],
+ ]])],
[ ac_cv_have_accrights_in_msghdr="yes" ],
[ ac_cv_have_accrights_in_msghdr="no" ]
)
])
if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
- AC_DEFINE(HAVE_ACCRIGHTS_IN_MSGHDR, 1,
+ AC_DEFINE([HAVE_ACCRIGHTS_IN_MSGHDR], [1],
[Define if your system uses access rights style
file descriptor passing])
fi
@@ -3265,7 +3225,7 @@
#include <sys/statvfs.h>],
[fsid_t t; t.val[0] = 0;],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(FSID_HAS_VAL, 1, fsid_t has member val) ],
+ AC_DEFINE([FSID_HAS_VAL], [1], fsid_t has member val) ],
[ AC_MSG_RESULT(no) ])
AC_MSG_CHECKING(if f_fsid has member __val)
@@ -3274,18 +3234,19 @@
#include <sys/statvfs.h>],
[fsid_t t; t.__val[0] = 0;],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(FSID_HAS___VAL, 1, fsid_t has member __val) ],
+ AC_DEFINE([FSID_HAS___VAL], [1], fsid_t has member __val) ],
[ AC_MSG_RESULT(no) ])
])
AC_CACHE_CHECK([for msg_control field in struct msghdr],
ac_cv_have_control_in_msghdr, [
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
[
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
-int main() {
+ ]],
+ [[
#ifdef msg_control
#error "msg_control is a macro"
exit(1);
@@ -3293,14 +3254,13 @@
struct msghdr m;
m.msg_control = 0;
exit(0);
-}
- ],
+ ]])],
[ ac_cv_have_control_in_msghdr="yes" ],
[ ac_cv_have_control_in_msghdr="no" ]
)
])
if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
- AC_DEFINE(HAVE_CONTROL_IN_MSGHDR, 1,
+ AC_DEFINE([HAVE_CONTROL_IN_MSGHDR], [1],
[Define if your system uses ancillary data style
file descriptor passing])
fi
@@ -3313,7 +3273,7 @@
)
])
if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
- AC_DEFINE(HAVE___PROGNAME, 1, [Define if libc defines __progname])
+ AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
fi
AC_CACHE_CHECK([whether $CC implements __FUNCTION__], ac_cv_cc_implements___FUNCTION__, [
@@ -3326,7 +3286,7 @@
)
])
if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then
- AC_DEFINE(HAVE___FUNCTION__, 1,
+ AC_DEFINE([HAVE___FUNCTION__], [1],
[Define if compiler implements __FUNCTION__])
fi
@@ -3340,7 +3300,7 @@
)
])
if test "x$ac_cv_cc_implements___func__" = "xyes" ; then
- AC_DEFINE(HAVE___func__, 1, [Define if compiler implements __func__])
+ AC_DEFINE([HAVE___func__], [1], [Define if compiler implements __func__])
fi
AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
@@ -3353,7 +3313,7 @@
)
])
if test "x$ac_cv_have_va_copy" = "xyes" ; then
- AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy exists])
+ AC_DEFINE([HAVE_VA_COPY], [1], [Define if va_copy exists])
fi
AC_CACHE_CHECK([whether __va_copy exists], ac_cv_have___va_copy, [
@@ -3366,7 +3326,7 @@
)
])
if test "x$ac_cv_have___va_copy" = "xyes" ; then
- AC_DEFINE(HAVE___VA_COPY, 1, [Define if __va_copy exists])
+ AC_DEFINE([HAVE___VA_COPY], [1], [Define if __va_copy exists])
fi
AC_CACHE_CHECK([whether getopt has optreset support],
@@ -3381,7 +3341,7 @@
)
])
if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
- AC_DEFINE(HAVE_GETOPT_OPTRESET, 1,
+ AC_DEFINE([HAVE_GETOPT_OPTRESET], [1],
[Define if your getopt(3) defines and uses optreset])
fi
@@ -3393,7 +3353,7 @@
)
])
if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
- AC_DEFINE(HAVE_SYS_ERRLIST, 1,
+ AC_DEFINE([HAVE_SYS_ERRLIST], [1],
[Define if your system defines sys_errlist[]])
fi
@@ -3406,49 +3366,39 @@
)
])
if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
- AC_DEFINE(HAVE_SYS_NERR, 1, [Define if your system defines sys_nerr])
+ AC_DEFINE([HAVE_SYS_NERR], [1], [Define if your system defines sys_nerr])
fi
# Check libraries needed by DNS fingerprint support
-AC_SEARCH_LIBS(getrrsetbyname, resolv,
- [AC_DEFINE(HAVE_GETRRSETBYNAME, 1,
+AC_SEARCH_LIBS([getrrsetbyname], [resolv],
+ [AC_DEFINE([HAVE_GETRRSETBYNAME], [1],
[Define if getrrsetbyname() exists])],
[
# Needed by our getrrsetbyname()
- AC_SEARCH_LIBS(res_query, resolv)
- AC_SEARCH_LIBS(dn_expand, resolv)
+ AC_SEARCH_LIBS([res_query], [resolv])
+ AC_SEARCH_LIBS([dn_expand], [resolv])
AC_MSG_CHECKING(if res_query will link)
- AC_LINK_IFELSE([
-#include "confdefs.h"
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-int main()
-{
- res_query (0, 0, 0, 0, 0);
- return 0;
-}
- ],
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
+ #include <netdb.h>
+ #include <resolv.h>]],
+ [[ res_query (0, 0, 0, 0, 0);
+ return 0;]])],
AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
saved_LIBS="$LIBS"
LIBS="$LIBS -lresolv"
AC_MSG_CHECKING(for res_query in -lresolv)
- AC_LINK_IFELSE([
-#include "confdefs.h"
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-int main()
-{
- res_query (0, 0, 0, 0, 0);
- return 0;
-}
- ],
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
+ #include <netdb.h>
+ #include <resolv.h>]],
+ [[ res_query (0, 0, 0, 0, 0);
+ return 0;]])],
[AC_MSG_RESULT(yes)],
[LIBS="$saved_LIBS"
AC_MSG_RESULT(no)])
@@ -3458,25 +3408,24 @@
[#include <sys/types.h>
#include <arpa/nameser.h>])
AC_CHECK_MEMBER(HEADER.ad,
- [AC_DEFINE(HAVE_HEADER_AD, 1,
+ [AC_DEFINE([HAVE_HEADER_AD], [1],
[Define if HEADER.ad exists in arpa/nameser.h])],,
[#include <arpa/nameser.h>])
])
AC_MSG_CHECKING(if struct __res_state _res is an extern)
-AC_LINK_IFELSE([
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-extern struct __res_state _res;
-int main() { return 0; }
- ],
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[#include <stdio.h>
+ #if HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ extern struct __res_state _res;]],
+ [[return 0;]])],
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE__RES_EXTERN, 1,
+ AC_DEFINE([HAVE__RES_EXTERN], [1],
[Define if you have struct __res_state _res as an extern])
],
[ AC_MSG_RESULT(no) ]
@@ -3489,7 +3438,7 @@
[ --with-selinux Enable SELinux support],
[ if test "x$withval" != "xno" ; then
save_LIBS="$LIBS"
- AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.])
+ AC_DEFINE([WITH_SELINUX],[1],[Define if you want SELinux support.])
SELINUX_MSG="yes"
AC_CHECK_HEADER([selinux/selinux.h], ,
AC_MSG_ERROR(SELinux support requires selinux.h header))
@@ -3515,7 +3464,7 @@
KRB5ROOT=${withval}
fi
- AC_DEFINE(KRB5, 1, [Define if you want Kerberos 5 support])
+ AC_DEFINE([KRB5], [1], [Define if you want Kerberos 5 support])
KRB5_MSG="yes"
AC_PATH_PROG([KRB5CONF],[krb5-config],
@@ -3526,7 +3475,7 @@
AC_MSG_CHECKING(for gssapi support)
if $KRB5CONF | grep gssapi >/dev/null ; then
AC_MSG_RESULT(yes)
- AC_DEFINE(GSSAPI, 1,
+ AC_DEFINE([GSSAPI], [1],
[Define this if you want GSSAPI
support in the version 2 protocol])
k5confopts=gssapi
@@ -3541,7 +3490,7 @@
AC_TRY_COMPILE([ #include <krb5.h> ],
[ char *tmp = heimdal_version; ],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(HEIMDAL, 1,
+ AC_DEFINE([HEIMDAL], [1],
[Define this if you are using the
Heimdal version of Kerberos V5]) ],
AC_MSG_RESULT(no)
@@ -3553,7 +3502,7 @@
AC_TRY_COMPILE([ #include <krb5.h> ],
[ char *tmp = heimdal_version; ],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(HEIMDAL)
+ AC_DEFINE([HEIMDAL])
K5LIBS="-lkrb5"
K5LIBS="$K5LIBS -lcom_err -lasn1"
AC_CHECK_LIB(roken, net_write,
@@ -3568,10 +3517,10 @@
AC_SEARCH_LIBS(dn_expand, resolv)
AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context,
- [ AC_DEFINE(GSSAPI)
+ [ AC_DEFINE([GSSAPI])
K5LIBS="-lgssapi_krb5 $K5LIBS" ],
[ AC_CHECK_LIB(gssapi, gss_init_sec_context,
- [ AC_DEFINE(GSSAPI)
+ [ AC_DEFINE([GSSAPI])
K5LIBS="-lgssapi $K5LIBS" ],
AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
$K5LIBS)
@@ -3605,7 +3554,7 @@
AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h)
LIBS="$LIBS $K5LIBS"
- AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS, 1,
+ AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE([USE_AFS], [1],
[Define this if you want to use libkafs' AFS support]))
fi
]
@@ -3661,7 +3610,7 @@
XAUTH_PATH="undefined"
AC_SUBST(XAUTH_PATH)
else
- AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path",
+ AC_DEFINE_UNQUOTED([XAUTH_PATH], ["$xauth_path"],
[Define if xauth is found in your path])
XAUTH_PATH=$xauth_path
AC_SUBST(XAUTH_PATH)
@@ -3670,7 +3619,7 @@
# Check for mail directory (last resort if we cannot get it from headers)
if test ! -z "$MAIL" ; then
maildir=`dirname $MAIL`
- AC_DEFINE_UNQUOTED(MAIL_DIRECTORY, "$maildir",
+ AC_DEFINE_UNQUOTED([MAIL_DIRECTORY], ["$maildir"],
[Set this to your mail directory if you don't have maillock.h])
fi
@@ -3682,7 +3631,7 @@
if test "x$disable_ptmx_check" != "xyes" ; then
AC_CHECK_FILE("/dev/ptmx",
[
- AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX, 1,
+ AC_DEFINE_UNQUOTED([HAVE_DEV_PTMX], [1],
[Define if you have /dev/ptmx])
have_dev_ptmx=1
]
@@ -3693,7 +3642,7 @@
if test ! -z "$cross_compiling" && test "x$cross_compiling" != "xyes"; then
AC_CHECK_FILE("/dev/ptc",
[
- AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC, 1,
+ AC_DEFINE_UNQUOTED([HAVE_DEV_PTS_AND_PTC], [1],
[Define if you have /dev/ptc])
have_dev_ptc=1
]
@@ -3741,7 +3690,7 @@
[ --with-md5-passwords Enable use of MD5 passwords],
[
if test "x$withval" != "xno" ; then
- AC_DEFINE(HAVE_MD5_PASSWORDS, 1,
+ AC_DEFINE([HAVE_MD5_PASSWORDS], [1],
[Define if you want to allow MD5 passwords])
MD5_MSG="yes"
fi
@@ -3753,7 +3702,7 @@
[ --without-shadow Disable shadow password support],
[
if test "x$withval" = "xno" ; then
- AC_DEFINE(DISABLE_SHADOW)
+ AC_DEFINE([DISABLE_SHADOW])
disable_shadow=yes
fi
]
@@ -3772,7 +3721,7 @@
if test "x$sp_expire_available" = "xyes" ; then
AC_MSG_RESULT(yes)
- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
+ AC_DEFINE([HAS_SHADOW_EXPIRE], [1],
[Define if you want to use shadow password expire field])
else
AC_MSG_RESULT(no)
@@ -3782,7 +3731,7 @@
# Use ip address instead of hostname in $DISPLAY
if test ! -z "$IPADDR_IN_DISPLAY" ; then
DISPLAY_HACK_MSG="yes"
- AC_DEFINE(IPADDR_IN_DISPLAY, 1,
+ AC_DEFINE([IPADDR_IN_DISPLAY], [1],
[Define if you need to use IP address
instead of hostname in $DISPLAY])
else
@@ -3791,7 +3740,7 @@
[ --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY],
[
if test "x$withval" != "xno" ; then
- AC_DEFINE(IPADDR_IN_DISPLAY)
+ AC_DEFINE([IPADDR_IN_DISPLAY])
DISPLAY_HACK_MSG="yes"
fi
]
@@ -3820,7 +3769,7 @@
AC_CHECK_FILE("/etc/default/login",
[ external_path_file=/etc/default/login ])
if test "x$external_path_file" = "x/etc/default/login"; then
- AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN, 1,
+ AC_DEFINE([HAVE_ETC_DEFAULT_LOGIN], [1],
[Define if your system has /etc/default/login])
fi
fi
@@ -3859,7 +3808,7 @@
otherwise scp will not work.])
fi
AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ [AC_LANG_PROGRAM([[
/* find out what STDPATH is */
#include <stdio.h>
#ifdef HAVE_PATHS_H
@@ -3876,9 +3825,8 @@
#include <sys/stat.h>
#include <fcntl.h>
#define DATA "conftest.stdpath"
-
-main()
-{
+ ]],
+ [[
FILE *fd;
int rc;
@@ -3890,7 +3838,6 @@
exit(1);
exit(0);
-}
]])],
[ user_path=`cat conftest.stdpath` ],
[ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ],
@@ -3915,7 +3862,7 @@
fi ]
)
if test "x$external_path_file" != "x/etc/login.conf" ; then
- AC_DEFINE_UNQUOTED(USER_PATH, "$user_path", [Specify default $PATH])
+ AC_DEFINE_UNQUOTED([USER_PATH], ["$user_path"], [Specify default $PATH])
AC_SUBST(user_path)
fi
@@ -3925,7 +3872,7 @@
[
if test -n "$withval" && test "x$withval" != "xno" && \
test "x${withval}" != "xyes"; then
- AC_DEFINE_UNQUOTED(SUPERUSER_PATH, "$withval",
+ AC_DEFINE_UNQUOTED([SUPERUSER_PATH], ["$withval"],
[Define if you want a different $PATH
for the superuser])
superuser_path=$withval
@@ -3941,7 +3888,7 @@
[
if test "x$withval" != "xno" ; then
AC_MSG_RESULT(yes)
- AC_DEFINE(IPV4_IN_IPV6, 1,
+ AC_DEFINE([IPV4_IN_IPV6], [1],
[Detect IPv4 in IPv6 mapped addresses
and treat as IPv4])
IPV4_IN6_HACK_MSG="yes"
@@ -3951,7 +3898,7 @@
],[
if test "x$inet6_default_4in6" = "xyes"; then
AC_MSG_RESULT([yes (default)])
- AC_DEFINE(IPV4_IN_IPV6)
+ AC_DEFINE([IPV4_IN_IPV6])
IPV4_IN6_HACK_MSG="yes"
else
AC_MSG_RESULT([no (default)])
@@ -3965,7 +3912,7 @@
[ --with-bsd-auth Enable BSD auth support],
[
if test "x$withval" != "xno" ; then
- AC_DEFINE(BSD_AUTH, 1,
+ AC_DEFINE([BSD_AUTH], [1],
[Define if you have BSD auth support])
BSD_AUTH_MSG=yes
fi
@@ -3995,7 +3942,7 @@
]
)
-AC_DEFINE_UNQUOTED(_PATH_SSH_PIDDIR, "$piddir", [Specify location of ssh.pid])
+AC_DEFINE_UNQUOTED([_PATH_SSH_PIDDIR], ["$piddir"], [Specify location of ssh.pid])
AC_SUBST(piddir)
dnl allow user to disable some login recording features
@@ -4003,7 +3950,7 @@
[ --disable-lastlog disable use of lastlog even if detected [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_LASTLOG)
+ AC_DEFINE([DISABLE_LASTLOG])
fi
]
)
@@ -4011,7 +3958,7 @@
[ --disable-utmp disable use of utmp even if detected [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_UTMP)
+ AC_DEFINE([DISABLE_UTMP])
fi
]
)
@@ -4019,7 +3966,7 @@
[ --disable-utmpx disable use of utmpx even if detected [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_UTMPX, 1,
+ AC_DEFINE([DISABLE_UTMPX], [1],
[Define if you don't want to use utmpx])
fi
]
@@ -4028,7 +3975,7 @@
[ --disable-wtmp disable use of wtmp even if detected [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_WTMP)
+ AC_DEFINE([DISABLE_WTMP])
fi
]
)
@@ -4036,7 +3983,7 @@
[ --disable-wtmpx disable use of wtmpx even if detected [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_WTMPX, 1,
+ AC_DEFINE([DISABLE_WTMPX], [1],
[Define if you don't want to use wtmpx])
fi
]
@@ -4045,7 +3992,7 @@
[ --disable-libutil disable use of libutil (login() etc.) [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_LOGIN)
+ AC_DEFINE([DISABLE_LOGIN])
fi
]
)
@@ -4053,7 +4000,7 @@
[ --disable-pututline disable use of pututline() etc. ([uw]tmp) [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_PUTUTLINE, 1,
+ AC_DEFINE([DISABLE_PUTUTLINE], [1],
[Define if you don't want to use pututline()
etc. to write [uw]tmp])
fi
@@ -4063,7 +4010,7 @@
[ --disable-pututxline disable use of pututxline() etc. ([uw]tmpx) [no]],
[
if test "x$enableval" = "xno" ; then
- AC_DEFINE(DISABLE_PUTUTXLINE, 1,
+ AC_DEFINE([DISABLE_PUTUTXLINE], [1],
[Define if you don't want to use pututxline()
etc. to write [uw]tmpx])
fi
@@ -4073,7 +4020,7 @@
[ --with-lastlog=FILE|DIR specify lastlog location [common locations]],
[
if test "x$withval" = "xno" ; then
- AC_DEFINE(DISABLE_LASTLOG)
+ AC_DEFINE([DISABLE_LASTLOG])
elif test -n "$withval" && test "x${withval}" != "xyes"; then
conf_lastlog_location=$withval
fi
@@ -4140,7 +4087,7 @@
fi
if test -n "$conf_lastlog_location"; then
- AC_DEFINE_UNQUOTED(CONF_LASTLOG_FILE, "$conf_lastlog_location",
+ AC_DEFINE_UNQUOTED([CONF_LASTLOG_FILE], ["$conf_lastlog_location"],
[Define if you want to specify the path to your lastlog file])
fi
@@ -4166,12 +4113,12 @@
fi
done
if test -z "$conf_utmp_location"; then
- AC_DEFINE(DISABLE_UTMP)
+ AC_DEFINE([DISABLE_UTMP])
fi
fi
fi
if test -n "$conf_utmp_location"; then
- AC_DEFINE_UNQUOTED(CONF_UTMP_FILE, "$conf_utmp_location",
+ AC_DEFINE_UNQUOTED([CONF_UTMP_FILE], ["$conf_utmp_location"],
[Define if you want to specify the path to your utmp file])
fi
@@ -4197,12 +4144,12 @@
fi
done
if test -z "$conf_wtmp_location"; then
- AC_DEFINE(DISABLE_WTMP)
+ AC_DEFINE([DISABLE_WTMP])
fi
fi
fi
if test -n "$conf_wtmp_location"; then
- AC_DEFINE_UNQUOTED(CONF_WTMP_FILE, "$conf_wtmp_location",
+ AC_DEFINE_UNQUOTED([CONF_WTMP_FILE], ["$conf_wtmp_location"],
[Define if you want to specify the path to your wtmp file])
fi
@@ -4226,10 +4173,10 @@
)
if test -z "$conf_wtmpx_location"; then
if test x"$system_wtmpx_path" = x"no" ; then
- AC_DEFINE(DISABLE_WTMPX)
+ AC_DEFINE([DISABLE_WTMPX])
fi
else
- AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location",
+ AC_DEFINE_UNQUOTED([CONF_WTMPX_FILE], ["$conf_wtmpx_location"],
[Define if you want to specify the path to your wtmpx file])
fi
More information about the openssh-unix-dev
mailing list