Move lib/kdb/kdb_db2 to modules/kdb/db2, and patch up pathnames in various

files to compensate.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index d422e889c99fb71755fa85c31836dbc0b75ce6f2..e93c6f6eeac31a2019683fe4e01b56fe9b3c2427 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-22  Ken Raeburn  <raeburn@mit.edu>
+
+       * modules, modules/kdb: New directories.
+       * modules/kdb/db2: Moved from lib/kdb/kdb_db2.
+       * Makefile.in (SUBDIRS): Add modules/kdb/db2.
+       * configure.in: Configure in that directory.
+
 2005-09-08  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4 (AC_LIBRARY_NET): Check for a few more libresolv

diff --git a/src/Makefile.in b/src/Makefile.in
index 1b500a84dcc4c084ff6c6fb2a7fd62ce2a188788..e0887bdad4b1c01ed6caef1537964a70be91b77d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,7 +3,9 @@ datadir=@datadir@
 thisconfigdir=.
 myfulldir=.
 mydir=.
-SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
+SUBDIRS=util include lib @krb524@ kdc kadmin slave clients \
+       modules/kdb/db2 \
+       appl tests \
        config-files gen-manpages
 BUILDTOP=$(REL)$(C)
 LOCALINCLUDES = -I$(srcdir) 

diff --git a/src/configure.in b/src/configure.in
index 5efb8c0bc8d0038664a1dfaa874ed409f266a817..5b78d37ca3e4d17a981594e6ecb1efb946f39837 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -548,6 +548,6 @@ dnl if test -n "$KRB4_LIB"; then
 dnl   AC_CONFIG_SUBDIRS(krb524)
 dnl fi
 
-AC_CONFIG_SUBDIRS(kadmin clients appl tests)
+AC_CONFIG_SUBDIRS(kadmin clients modules/kdb/db2 appl tests)
 AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
 V5_AC_OUTPUT_MAKEFILE(. util util/support util/send-pr lib kdc slave krb524 config-files gen-manpages include include/krb5 include/kerberosIV)

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index b6f628bff8c7248ec1667f03af10124a4310a705..cf4127b1d14f927bacef4ed7b809979f248f9222 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Ken Raeburn  <raeburn@mit.edu>
+
+       * kdb_db2: Directory moved to modules/kdb/db2.
+       * configure.in: Don't configure it.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Use K5_AC_INIT instead of AC_INIT.

diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 4818d6932825c49812270f780a2d6c642f0e1e50..a41ea6b9bef0449a195caaa8a2a8a22e0dcc8d69 100644 (file)
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -20,5 +20,4 @@ dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
-AC_CONFIG_SUBDIRS(kdb_db2)
-V5_AC_OUTPUT_MAKEFILE(. kdb_db2)
+V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/kdb/kdb_db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
similarity index 92%
rename from src/lib/kdb/kdb_db2/ChangeLog
rename to src/modules/kdb/db2/ChangeLog
index cd000bf81572c377f16c8b851dff8b8379a95264..11909d9cd5b68c282e0e9010f6412028dc5c0253 100644 (file)
--- a/src/lib/kdb/kdb_db2/ChangeLog
+++ b/src/modules/kdb/db2/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-22  Ken Raeburn  <raeburn@mit.edu>
+
+       * Directory moved from lib/kdb/kdb_db2 to modules/kdb/db2.
+       * Makefile.in (myfulldir, LOCALINCLUDES, RELDIR): Updated.
+       * db2_exp.c, kdb_db2.c: Include kdb5.h instead of ../kdb5.h.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Use K5_AC_INIT instead of AC_INIT.

diff --git a/src/lib/kdb/kdb_db2/Makefile.in b/src/modules/kdb/db2/Makefile.in
similarity index 83%
rename from src/lib/kdb/kdb_db2/Makefile.in
rename to src/modules/kdb/db2/Makefile.in
index eaba89d6bba4d4b5b378f4fa7c8796bd453d5ace..a547b5104c43bbd1866bbfe5c9b1b6b2f54d3691 100644 (file)
--- a/src/lib/kdb/kdb_db2/Makefile.in
+++ b/src/modules/kdb/db2/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=.
-myfulldir=lib/kdb/kdb_db2
+myfulldir=modules/kdb/db2
 mydir=.
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
@@ -7,13 +7,13 @@ KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_C
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-LOCALINCLUDES = -I..
+LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb
 
 LIBBASE=db2
 LIBMAJOR=0
 LIBMINOR=0
-RELDIR=kdb/kdb_db2
 SO_EXT=.so
