Configure libdb2 in top-level configure script

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

diff --git a/src/configure.in b/src/configure.in
index 976f2fabbd86a6f210ec122779e96297764eb767..518fdba065e294d6bc391f8dc13d2fffde293096 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -615,6 +615,18 @@ dnl types libdb2 wants
 dnl
 AC_CHECK_TYPES([ssize_t, u_char, u_int, u_long, u_int8_t, u_int16_t, u_int32_t, int8_t, int16_t, int32_t])
 dnl
+dnl Some libdb2 test programs want a shell that supports functions.
+FCTSH=false
+AC_PATH_PROG(SH,sh,false)
+AC_PATH_PROG(SH5,sh5,false)
+AC_PATH_PROG(BASH,bash,false)
+for prog in $SH $SH5 $BASH; do
+  if $prog -c 'foo() { true; } foo' >/dev/null 2>&1; then
+    FCTSH=$prog ; break
+  fi
+done
+AC_SUBST(FCTSH)
+dnl
 dnl Test for POSIX 2001 *printf support (X/Open System Interfaces extension
 dnl to ANSI/ISO C 1999 specification).  Specifically, positional
 dnl specifications; not checking for other features like %zx at present.
@@ -926,9 +938,6 @@ case $krb5_cv_host in
        ;;
 esac
 AC_SUBST(DB_EXTRA_LIBS)
-if test "$DB_VERSION" = k5; then
-  AC_CONFIG_SUBDIRS(plugins/kdb/db2/libdb2)
-fi
 
 dnl
 dnl
@@ -1059,6 +1068,13 @@ V5_AC_OUTPUT_MAKEFILE(.
 
        plugins/locate/python
        plugins/kdb/db2
+       plugins/kdb/db2/libdb2
+       plugins/kdb/db2/libdb2/hash
+       plugins/kdb/db2/libdb2/btree
+       plugins/kdb/db2/libdb2/db
+       plugins/kdb/db2/libdb2/mpool
+       plugins/kdb/db2/libdb2/recno
+       plugins/kdb/db2/libdb2/test
        plugins/preauth/cksum_body
        plugins/preauth/wpse
 

diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index dd6c02140a73088d8cfa6aec18f3f702c7286177..593c15e54ae7f51379b87339ff7081f8b67954aa 100644 (file)
--- 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 159db01026aabff1f353154c11d7febcb8376e2a..4372fac0e3374ee1c66251437c802138cca109a4 100644 (file)
--- 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 (file)
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 a8532fcd548c6ee153fad2b2f309144d57398f93..aaa021fb1d2899dd049edd89d5c046cda405f259 100644 (file)
--- 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 cfd90025b47916ac0cc6a61d73bf7a63b5531df5..9dced606ed684ebb6aaa89bad2227f6119187c7a 100644 (file)
--- 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 0ae454a9be8cc44057c155870e1f9798e9b650a2..2e1d7d60db3a09e76a9c57db5eac4d526d0c6e67 100644 (file)
--- 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 a4bb7fda36dfc1d7375c5035f25b6417a9c86a01..a31235c7bdbebb6aa311675efe9ee69ebd4042a8 100644 (file)
--- 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 cd7538dcde0c5c77e3189bf86c32cf1d2cfdd325..6c1d9d2be68a4b78b41de1c16e0c4dbc78ab566c 100644 (file)
--- 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@