From f64c3ae80bd0963f85eab421f0f4a610b7d7350f Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 20 Jun 2007 05:47:59 +0000 Subject: [PATCH] Configure libdb2 in top-level configure script git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19606 dc483132-0cff-0310-8789-dd5450dbe970 --- src/configure.in | 22 ++++++++++++-- src/plugins/kdb/db2/libdb2/Makefile.in | 4 +-- src/plugins/kdb/db2/libdb2/btree/Makefile.in | 4 +-- src/plugins/kdb/db2/libdb2/configure.in | 31 -------------------- src/plugins/kdb/db2/libdb2/db/Makefile.in | 4 +-- src/plugins/kdb/db2/libdb2/hash/Makefile.in | 4 +-- src/plugins/kdb/db2/libdb2/mpool/Makefile.in | 4 +-- src/plugins/kdb/db2/libdb2/recno/Makefile.in | 4 +-- src/plugins/kdb/db2/libdb2/test/Makefile.in | 4 +-- 9 files changed, 33 insertions(+), 48 deletions(-) delete mode 100644 src/plugins/kdb/db2/libdb2/configure.in diff --git a/src/configure.in b/src/configure.in index 976f2fabb..518fdba06 100644 --- 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 dd6c02140..593c15e54 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 159db0102..4372fac0e 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 1e529eeba..000000000 --- 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 a8532fcd5..aaa021fb1 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 cfd90025b..9dced606e 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 0ae454a9b..2e1d7d60d 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 a4bb7fda3..a31235c7b 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 cd7538dcd..6c1d9d2be 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@ -- 2.26.2