+RELDIR=../modules/kdb/db2
 # Depends on libk5crypto and libkrb5
 # Also on gssrpc, for xdr stuff.
 SHLIB_EXPDEPS = \
@@ -58,7 +58,7 @@ clean-unix:: clean-libs clean-libobjs
 clean::
        $(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o
 
-adb_openclose.c adb_policy.c : ../adb_err.h
+#adb_openclose.c adb_policy.c : ../adb_err.h
 
 # @libnover_frag@
 # @libobj_frag@
@@ -85,7 +85,7 @@ adb_openclose.so adb_openclose.po $(OUTPRE)adb_openclose.$(OBJEXT): \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
   policy_db.h $(SRCTOP)/include/krb5/kdb.h $(DB_DEPS) \
   $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \
-  $(BUILDTOP)/include/gssrpc/xdr.h ../adb_err.h
+  $(BUILDTOP)/include/gssrpc/xdr.h $(BUILDTOP)/lib/kdb/adb_err.h
 adb_policy.so adb_policy.po $(OUTPRE)adb_policy.$(OBJEXT): \
   adb_policy.c policy_db.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
@@ -95,7 +95,7 @@ adb_policy.so adb_policy.po $(OUTPRE)adb_policy.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \
   $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/krb5/kdb.h \
   $(DB_DEPS) $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \
-  $(BUILDTOP)/include/gssrpc/xdr.h ../adb_err.h
+  $(BUILDTOP)/include/gssrpc/xdr.h $(BUILDTOP)/lib/kdb/adb_err.h
 kdb_db2.so kdb_db2.po $(OUTPRE)kdb_db2.$(OBJEXT): kdb_db2.c \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
@@ -103,11 +103,11 @@ kdb_db2.so kdb_db2.po $(OUTPRE)kdb_db2.$(OBJEXT): kdb_db2.c \
   $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
   $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
-  $(DB_DEPS) $(srcdir)/../kdb5.h $(SRCTOP)/include/k5-int.h \
-  $(srcdir)/../err_handle.h kdb_db2.h policy_db.h $(SRCTOP)/include/krb5/kdb.h \
-  $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \
-  $(BUILDTOP)/include/gssrpc/xdr.h ../adb_err.h kdb_xdr.h \
-  kdb_compat.h
+  $(DB_DEPS) $(SRCTOP)/lib/kdb/kdb5.h $(SRCTOP)/include/k5-int.h \
+  $(SRCTOP)/lib/kdb/err_handle.h kdb_db2.h policy_db.h \
+  $(SRCTOP)/include/krb5/kdb.h $(BUILDTOP)/include/gssrpc/types.h \
+  $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \
+  $(BUILDTOP)/lib/kdb/adb_err.h kdb_xdr.h kdb_compat.h
 pol_xdr.so pol_xdr.po $(OUTPRE)pol_xdr.$(OBJEXT): pol_xdr.c \
   $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/gssrpc/rpc.h \
   $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \
@@ -121,7 +121,7 @@ pol_xdr.so pol_xdr.po $(OUTPRE)pol_xdr.$(OBJEXT): pol_xdr.c \
   $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \
   $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \
-  $(SRCTOP)/include/krb5/kdb.h $(DB_DEPS) ../adb_err.h
+  $(SRCTOP)/include/krb5/kdb.h $(DB_DEPS) $(BUILDTOP)/lib/kdb/adb_err.h
 db2_exp.so db2_exp.po $(OUTPRE)db2_exp.$(OBJEXT): db2_exp.c \
   $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
   $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
@@ -129,7 +129,8 @@ db2_exp.so db2_exp.po $(OUTPRE)db2_exp.$(OBJEXT): db2_exp.c \
   $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
   $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
-  $(DB_DEPS) $(srcdir)/../kdb5.h $(SRCTOP)/include/k5-int.h \
-  $(srcdir)/../err_handle.h kdb_db2.h policy_db.h $(SRCTOP)/include/krb5/kdb.h \
-  $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \
-  $(BUILDTOP)/include/gssrpc/xdr.h ../adb_err.h kdb_xdr.h
+  $(DB_DEPS) $(SRCTOP)/lib/kdb/kdb5.h $(SRCTOP)/include/k5-int.h \
+  $(SRCTOP)/lib/kdb/err_handle.h kdb_db2.h policy_db.h \
+  $(SRCTOP)/include/krb5/kdb.h $(BUILDTOP)/include/gssrpc/types.h \
+  $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \
+  $(BUILDTOP)/lib/kdb/adb_err.h kdb_xdr.h

diff --git a/src/lib/kdb/kdb_db2/adb_openclose.c b/src/modules/kdb/db2/adb_openclose.c
similarity index 100%
rename from src/lib/kdb/kdb_db2/adb_openclose.c
rename to src/modules/kdb/db2/adb_openclose.c

diff --git a/src/lib/kdb/kdb_db2/adb_policy.c b/src/modules/kdb/db2/adb_policy.c
similarity index 100%
rename from src/lib/kdb/kdb_db2/adb_policy.c
rename to src/modules/kdb/db2/adb_policy.c

diff --git a/src/lib/kdb/kdb_db2/configure.in b/src/modules/kdb/db2/configure.in
similarity index 100%
rename from src/lib/kdb/kdb_db2/configure.in
rename to src/modules/kdb/db2/configure.in

diff --git a/src/lib/kdb/kdb_db2/db2.exports b/src/modules/kdb/db2/db2.exports
similarity index 100%
rename from src/lib/kdb/kdb_db2/db2.exports
rename to src/modules/kdb/db2/db2.exports

diff --git a/src/lib/kdb/kdb_db2/db2_exp.c b/src/modules/kdb/db2/db2_exp.c
similarity index 99%
rename from src/lib/kdb/kdb_db2/db2_exp.c
rename to src/modules/kdb/db2/db2_exp.c
index 5e88b7fb282d14bf72984d62a2d7b4933aa26c94..f119de3de94491932f6bffa02d9c27efbbac4de2 100644 (file)
--- a/src/lib/kdb/kdb_db2/db2_exp.c
+++ b/src/modules/kdb/db2/db2_exp.c
@@ -20,7 +20,7 @@ static char *_csrc = "@(#) %filespec: db2_exp.c~5 %  (%full_filespec: db2_exp.c~
 #include <stdio.h>
 #include <errno.h>
 #include <utime.h>
-#include "../kdb5.h"
+#include "kdb5.h"
 #include "kdb_db2.h"
 #include "kdb_xdr.h"
 #include "policy_db.h"

diff --git a/src/lib/kdb/kdb_db2/kdb_compat.h b/src/modules/kdb/db2/kdb_compat.h
similarity index 100%
rename from src/lib/kdb/kdb_db2/kdb_compat.h
rename to src/modules/kdb/db2/kdb_compat.h

diff --git a/src/lib/kdb/kdb_db2/kdb_db2.c b/src/modules/kdb/db2/kdb_db2.c
similarity index 99%
rename from src/lib/kdb/kdb_db2/kdb_db2.c
rename to src/modules/kdb/db2/kdb_db2.c
index dc41a081caf87128856fc18ab019e95a5e2d3f3b..f3950eeccda54530f33b4fc46292a8a02b897821 100644 (file)
--- a/src/lib/kdb/kdb_db2/kdb_db2.c
+++ b/src/modules/kdb/db2/kdb_db2.c
@@ -60,7 +60,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <utime.h>
-#include "../kdb5.h"
+#include "kdb5.h"
 #include "kdb_db2.h"
 #include "kdb_xdr.h"
 #include "policy_db.h"

diff --git a/src/lib/kdb/kdb_db2/kdb_db2.h b/src/modules/kdb/db2/kdb_db2.h
similarity index 100%
rename from src/lib/kdb/kdb_db2/kdb_db2.h
rename to src/modules/kdb/db2/kdb_db2.h

diff --git a/src/lib/kdb/kdb_db2/kdb_xdr.c b/src/modules/kdb/db2/kdb_xdr.c
similarity index 100%
rename from src/lib/kdb/kdb_db2/kdb_xdr.c
rename to src/modules/kdb/db2/kdb_xdr.c

diff --git a/src/lib/kdb/kdb_db2/kdb_xdr.h b/src/modules/kdb/db2/kdb_xdr.h
similarity index 100%
rename from src/lib/kdb/kdb_db2/kdb_xdr.h
rename to src/modules/kdb/db2/kdb_xdr.h

diff --git a/src/lib/kdb/kdb_db2/pol_xdr.c b/src/modules/kdb/db2/pol_xdr.c
similarity index 100%
rename from src/lib/kdb/kdb_db2/pol_xdr.c
rename to src/modules/kdb/db2/pol_xdr.c

diff --git a/src/lib/kdb/kdb_db2/policy_db.h b/src/modules/kdb/db2/policy_db.h
similarity index 100%
rename from src/lib/kdb/kdb_db2/policy_db.h
rename to src/modules/kdb/db2/policy_db.h