summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-03-25 23:09:18 +0000
committerKen Raeburn <raeburn@mit.edu>2007-03-25 23:09:18 +0000
commit7352130d7bdcbe7d40b09f7638ae1addaabd25a9 (patch)
treecc126aac4e078d2076e34d579fdfcae42ca497fc /src/plugins
parentb5a3b26501fb405ff621b71b7db84a3fa91b0b2d (diff)
downloadkrb5-7352130d7bdcbe7d40b09f7638ae1addaabd25a9.tar.gz
krb5-7352130d7bdcbe7d40b09f7638ae1addaabd25a9.tar.xz
krb5-7352130d7bdcbe7d40b09f7638ae1addaabd25a9.zip
Configure db2 plugin directory at top level
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19277 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/kdb/db2/Makefile.in9
-rw-r--r--src/plugins/kdb/db2/configure.in25
2 files changed, 7 insertions, 27 deletions
diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in
index c7703c6df..84511a364 100644
--- 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
index 12bd9c01d..000000000
--- 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