Configure libdb2 in top-level configure script

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

8 files changed, 14 insertions, 45 deletions

diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index dd6c021..593c15e 100644
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../../../..
 myfulldir=plugins/kdb/db2/libdb2
-mydir=.
+mydir=plugins/kdb/db2/libdb2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCAL_SUBDIRS=hash btree db mpool recno test
 
diff --git a/src/plugins/kdb/db2/libdb2/btree/Makefile.in b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
index 159db01..4372fac 100644
--- a/src/plugins/kdb/db2/libdb2/btree/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../../../..
 myfulldir=plugins/kdb/db2/libdb2/btree
-mydir=btree
+mydir=plugins/kdb/db2/libdb2/btree
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
 		bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o \
diff --git a/src/plugins/kdb/db2/libdb2/configure.in b/src/plugins/kdb/db2/libdb2/configure.in
deleted file mode 100644
index 1e529ee..0000000
--- a/src/plugins/kdb/db2/libdb2/configure.in
+++ /dev/null
@@ -1,31 +0,0 @@
-K5_AC_INIT(db/db.c)
-CONFIG_RULES
-
-AC_PATH_PROG(FALSE,false,:)
-AC_PATH_PROG(SH,sh,$FALSE)
-AC_PATH_PROG(SH5,sh5,$FALSE)
-AC_PATH_PROG(BASH,bash,$FALSE)
-
-AC_CACHE_CHECK([checking for shell with functions],local_cv_program_fctsh,
-[if $SH -c 'foo() { true; }; foo' > /dev/null 2>&1; then
-	local_cv_program_fctsh=$SH
-else
-	if $SH5 -c 'foo() { true; }; foo' > /dev/null 2>&1; then
-		local_cv_program_fctsh=$SH5
-	else
-		if $BASH -c 'foo() { true; }; foo' > /dev/null 2>&1; then
-			local_cv_program_fctsh=$BASH
-		else
-			local_cv_program_fctsh=$FALSE
-		fi
-	fi
-fi])
-
-FCTSH=$local_cv_program_fctsh
-AC_SUBST(FCTSH)
-
-KRB5_BUILD_LIBRARY
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_PROGRAM
-KRB5_RUN_FLAGS
-V5_AC_OUTPUT_MAKEFILE(. hash btree db mpool recno test)
diff --git a/src/plugins/kdb/db2/libdb2/db/Makefile.in b/src/plugins/kdb/db2/libdb2/db/Makefile.in
index a8532fc..aaa021f 100644
--- a/src/plugins/kdb/db2/libdb2/db/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/db/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../../../..
 myfulldir=plugins/kdb/db2/libdb2/db
-mydir=db
+mydir=plugins/kdb/db2/libdb2/db
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=db.o
 
diff --git a/src/plugins/kdb/db2/libdb2/hash/Makefile.in b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
index cfd9002..9dced60 100644
--- a/src/plugins/kdb/db2/libdb2/hash/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../../../..
 myfulldir=plugins/kdb/db2/libdb2/hash
-mydir=hash
+mydir=plugins/kdb/db2/libdb2/hash
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
 		hash_page.o hsearch.o dbm.o
diff --git a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
index 0ae454a..2e1d7d6 100644
--- a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../../../..
 myfulldir=plugins/kdb/db2/libdb2/mpool
-mydir=mpool
+mydir=plugins/kdb/db2/libdb2/mpool
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=mpool.o
 
diff --git a/src/plugins/kdb/db2/libdb2/recno/Makefile.in b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
index a4bb7fd..a31235c 100644
--- a/src/plugins/kdb/db2/libdb2/recno/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../../../..
 myfulldir=plugins/kdb/db2/libdb2/recno
-mydir=recno
+mydir=plugins/kdb/db2/libdb2/recno
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
 		rec_search.o rec_seq.o rec_utils.o
diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index cd7538d..6c1d9d2 100644
--- a/src/plugins/kdb/db2/libdb2/test/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../../../..
 myfulldir=plugins/kdb/db2/libdb2/test
-mydir=test
+mydir=plugins/kdb/db2/libdb2/test
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 
 FCTSH = @FCTSH@