WITH_CC, EXTRA_RULES_IN

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

diff --git a/src/ChangeLog b/src/ChangeLog
index bc9543053392aae8f07cce774accbd7cb9a19c4f..60640424a037f6da8ea07e1d2b8a25968f9b2305 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul  1 13:01:19 1994  Mark Eichin  (eichin@cygnus.com)
+
+       * aclocal.m4: added WITH_CC for use when CONFIG_RULES isn't safe.
+       added EXTRA_RULES_IN for chosing the file that the extra rules get
+       appended to (particularly for lib/krb5/asn.1).
+       made CONFIG_RULES use WITH_CC directly.
+
 Fri Jul  1 02:21:51 1994  Tom Yu  (tlyu at dragons-lair)
 
        * aclocal.m4: fixes for dealing with new version of autoconf, in

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 6ac3342077e171bf0660d214e36ff9cc53c3c271..c4b3e86c401193990b85770189f0aa9eb16e3d38 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -153,15 +153,18 @@ undivert(9)
 SUBDIREOF
 ])dnl
 dnl
+dnl take saved makefile stuff and put it in the Makeile
+dnl
+define(EXTRA_RULES_IN,[
+cat >> $1 <<"SUBDIREOF"
+undivert(9)
+SUBDIREOF
+])dnl
+dnl
 dnl drop in standard configure rebuild rules -- CONFIG_RULES
 dnl
 define(CONFIG_RULES,[
-AC_WITH([cc],
-echo CC=$withval
-CC=$withval,
-if test -z "$CC" ; then CC=cc; fi
-echo CC defaults to $CC)dnl
-AC_SUBST([CC])dnl
+WITH_CC dnl
 divert(9)dnl
 [
 Makefile: $(srcdir)/Makefile.in config.status
@@ -290,6 +293,16 @@ echo "no krb4 support; use --with-krb4=krb4dir"
 KRB4=)dnl
 AC_SUBST(KRB4)])dnl
 dnl
+dnl set $(CC) from --with-cc=value
+dnl
+define(WITH_CC,[
+AC_WITH([cc],
+echo CC=$withval
+CC=$withval,
+if test -z "$CC" ; then CC=cc; fi
+echo CC defaults to $CC)dnl
+AC_SUBST([CC])])dnl
+dnl
 dnl set $(CCOPTS) from --with-ccopts=value
 dnl
 define(WITH_CCOPTS,[