From 1ae422826e8a7819d82469ed11c86721d53aaec1 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Mon, 31 Dec 2001 21:57:16 +0000
Subject: [PATCH]  o Call AC_PROG_CC_STDC to find out how to run the compiler
 in ANSI mode  o Remove compiler-specific checks for HP-UX now that we use
 AC_PROG_CC_STDC

---
 configure.in | 53 ++--------------------------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/configure.in b/configure.in
index 5acb4bb17..4b72016d0 100644
--- a/configure.in
+++ b/configure.in
@@ -1069,13 +1069,13 @@ dnl
 dnl C compiler checks
 dnl XXX - the cross-compiler check gets false positives so we override it
 dnl
+AC_ISC_POSIX
 ac_cv_prog_cc_cross="no"
 cross_compiling="no"
-AC_PROG_CC
+AC_PROG_CC_STDC
 ac_cv_prog_cc_cross="no"
 cross_compiling="no"
 AC_PROG_CPP
-AC_ISC_POSIX
 
 dnl
 dnl It is now safe to modify CFLAGS and CPPFLAGS
@@ -1170,35 +1170,11 @@ case "$host" in
 		mansectform=4
 		;;
     *-*-hpux1[[0-9]]*)
-		# uncomment this for a statically linked sudo
-		# (XXX - should be an option to configure)
-		#STATIC_SUDO=true
-
-		# If using cc, run in ANSI mode if possible
-		if test -z "$GCC"; then
-		    $CC -Aa 2>&1 | grep 'A option is available only' >conftest.out
-		    if test ! -s conftest.out; then
-			CPPFLAGS="${CPPFLAGS} -Aa"
-		    fi
-		    rm -f conftest.out
-		fi
-
-		# Add -D_HPUX_SOURCE so we don't get strict ANSI headers
-		CPPFLAGS="${CPPFLAGS} -D_HPUX_SOURCE"
-
 		if test "$CHECKSHADOW" = "true"; then
 		    AC_CHECK_LIB(sec, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) AC_CHECK_LIB(sec, iscomsec, AC_DEFINE(HAVE_ISCOMSEC)) [SUDO_LIBS="${SUDO_LIBS} -lsec"; LIBS="${LIBS} -lsec"; SECUREWARE=1])
 		    CHECKSHADOW="false"
 		fi
 
-		if test -n "$STATIC_SUDO"; then
-		    if test -n "$GCC"; then
-			SUDO_LDFLAGS="${SUDO_LDFLAGS} -static"
-		    else
-			SUDO_LDFLAGS="${SUDO_LDFLAGS} -Wl,-a,archive"
-		    fi
-		fi
-
 		# AFS support needs -lBSD
 		if test "$with_AFS" = "yes"; then
 		    AFS_LIBS="-lc -lBSD"
@@ -1207,22 +1183,6 @@ case "$host" in
 		mansectform=4
 		;;
     *-*-hpux9*)
-		# uncomment this for a statically linked sudo
-		# (XXX - should be an option to configure)
-		#STATIC_SUDO=true
-
-		# If using cc, run in ANSI mode if possible
-		if test -z "$GCC"; then
-		    $CC -Aa 2>&1 | grep 'A option is available only' >conftest.out
-		    if test ! -s conftest.out; then
-			CPPFLAGS="${CPPFLAGS} -Aa"
-		    fi
-		    rm -f conftest.out
-		fi
-
-		# Add -D_HPUX_SOURCE so we don't get strict ANSI headers
-		CPPFLAGS="${CPPFLAGS} -D_HPUX_SOURCE"
-
 		AC_DEFINE(BROKEN_SYSLOG)
 
 		if test "$CHECKSHADOW" = "true"; then
@@ -1230,14 +1190,6 @@ case "$host" in
 		    CHECKSHADOW="false"
 		fi
 
-		if test -n "$STATIC_SUDO"; then
-		    if test -n "$GCC"; then
-			SUDO_LDFLAGS="${SUDO_LDFLAGS} -static"
-		    else
-			SUDO_LDFLAGS="${SUDO_LDFLAGS} -Wl,-a,archive"
-		    fi
-		fi
-
 		# DCE support (requires ANSI C compiler)
 		if test "$with_DCE" = "yes"; then
 		    # order of libs in 9.X is important. -lc_r must be last
@@ -1254,7 +1206,6 @@ case "$host" in
 		mansectform=4
 		;;
     *-*-hpux*)
-
 		AC_DEFINE(BROKEN_SYSLOG)
 
 		# Not sure if setuid binaries are safe in < 9.x
-- 
2.40.0