From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 8 Sep 2011 13:36:24 +0000 (-0400)
Subject: Remove --with-CC option; it doesn't work correctly now that we use
X-Git-Tag: SUDO_1_8_3~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3b268c3a472d48accfd94271ccf9287cc69904c;p=sudo

Remove --with-CC option; it doesn't work correctly now that we use
libtool.  Users can get the same effect by setting the CC environment
variable when running configure.
---

diff --git a/INSTALL b/INSTALL
index d859abe9f..5ddbd2dff 100644
--- a/INSTALL
+++ b/INSTALL
@@ -99,9 +99,6 @@ Directory and file names:
 	Find the sources in DIR [configure dir or ..]
 
 Special features/options:
-  --with-CC=PATH
-	Specifies path to C compiler you wish to use.
-
   --with-incpath=DIR
 	Adds the specified directory (or directories) to CPPFLAGS
 	so configure and the compiler will look there for include
@@ -715,14 +712,15 @@ Solaris 2.x:
     CD.  You can also get them from various places on the net,
     including http://www.sunfreeware.com/
     NOTE: sudo will *not* build with the sun C compiler in BSD
-	  compatibility mode (/usr/ucb/cc).  Sudo is designed to
-	  compile with the standard C compiler (or gcc) and will
-	  not build correctly with /usr/ucb/cc.  You can use the
-	  `--with-CC' option to point `configure' to the non-ucb
-	  compiler if it is not the first cc in your path.  Some
-	  sites link /usr/ucb/cc to gcc; configure will not notice
-	  this and still refuse to use /usr/ucb/cc, so make sure gcc
-	  is also in your path if your site is setup this way.
+          compatibility mode (/usr/ucb/cc).  Sudo is designed to
+          compile with the standard C compiler (or gcc) and will
+          not build correctly with /usr/ucb/cc.  You can set the
+          CC environment variable to the non-ucb compiler when
+          running `configure' if it is not the first cc in your
+          path.  Some sites link /usr/ucb/cc to gcc; configure will
+          not notice this and still refuse to use /usr/ucb/cc, so
+          make sure gcc is also in your path if your site is setup
+          this way.
     Also: Older versions of Solaris come with a broken syslogd.
 	  If you have having problems with sudo logging you should
 	  make sure you have the latest syslogd patch installed.
diff --git a/configure b/configure
index fe6365f93..2dcc5a438 100755
--- a/configure
+++ b/configure
@@ -787,7 +787,6 @@ enable_option_checking
 with_otp_only
 with_alertmail
 with_devel
-with_CC
 with_rpath
 with_blibpath
 with_bsm_audit
@@ -1555,7 +1554,6 @@ Optional Packages:
   --with-otp-only         deprecated
   --with-alertmail        deprecated
   --with-devel            add development options
-  --with-CC               C compiler to use
   --with-rpath            pass -R flag in addition to -L for lib paths
   --with-blibpath=PATH    pass -blibpath flag to ld for additional lib paths
   --with-bsm-audit        enable BSM audit support
@@ -2990,20 +2988,6 @@ fi
 
 
 
-# Check whether --with-CC was given.
-if test "${with_CC+set}" = set; then :
-  withval=$with_CC; case $with_CC in
-    yes)	as_fn_error $? "\"must give --with-CC an argument.\"" "$LINENO" 5
-		;;
-    no)		as_fn_error $? "\"illegal argument: --without-CC.\"" "$LINENO" 5
-		;;
-    *)		CC=$with_CC
-		;;
-esac
-fi
-
-
-
 # Check whether --with-rpath was given.
 if test "${with_rpath+set}" = set; then :
   withval=$with_rpath; case $with_rpath in
@@ -14193,17 +14177,7 @@ fi
 		;;
     *-*-bsdi*)
 		SKIP_SETREUID=yes
-		# Use shlicc for BSD/OS [23].x unless asked to do otherwise
-		if test "${with_CC+set}" != set -a "$ac_cv_prog_CC" = gcc; then
-		    case "$OSMAJOR" in
-			2|3)	{ $as_echo "$as_me:${as_lineno-$LINENO}: using shlicc as CC" >&5
-$as_echo "$as_me: using shlicc as CC" >&6;}
-				ac_cv_prog_CC=shlicc
-				CC="$ac_cv_prog_CC"
-				;;
-		    esac
-		fi
-		# Check for newer BSD auth API (just check for >= 3.0?)
+		# Check for newer BSD auth API
 		if test -z "$with_bsdauth"; then
 		    for ac_func in auth_challenge
 do :
diff --git a/configure.in b/configure.in
index 762057852..d7bd3ae6d 100644
--- a/configure.in
+++ b/configure.in
@@ -222,16 +222,6 @@ AC_ARG_WITH(devel, [AS_HELP_STRING([--with-devel], [add development options])],
 		;;
 esac])
 
-AC_ARG_WITH(CC, [AS_HELP_STRING([--with-CC], [C compiler to use])],
-[case $with_CC in
-    yes)	AC_MSG_ERROR(["must give --with-CC an argument."])
-		;;
-    no)		AC_MSG_ERROR(["illegal argument: --without-CC."])
-		;;
-    *)		CC=$with_CC
-		;;
-esac])
-
 AC_ARG_WITH(rpath, [AS_HELP_STRING([--with-rpath], [pass -R flag in addition to -L for lib paths])],
 [case $with_rpath in
     yes|no)	;;
@@ -1777,16 +1767,7 @@ case "$host" in
 		;;
     *-*-bsdi*)
 		SKIP_SETREUID=yes
-		# Use shlicc for BSD/OS [23].x unless asked to do otherwise
-		if test "${with_CC+set}" != set -a "$ac_cv_prog_CC" = gcc; then
-		    case "$OSMAJOR" in
-			2|3)	AC_MSG_NOTICE([using shlicc as CC])
-				ac_cv_prog_CC=shlicc
-				CC="$ac_cv_prog_CC"
-				;;
-		    esac
-		fi
-		# Check for newer BSD auth API (just check for >= 3.0?)
+		# Check for newer BSD auth API
 		if test -z "$with_bsdauth"; then
 		    AC_CHECK_FUNCS(auth_challenge, [AUTH_EXCL_DEF="BSD_AUTH"])
 		fi