Configure db2 plugin directory at top level

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

diff --git a/src/configure.in b/src/configure.in
index fe692f9e694c9e5b3176c037cb5a6af2bca0a4e8..fd0bfdb203af6f8aa54652b443b6818b6e1dbaeb 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -860,6 +860,24 @@ else
 fi
 AC_SUBST(KRB4_DEJAGNU_TEST)
 
+dnl for plugins/kdb/db2
+dnl
+dnl AIX is unusual in that it wants all symbols resolved at link time
+dnl  Fortunately, it will allow us to link the kdb library now, even if
+dnl it is linked again later.
+case $krb5_cv_host in
+*-*-aix*)
+       DB_EXTRA_LIBS=-ldb
+       ;;
+*)
+       DB_EXTRA_LIBS=
+       ;;
+esac
+AC_SUBST(DB_EXTRA_LIBS)
+if test "$DB_VERSION" = k5; then
+  AC_CONFIG_SUBDIRS(plugins/kdb/db2/libdb2)
+fi
+
 dnl
 dnl
 dnl Check for thread safety issues.
@@ -935,7 +953,7 @@ if test -n "$OPENLDAP_PLUGIN"; then
 fi
 AC_SUBST(ldap_plugin_dir)
 
-AC_CONFIG_SUBDIRS(plugins/kdb/db2 plugins/preauth/wpse plugins/preauth/cksum_body)
+AC_CONFIG_SUBDIRS(plugins/preauth/wpse plugins/preauth/cksum_body)
 
 AC_CHECK_HEADERS(Python.h python2.3/Python.h)
 
@@ -977,6 +995,7 @@ V5_AC_OUTPUT_MAKEFILE(.
        include/kerberosIV
 
        plugins/locate/python
+       plugins/kdb/db2
 
        clients clients/klist clients/kinit clients/kvno
        clients/kdestroy clients/kpasswd clients/ksu

diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in
index c7703c6df80077ca7d9553f839ab43da695af53e..84511a3641f20085adbd22ab525fbf7545191077 100644 (file)
--- a/src/plugins/kdb/db2/Makefile.in
+++ b/src/plugins/kdb/db2/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../../..
 myfulldir=plugins/kdb/db2
-mydir=.
+mydir=plugins/kdb/db2
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
@@ -9,6 +9,11 @@ PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
 DEFS=
 
+SUBDIRS= $(SUBDIRS-@DB_VERSION@)
+SUBDIRS-sys=
+SUBDIRS-redirect=
+SUBDIRS-k5= libdb2
+
 LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb
 DEFINES = -DPLUGIN
 

diff --git a/src/plugins/kdb/db2/configure.in b/src/plugins/kdb/db2/configure.in
deleted file mode 100644 (file)
index 12bd9c0..0000000
--- a/src/plugins/kdb/db2/configure.in
+++ /dev/null
@@ -1,25 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_TYPE_OFF_T
-
-dnl AIX is unusual in that it wants all symbols resolved at link time
-dnl  Fortunately, it will allow us to link the kdb library now, even if
-dnl it is linked again later.
-case $krb5_cv_host in
-*-*-aix*)
-       DB_EXTRA_LIBS=-ldb
-       ;;
-*)
-       DB_EXTRA_LIBS=
-       ;;
-esac
-AC_SUBST(DB_EXTRA_LIBS)
-KRB5_RUN_FLAGS
-dnl The following is for check...
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY
-if test "$DB_VERSION" = k5 ; then
-  AC_CONFIG_SUBDIRS(libdb2)
-fi
-V5_AC_OUTPUT_MAKEFILE