diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-04-25 03:09:57 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-04-25 03:09:57 +0000 |
| commit | de65b5f9343461402846dce7eeeecae80dd0817d (patch) | |
| tree | d43a9f8ffba0575d178ce491d506e326b6dbae03 /src | |
| parent | c30d0bb95cd7cfbc3ebb895d329e9fbfc7b634a5 (diff) | |
| download | krb5-de65b5f9343461402846dce7eeeecae80dd0817d.tar.gz krb5-de65b5f9343461402846dce7eeeecae80dd0817d.tar.xz krb5-de65b5f9343461402846dce7eeeecae80dd0817d.zip | |
Require only autoconf 2.52. Try --include argument to autoconf and autoheader,
and if the command fails, try it again with --localdir; don't tie it to some
previously used version of autoconf.
ticket: 1242
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15370 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/aclocal.m4 | 3 | ||||
| -rw-r--r-- | src/config/ChangeLog | 5 | ||||
| -rw-r--r-- | src/config/post.in | 3 | ||||
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/Makefile.in | 2 |
6 files changed, 19 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c389fcf2d3..c87b8fa993 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-04-24 Ken Raeburn <raeburn@mit.edu> + + * aclocal.m4: Require autoconf 2.52 only. + 2003-04-23 Ken Raeburn <raeburn@mit.edu> * aclocal.m4: Require autoconf 2.53. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 68a0461f99..1a7c11b3cd 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1,5 +1,4 @@ -AC_PREREQ(2.53) -dnl 2.53 needed so we don't have to worry about using --localdir +AC_PREREQ(2.52) AC_COPYRIGHT([Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Massachusetts Institute of Technology. ]) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 21bc14adc4..28192ddc3e 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,8 @@ +2003-04-24 Ken Raeburn <raeburn@mit.edu> + + * post.in (configure): Try running autoconf with --include, and if + that doesn't work, try --localdir. Don't use AUTOCONFINCFLAGS. + 2003-04-01 Tom Yu <tlyu@mit.edu> * pre.in (KDB5_DEPLIBS): Don't depend on $(DB_DEPLIB) anymore. diff --git a/src/config/post.in b/src/config/post.in index 2c49dd304f..0a14ce8529 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -149,7 +149,8 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \ $(SRCTOP)/aclocal.m4 -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache cd $(srcdir)/$(thisconfigdir) && \ - $(AUTOCONF) ${AUTOCONFINCFLAGS}=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS) + ($(AUTOCONF) --include=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS) || \ + $(AUTOCONF) --localdir=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS)) -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \ diff --git a/src/include/ChangeLog b/src/include/ChangeLog index fea9e3ee1f..85f8920243 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +2003-04-24 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in ($(srcdir)/krb5/autoconf.stmp): Try running + autoheader with --include, and if that doesn't work, try + --localdir. + 2003-04-07 Ken Raeburn <raeburn@mit.edu> * fake-addrinfo.h (getaddrinfo) [NUMERIC_SERVICE_BROKEN]: diff --git a/src/include/Makefile.in b/src/include/Makefile.in index df810299f7..c3f873a050 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -28,7 +28,7 @@ krb5/autoconf.h: $(srcdir)/krb5/autoconf.h.in (cd krb5; $(MAKE) autoconf.h) $(srcdir)/krb5/autoconf.h.in: $(srcdir)/krb5/autoconf.stmp $(srcdir)/krb5/autoconf.stmp: $(srcdir)/configure.in - cd $(srcdir) && $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) + cd $(srcdir) && ($(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) || $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)) touch $(srcdir)/krb5/autoconf.stmp krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \ |