Attachment #2047 for bug #1901

View | Details | Raw Unified | Return to bug 1901
Collapse All | Expand All




AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])

# local macros
AC_DEFUN([OPENSSH_CHECK_CFLAG_COMPILE], [{
	AC_MSG_CHECKING([if $CC supports $1])
	saved_CFLAGS="$CFLAGS"
	CFLAGS="$CFLAGS $1"
	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
		[ AC_MSG_RESULT([yes]) ],
		[ AC_MSG_RESULT([no])
		  CFLAGS="$saved_CFLAGS" ]
	)
}])

AC_CONFIG_HEADER([config.h])
AC_PROG_CC
AC_CANONICAL_HOST



if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
	OSSH_CHECK_CFLAG_COMPILE([-Wall])
	OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith])
	OSSH_CHECK_CFLAG_COMPILE([-Wuninitialized])
	OSSH_CHECK_CFLAG_COMPILE([-Wsign-compare])
	OSSH_CHECK_CFLAG_COMPILE([-Wformat-security])
	OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign])
	OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result])
	OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
	AC_MSG_CHECKING([gcc version])
	GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'`
	case $GCC_VER in




dnl OpenSSH-specific autoconf macros
dnl

dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag])
dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
dnl 'check_flag'.
AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
	AC_MSG_CHECKING([if $CC supports $1])
	saved_CFLAGS="$CFLAGS"
	CFLAGS="$CFLAGS $1"
	_define_flag="$2"
	test "x$_define_flag" = "x" && _define_flag="$1"
	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
		[ AC_MSG_RESULT([yes])
		  CFLAGS="$saved_CFLAGS $_define_flag"],
		[ AC_MSG_RESULT([no])
		  CFLAGS="$saved_CFLAGS" ]
	)
}])


dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
dnl Does AC_EGREP_HEADER on 'header' for the string 'field'

Return to bug 1901

Lines 19-36 AC_REVISION($Revision: 1.473 $) Link Here

(-)configure.ac (-20 / +8 lines)
19	AC_CONFIG_SRCDIR([ssh.c])	19	AC_CONFIG_SRCDIR([ssh.c])
20	AC_LANG([C])	20	AC_LANG([C])
21		21
22	# local macros
23	AC_DEFUN([OPENSSH_CHECK_CFLAG_COMPILE], [{
24	AC_MSG_CHECKING([if $CC supports $1])
25	saved_CFLAGS="$CFLAGS"
26	CFLAGS="$CFLAGS $1"
27	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
28	[ AC_MSG_RESULT([yes]) ],
29	[ AC_MSG_RESULT([no])
30	CFLAGS="$saved_CFLAGS" ]
31	)
32	}])
33
34	AC_CONFIG_HEADER([config.h])	22	AC_CONFIG_HEADER([config.h])
35	AC_PROG_CC	23	AC_PROG_CC
36	AC_CANONICAL_HOST	24	AC_CANONICAL_HOST
Lines 128-141 AC_ARG_WITH([stackprotect], Link Here
128		116
129		117
130	if test "$GCC" = "yes" \|\| test "$GCC" = "egcs"; then	118	if test "$GCC" = "yes" \|\| test "$GCC" = "egcs"; then
131	OPENSSH_CHECK_CFLAG_COMPILE([-Wall])	119	OSSH_CHECK_CFLAG_COMPILE([-Wall])
132	OPENSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith])	120	OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith])
133	OPENSSH_CHECK_CFLAG_COMPILE([-Wuninitialized])	121	OSSH_CHECK_CFLAG_COMPILE([-Wuninitialized])
134	OPENSSH_CHECK_CFLAG_COMPILE([-Wsign-compare])	122	OSSH_CHECK_CFLAG_COMPILE([-Wsign-compare])
135	OPENSSH_CHECK_CFLAG_COMPILE([-Wformat-security])	123	OSSH_CHECK_CFLAG_COMPILE([-Wformat-security])
136	OPENSSH_CHECK_CFLAG_COMPILE([-Wno-pointer-sign])	124	OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign])
137	OPENSSH_CHECK_CFLAG_COMPILE([-Wno-unused-result])	125	OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result])
138	OPENSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])	126	OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
139	AC_MSG_CHECKING([gcc version])	127	AC_MSG_CHECKING([gcc version])
140	GCC_VER=`$CC -v 2>&1 \| $AWK '/gcc version /{print $3}'`	128	GCC_VER=`$CC -v 2>&1 \| $AWK '/gcc version /{print $3}'`
141	case $GCC_VER in	129	case $GCC_VER in

Lines 3-8 dnl Link Here

(-)aclocal.m4 (+18 lines)
3	dnl OpenSSH-specific autoconf macros	3	dnl OpenSSH-specific autoconf macros
4	dnl	4	dnl
5		5
		6	dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag])
		7	dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
		8	dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
		9	dnl 'check_flag'.
		10	AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
		11	AC_MSG_CHECKING([if $CC supports $1])
		12	saved_CFLAGS="$CFLAGS"
		13	CFLAGS="$CFLAGS $1"
		14	_define_flag="$2"
		15	test "x$_define_flag" = "x" && _define_flag="$1"
		16	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
		17	[ AC_MSG_RESULT([yes])
		18	CFLAGS="$saved_CFLAGS $_define_flag"],
		19	[ AC_MSG_RESULT([no])
		20	CFLAGS="$saved_CFLAGS" ]
		21	)
		22	}])
		23
6		24
7	dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)	25	dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
8	dnl Does AC_EGREP_HEADER on 'header' for the string 'field'	26	dnl Does AC_EGREP_HEADER on 'header' for the string 'field'