diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-06-08 19:26:06 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-06-08 19:26:06 +0000 |
| commit | e8208dddf4d1236fb7e3b35fc99239c12edd5d6b (patch) | |
| tree | c879fc9651f3fd20057023e2c3c7c8faa391de7e /src/config | |
| parent | 0bd3d26b49e10e0f47934ee6085f81f7032ef00f (diff) | |
| download | krb5-e8208dddf4d1236fb7e3b35fc99239c12edd5d6b.tar.gz krb5-e8208dddf4d1236fb7e3b35fc99239c12edd5d6b.tar.xz krb5-e8208dddf4d1236fb7e3b35fc99239c12edd5d6b.zip | |
* pre.in (AUTOCONF, AUTOHEADER): Always set to autoconf and autoheader
respectively.
(AUTOCONFFLAGS, AUTOHEADERFLAGS): Always set to empty.
* post.in (Makefile): Always run autoconf with --include, don't bother with
--localdir any more. Don't delete autom4te.cache here.
(clean-unix): Delete autom4te.cache.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16419 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 8 | ||||
| -rw-r--r-- | src/config/post.in | 6 | ||||
| -rw-r--r-- | src/config/pre.in | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 81cec7497..73b0437a2 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,5 +1,13 @@ 2004-06-08 Ken Raeburn <raeburn@mit.edu> + * pre.in (AUTOCONF, AUTOHEADER): Always set to autoconf and + autoheader respectively. + (AUTOCONFFLAGS, AUTOHEADERFLAGS): Always set to empty. + * post.in (Makefile): Always run autoconf with --include, don't + bother with --localdir any more. Don't delete autom4te.cache + here. + (clean-unix): Delete autom4te.cache. + * shlib.conf (*-*-darwin*, *-*-rhapsody*): Add -Wl,-search_paths_first to linker flags. diff --git a/src/config/post.in b/src/config/post.in index 776278231..7c6cf0ed8 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -122,6 +122,7 @@ clean:: clean-$(WHAT) clean-unix:: $(RM) $(OBJS) $(DEPTARGETS) $(EXTRA_FILES) + -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache clean-windows:: $(RM) *.$(OBJEXT) @@ -147,11 +148,8 @@ $(thisconfigdir)/config.status: $(srcdir)/$(thisconfigdir)/configure cd $(thisconfigdir) && $(SHELL) config.status --recheck $(srcdir)/$(thisconfigdir)/configure: @MAINT@ $(srcdir)/$(thisconfigdir)/configure.in \ $(SRCTOP)/aclocal.m4 - -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache cd $(srcdir)/$(thisconfigdir) && \ - ($(AUTOCONF) --include=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS) || \ - $(AUTOCONF) --localdir=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS)) - -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache + $(AUTOCONF) --include=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS) RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \ check-recurse depend-recurse Makefiles-recurse install-headers-recurse diff --git a/src/config/pre.in b/src/config/pre.in index 7668a9d59..2bf2f155a 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -249,11 +249,10 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ YACC = @YACC@ PERL = @PERL@ -AUTOCONF = @AUTOCONF@ -AUTOCONFFLAGS = @AUTOCONFFLAGS@ -AUTOCONFINCFLAGS = @AUTOCONFINCFLAGS@ -AUTOHEADER = @AUTOHEADER@ -AUTOHEADERFLAGS = @AUTOHEADERFLAGS@ +AUTOCONF = autoconf +AUTOCONFFLAGS = +AUTOHEADER = autoheader +AUTOHEADERFLAGS = HOST_TYPE = @HOST_TYPE@ SHEXT = @SHEXT@ |