mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-21 07:09:34 -05:00
Libraries actually compiles using current templates...
however much is still needed (included db2 and thread detection)
This commit is contained in:
parent
15f4632ec6
commit
adf3d5a200
5 changed files with 48 additions and 43 deletions
20
acconfig.h
20
acconfig.h
|
|
@ -17,32 +17,32 @@
|
||||||
/* define this to remove -lldap cache support */
|
/* define this to remove -lldap cache support */
|
||||||
#undef LDAP_NOCACHE
|
#undef LDAP_NOCACHE
|
||||||
|
|
||||||
/* define this for phonetic support */
|
|
||||||
#undef LDAP_PHONETIC
|
|
||||||
|
|
||||||
/* define this for LDAP referrals support */
|
/* define this for LDAP referrals support */
|
||||||
#undef LDAP_REFERRALS
|
#undef LDAP_REFERRALS
|
||||||
|
|
||||||
|
/* define this for phonetic support */
|
||||||
|
#undef SLAPD_PHONETIC
|
||||||
|
|
||||||
/* define this to use SLAPD shell backend */
|
/* define this to use SLAPD shell backend */
|
||||||
#undef SLAPD_SHELL
|
/* #undef SLAPD_SHELL */
|
||||||
|
|
||||||
/* define this to use SLAPD passwd backend */
|
/* define this to use SLAPD passwd backend */
|
||||||
#undef SLAPD_PASSWD
|
/* #undef SLAPD_PASSWD */
|
||||||
|
|
||||||
/* define this to use SLAPD LDBM backend */
|
/* define this to use SLAPD LDBM backend */
|
||||||
#undef SLAPD_LDBM
|
/* #undef SLAPD_LDBM */
|
||||||
|
|
||||||
/* define this to use DBBTREE w/ LDBM backend */
|
/* define this to use DBBTREE w/ LDBM backend */
|
||||||
#undef LDBM_USE_DBBTREE
|
/* #undef LDBM_USE_DBBTREE */
|
||||||
|
|
||||||
/* define this to use DBHASH w/ LDBM backend */
|
/* define this to use DBHASH w/ LDBM backend */
|
||||||
#undef LDBM_USE_DBHASH
|
/* #undef LDBM_USE_DBHASH */
|
||||||
|
|
||||||
/* define this to use GDBM w/ LDBM backend */
|
/* define this to use GDBM w/ LDBM backend */
|
||||||
#undef LDBM_USE_GDBM
|
/* #undef LDBM_USE_GDBM */
|
||||||
|
|
||||||
/* define this to use NDBM w/ LDBM backend */
|
/* define this to use NDBM w/ LDBM backend */
|
||||||
#undef LDBM_USE_NDBM
|
/* #undef LDBM_USE_NDBM */
|
||||||
|
|
||||||
|
|
||||||
/* Leave that blank line there!! Autoheader needs it. */
|
/* Leave that blank line there!! Autoheader needs it. */
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ LIBDB = @LIBDB@
|
||||||
|
|
||||||
# Our Defaults
|
# Our Defaults
|
||||||
CC = $(AC_CC)
|
CC = $(AC_CC)
|
||||||
DEFS = $(AC_DEFS) $(INCLUDEDIR) $(LDAP_DEFS)
|
DEFS = $(AC_DEFS) $(INCLUDEDIR) $(LDAP_DEFS) $(XDEFS)
|
||||||
LIBS = -L$(LDAP_LIBDIR) $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
|
LIBS = -L$(LDAP_LIBDIR) $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
|
||||||
|
|
||||||
CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
|
CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
|
||||||
|
|
|
||||||
42
configure.in
42
configure.in
|
|
@ -190,9 +190,10 @@ AC_PATH_PROG(FINGER, finger, /usr/ucb/finger,
|
||||||
$PATH:/usr/ucb)
|
$PATH:/usr/ucb)
|
||||||
|
|
||||||
ldbm_use="none"
|
ldbm_use="none"
|
||||||
LIBDB=""
|
LDBM_LIB=""
|
||||||
|
LDBM_DEFS=""
|
||||||
|
|
||||||
if test "$BUILD_LDBM" = "yes" ; then
|
if test "$SLAPD_LDBM" = "yes" ; then
|
||||||
if test $ldbm_prefer = any -o $ldbm_prefer = dbbtree \
|
if test $ldbm_prefer = any -o $ldbm_prefer = dbbtree \
|
||||||
-o $ldbm_prefer = dbhash ; then
|
-o $ldbm_prefer = dbhash ; then
|
||||||
AC_CHECK_FUNC(dbopen,[
|
AC_CHECK_FUNC(dbopen,[
|
||||||
|
|
@ -201,36 +202,37 @@ if test "$BUILD_LDBM" = "yes" ; then
|
||||||
AC_CHECK_LIB(db,dbopen,[
|
AC_CHECK_LIB(db,dbopen,[
|
||||||
ldbm_use=$ldbm_prefer
|
ldbm_use=$ldbm_prefer
|
||||||
ldbm_prefer=found
|
ldbm_prefer=found
|
||||||
LIBDB="-ldb"
|
LDBM_LIB="-ldb"
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
if test $ldbm_prefer = found ; then
|
if test $ldbm_prefer = found ; then
|
||||||
if test $ldbm_use = dbhash ; then
|
if test $ldbm_use = dbhash ; then
|
||||||
AC_DEFINE(LDBM_USE_DBHASH,1)
|
dnl AC_DEFINE(LDBM_USE_DBHASH,1)
|
||||||
dnl LDAP_DEFS="$LDAP_DEFS -DLDBM_USE_DBHASH"
|
LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_DBHASH"
|
||||||
else
|
else
|
||||||
AC_DEFINE(LDBM_USE_DBBTREE,1)
|
dnl AC_DEFINE(LDBM_USE_DBBTREE,1)
|
||||||
dnl LDAP_DEFS="$LDAP_DEFS -DLDBM_USE_DBBTREE"
|
LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_DBBTREE"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $ldbm_prefer = any -o $ldbm_prefer = gdbm ; then
|
if test $ldbm_prefer = any -o $ldbm_prefer = gdbm ; then
|
||||||
AC_CHECK_LIB(gdbm, gdbm_open,[
|
AC_CHECK_LIB(gdbm, gdbm_open,[
|
||||||
ldbm_use=$ldbm_prefer
|
ldbm_use=$ldbm_prefer
|
||||||
ldbm_prefer=found
|
ldbm_prefer=found
|
||||||
LIBDB="-lgdbm"
|
LDBM_LIB="-lgdbm"
|
||||||
AC_DEFINE(LDBM_USE_GDBM,1)
|
dnl AC_DEFINE(LDBM_USE_GDBM,1)
|
||||||
dnl LDAP_DEFS="$LDAP_DEFS -DLDBM_USE_GDBM"
|
LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_GDBM"
|
||||||
])
|
])
|
||||||
fi
|
fi
|
||||||
if test $ldbm_prefer = any -o $ldbm_prefer = ndbm ; then
|
if test $ldbm_prefer = any -o $ldbm_prefer = ndbm ; then
|
||||||
AC_CHECK_LIB(dbm,dbm_open,[
|
AC_CHECK_LIB(dbm,dbm_open,[
|
||||||
ldbm_use=ndbm
|
ldbm_use=ndbm
|
||||||
ldbm_prefer=found
|
ldbm_prefer=found
|
||||||
LIBDB="-ldbm"
|
LDBM_LIB="-ldbm"
|
||||||
AC_DEFINE(LDBM_USE_NDBM,1)
|
dnl AC_DEFINE(LDBM_USE_NDBM,1)
|
||||||
dnl LDAP_DEFS="$LDAP_DEFS -DLDBM_USE_NDBM"
|
LDBM_DEFS="$LDAP_DEFS -DLDBM_USE_NDBM"
|
||||||
])
|
])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -243,9 +245,6 @@ dnl LDAP_DEFS="$LDAP_DEFS -DLDBM_USE_NDBM"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(LDAP_DEFS)
|
|
||||||
AC_SUBST(LIBDB)
|
|
||||||
|
|
||||||
# ud needs termcap (should insert check here)
|
# ud needs termcap (should insert check here)
|
||||||
LIBTERMCAP="-ltermcap"
|
LIBTERMCAP="-ltermcap"
|
||||||
AC_SUBST(LIBTERMCAP)
|
AC_SUBST(LIBTERMCAP)
|
||||||
|
|
@ -322,6 +321,17 @@ AC_REPLACE_FUNCS(strdup)
|
||||||
# Check Configuration
|
# Check Configuration
|
||||||
CF_SYS_ERRLIST
|
CF_SYS_ERRLIST
|
||||||
|
|
||||||
|
AC_SUBST(LDAP_DEFS)
|
||||||
|
AC_SUBST(LDAP_LIBS)
|
||||||
|
AC_SUBST(LDAPD_DEFS)
|
||||||
|
AC_SUBST(LDAPD_LIBS)
|
||||||
|
AC_SUBST(SLAPD_DEFS)
|
||||||
|
AC_SUBST(SLAPD_LIBS)
|
||||||
|
AC_SUBST(SLUPPD_DEFS)
|
||||||
|
AC_SUBST(SLUPPD_LIBS)
|
||||||
|
AC_SUBST(LDBM_DEFS)
|
||||||
|
AC_SUBST(LDBM_LIBS)
|
||||||
|
|
||||||
dnl AC_OUTPUT( \
|
dnl AC_OUTPUT( \
|
||||||
dnl clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
|
dnl clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
|
||||||
dnl clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \
|
dnl clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \
|
||||||
|
|
|
||||||
|
|
@ -82,29 +82,20 @@
|
||||||
/* define this to remove -lldap cache support */
|
/* define this to remove -lldap cache support */
|
||||||
#undef LDAP_NOCACHE
|
#undef LDAP_NOCACHE
|
||||||
|
|
||||||
|
/* define this for LDAP referrals support */
|
||||||
|
#undef LDAP_REFERRALS
|
||||||
|
|
||||||
/* define this for phonetic support */
|
/* define this for phonetic support */
|
||||||
#undef LDAP_PHONETIC
|
#undef SLAPD_PHONETIC
|
||||||
|
|
||||||
/* define this to use SLAPD shell backend */
|
/* define this to use SLAPD shell backend */
|
||||||
#undef SLAPD_SHELL
|
/* #undef SLAPD_SHELL */
|
||||||
|
|
||||||
/* define this to use SLAPD passwd backend */
|
/* define this to use SLAPD passwd backend */
|
||||||
#undef SLAPD_PASSWD
|
/* #undef SLAPD_PASSWD */
|
||||||
|
|
||||||
/* define this to use SLAPD LDBM backend */
|
/* define this to use SLAPD LDBM backend */
|
||||||
#undef SLAPD_LDBM
|
/* #undef SLAPD_LDBM */
|
||||||
|
|
||||||
/* define this to use DBBTREE w/ LDBM backend */
|
|
||||||
#undef LDBM_USE_DBBTREE
|
|
||||||
|
|
||||||
/* define this to use DBHASH w/ LDBM backend */
|
|
||||||
#undef LDBM_USE_DBHASH
|
|
||||||
|
|
||||||
/* define this to use GDBM w/ LDBM backend */
|
|
||||||
#undef LDBM_USE_GDBM
|
|
||||||
|
|
||||||
/* define this to use NDBM w/ LDBM backend */
|
|
||||||
#undef LDBM_USE_NDBM
|
|
||||||
|
|
||||||
/* Define if you have the gethostname function. */
|
/* Define if you have the gethostname function. */
|
||||||
#undef HAVE_GETHOSTNAME
|
#undef HAVE_GETHOSTNAME
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,10 @@ XPROGRAMS = testldbm
|
||||||
SRCS = ldbm.c
|
SRCS = ldbm.c
|
||||||
OBJS = ldbm.o
|
OBJS = ldbm.o
|
||||||
|
|
||||||
|
XDEFS = @LDBM_DEFS@
|
||||||
|
XLIBS = @LDBM_LIBS@
|
||||||
|
|
||||||
LIBS = -L$(LDAP_LIBDIR) -lavl $(AC_LIBS)
|
LIBS = -L$(LDAP_LIBDIR) -lavl $(AC_LIBS)
|
||||||
|
|
||||||
testldbm: libldbm.a testldbm.o
|
testldbm: libldbm.a testldbm.o
|
||||||
$(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS)
|
$(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue