* aclocal.m4 (WITH_CC_DEPRECATED_ARG): New macro.

(WITH_CC): Require it, and AC_PROG_CC.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14924 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index aba5d4204c411f89ac3597f89410822e2210f85b..23f05ed4e7b8e0ca3cc27fa18bacef33e1cff99f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * aclocal.m4 (CONFIG_RULES): Comment out code looking for the
        in-tree version of autoconf that we deleted.
+       (WITH_CC_DEPRECATED_ARG): New macro.
+       (WITH_CC): Require it, and AC_PROG_CC.
 
 2002-10-07  Sam Hartman  <hartmans@mit.edu>
 

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f78ed5b62787176995d4e71be2af01341d47b454..22fb0ba7145c6ffe5c8567364718d97a4bc6043a 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -59,8 +59,6 @@ KRB5_AC_CHOOSE_SS dnl
 KRB5_AC_CHOOSE_DB dnl
 dnl allow stuff in tree to access deprecated/private stuff for now
 ADD_DEF([-DKRB5_PRIVATE=1]) dnl
-ifdef([AC_PROG_CC_STDC], [AC_PROG_CC_STDC])
-dnl AC_PROG_CC_STDC
 AC_C_CONST dnl
 WITH_NETLIB dnl
 WITH_HESIOD dnl
@@ -439,11 +437,13 @@ AC_BEFORE([$0],[AC_PROG_CC])
 krb5_ac_cflags_set=${CFLAGS+set}
 ])
 dnl
-AC_DEFUN(WITH_CC,[
-AC_REQUIRE([KRB5_AC_CHECK_FOR_CFLAGS])
+AC_DEFUN(WITH_CC_DEPRECATED_ARG,[dnl
 AC_ARG_WITH([cc],AC_HELP_STRING(--with-cc=COMPILER,deprecated; use CC=...),
-           AC_MSG_ERROR(option --with-cc is deprecated; use CC=...))
-AC_PROG_CC
+           AC_MSG_ERROR(option --with-cc is deprecated; use CC=...))])
+AC_DEFUN(WITH_CC,[dnl
+AC_REQUIRE([KRB5_AC_CHECK_FOR_CFLAGS])dnl
+AC_REQUIRE([WITH_CC_DEPRECATED_ARG])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
 krb5_cv_prog_gcc=$ac_cv_c_compiler_gnu
 if test $ac_cv_c_compiler_gnu = yes ; then
      HAVE_GCC=yes