summaryrefslogtreecommitdiffstats
path: root/src/plugins/kdb
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-05-31 22:16:10 +0000
committerKen Raeburn <raeburn@mit.edu>2007-05-31 22:16:10 +0000
commit73bbe4b2b50163861c7c46b6997d2f66593bbe3d (patch)
tree36d69fe434bdc0027844d009831d05d5c19a01ea /src/plugins/kdb
parent663b22141ca0e6353d75495bdfa641a36fa73627 (diff)
downloadkrb5-73bbe4b2b50163861c7c46b6997d2f66593bbe3d.tar.gz
krb5-73bbe4b2b50163861c7c46b6997d2f66593bbe3d.tar.xz
krb5-73bbe4b2b50163861c7c46b6997d2f66593bbe3d.zip
Configure libkdb_ldap directory at top level
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19566 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins/kdb')
-rw-r--r--src/plugins/kdb/ldap/libkdb_ldap/Makefile.in4
-rw-r--r--src/plugins/kdb/ldap/libkdb_ldap/configure.in36
2 files changed, 2 insertions, 38 deletions
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
index 7aa0f3b2de..a0a69ef235 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../../../..
myfulldir=plugins/kdb/ldap/libkdb_ldap
-mydir=.
+mydir=plugins/kdb/ldap/libkdb_ldap
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/configure.in b/src/plugins/kdb/ldap/libkdb_ldap/configure.in
deleted file mode 100644
index 61271a8f4b..0000000000
--- a/src/plugins/kdb/ldap/libkdb_ldap/configure.in
+++ /dev/null
@@ -1,36 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_CHECK_HEADERS(unistd.h)
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-
-AC_CHECK_FUNCS(srand48 srand srandom umask)
-
-LDAP_OKAY=1
-AC_CHECK_HEADERS([ldap.h], :, [LDAP_OKAY=0; AC_MSG_WARN([ldap.h not found])])
-AC_CHECK_HEADERS([lber.h], :, [LDAP_OKAY=0; AC_MSG_WARN([lber.h not found])])
-AC_CHECK_LIB(ldap, ldap_init, :, [LDAP_OKAY=0; AC_MSG_WARN([libldap not found])])
-if test "$LDAP_OKAY" = "0"; then
- AC_ERROR("LDAP libraries missing - skipping LDAP database module")
-fi
-BER_OKAY=0
-AC_CHECK_LIB(ldap, ber_init, [BER_OKAY=1])
-if test "$BER_OKAY" = "1"; then
- LDAP_LIBS='-lldap'
-else
- AC_CHECK_LIB(lber, ber_init, [BER_OKAY=1], [AC_MSG_WARN([libber not found])])
- if test "$BER_OKAY" = "1"; then
- LDAP_LIBS='-lldap -llber'
- else
- AC_ERROR("BER library missing - skipping LDAP database module")
- fi
-fi
-AC_SUBST(LDAP_LIBS)
-
-KRB5_RUN_FLAGS
-dnl The following is for check...
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY
-dnl
-V5_AC_OUTPUT_MAKEFILE