summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2002-09-13 23:06:15 +0000
committerKen Raeburn <raeburn@mit.edu>2002-09-13 23:06:15 +0000
commit71b09c0dd54810322d34ad03d1ae24457dfa1629 (patch)
treee9c92cfdb0b59bf81814cf800d6789a731a01925 /src/include
parent0e6faa2396579e499801924d11741d9d5cea34ef (diff)
downloadkrb5-71b09c0dd54810322d34ad03d1ae24457dfa1629.tar.gz
krb5-71b09c0dd54810322d34ad03d1ae24457dfa1629.tar.xz
krb5-71b09c0dd54810322d34ad03d1ae24457dfa1629.zip
Permit building against either the in-tree version of db2 or a system version
specified at configure time. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14855 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ChangeLog8
-rw-r--r--src/include/Makefile.in9
2 files changed, 17 insertions, 0 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index ef9ff2685..0dec7e62d 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (maybe-make-db.h-sys, maybe-make-db.h-k5): New
+ targets, doing nothing.
+ (maybe-make-db.h-redirect): New target, creates db.h using
+ @DB_HEADER@.
+ (all-unix): Depend on maybe-make-db.h-@DB_HEADER_VERSION@.
+
2002-09-03 Ken Raeburn <raeburn@mit.edu>
* fake-addrinfo.h (gaiptr, faiptr, gniptr): Delete duplicate
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 9f067fff5..6c6efa06f 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -15,6 +15,15 @@ all-windows::
$(MAKE) -$(MFLAGS)
cd ..
+all-unix:: maybe-make-db.h-@DB_HEADER_VERSION@
+
+maybe-make-db.h-k5:
+ : db.h will be installed by util/db2
+maybe-make-db.h-sys:
+ : fall back to system db.h
+maybe-make-db.h-redirect:
+ test -r db.h || echo '#include <@DB_HEADER@>' > db.h
+
krb5/autoconf.h: $(srcdir)/krb5/autoconf.h.in
(cd krb5; $(MAKE) autoconf.h)
$(srcdir)/krb5/autoconf.h.in: $(srcdir)/krb5/autoconf.stmp