upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add basic configure support of --enable-quipu

Browse source
This commit is contained in:
Kurt Zeilenga 1999-08-05 01:23:04 +00:00
parent 44b4bda011
commit 7b6a923937
5 changed files with 997 additions and 858 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1796
configure vendored
View file

File diff suppressed because it is too large Load diff

19
configure.in
View file

@ -101,6 +101,7 @@ OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl
OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl
OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(quipu,[ --enable-quipu build quipu migration tools], no)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl
OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
@ -188,6 +189,9 @@ if test $ol_enable_slapd = no ; then
if test $ol_enable_phonetic = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-phonetic argument])
fi
if test $ol_enable_quipu = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-quipu argument])
fi
if test $ol_enable_rlookups = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument])
fi
@ -234,6 +238,7 @@ if test $ol_enable_slapd = no ; then
ol_enable_modules=no
ol_enable_multimaster=no
ol_enable_phonetic=no
ol_enable_quipu=no
ol_enable_rlookups=no
ol_enable_wrappers=no
@ -346,6 +351,7 @@ BUILD_LDAP=no
BUILD_LDBM=no
BUILD_PASSWD=no
BUILD_PERL=no
BUILD_QUIPU=no
BUILD_SHELL=no
BUILD_TCL=no
BUILD_THREAD=no
@ -700,6 +706,18 @@ if test $ol_link_isode != no; then
AC_PATH_PROG(PEPSY, pepsy)
fi
if test $ol_enable_quipu != no ; then
AC_CHECK_HEADERS(quipu/commonarg.h)
if test $ac_cv_header_quipu_commonarg_h = yes ; then
BUILD_QUIPU=yes
elif test $ol_enable_quipu = auto ; then
AC_MSG_WARN([no quipu for --enable-quipu=auto, disabling])
else
AC_MSG_ERROR(no quipu for --enable-quipu=$ol_enable_quipu)
fi
fi
dnl
dnl check for kerberos
dnl
@ -2022,6 +2040,7 @@ AC_SUBST(BUILD_SLAPD)
AC_SUBST(BUILD_LDBM)
AC_SUBST(BUILD_PASSWD)
AC_SUBST(BUILD_PERL)
AC_SUBST(BUILD_QUIPU)
AC_SUBST(BUILD_SHELL)
AC_SUBST(BUILD_TCL)
AC_SUBST(BUILD_BDB2_DYNAMIC)

3
include/portable.h.in
View file

@ -432,6 +432,9 @@
/* Define if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
/* Define if you have the <quipu/commonarg.h> header file. */
#undef HAVE_QUIPU_COMMONARG_H
/* Define if you have the <readline/history.h> header file. */
#undef HAVE_READLINE_HISTORY_H

24
servers/slapd/tools/Makefile.in
View file

@ -12,7 +12,7 @@
# Stand alone LDAP server tools makefile
#
#-----------------------------------------------------------------------------
HAVE_ISODE = @HAVE_ISODE@
HAVE_QUIPU = @HAVE_QUIPU@
BUILD_LDBM = @BUILD_LDBM@
BUILD_BDB2 = @BUILD_BDB2@
@ -75,10 +75,10 @@ ldbm-tools: $(PROGRAMS)
bdb2-tools: $(PROGRAMS2)
build-edb2ldif: FORCE
@if [ "$(HAVE_ISODE)" = "yes" ]; then \
@if [ "$(HAVE_QUIPU)" = "yes" ]; then \
$(MAKE) $(MFLAGS) edb2ldif; \
else \
echo "run configure with --with-isode to build edb2ldif"; \
echo "run configure with --enable-quipu to build edb2ldif"; \
fi
edb2ldif: edb2-vers.o
@ -89,10 +89,10 @@ edb2-vers.c: $(EDB2LDIFOBJS)
$(MKVERSION) ebd2ldif > $@
build-chlog2replog: FORCE
@if [ "$(HAVE_ISODE)" = "yes" ]; then \
@if [ "$(HAVE_QUIPU)" = "yes" ]; then \
$(MAKE) $(MFLAGS) chlog2replog; \
else \
echo "run configure with --with-isode to build chlog2replog"; \
echo "run configure with --enable-quipu to build chlog2replog"; \
fi
chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o $(SLAPD_LIBDEPEND)
@ -146,7 +146,7 @@ clean-local: FORCE
*.o core .libs/*
depend-local: FORCE
@DEPEND=no ; DEPEND_LDBM= ; DEPEND_BDB2= ; DEPEND_ISODE= ; \
@DEPEND=no ; DEPEND_LDBM= ; DEPEND_BDB2= ; DEPEND_QUIPU= ; \
if [ "$(BUILD_LDBM)" = "yes" ]; then \
DEPEND_LDBM="$(SRCS)"; \
DEPEND=yes ; \
@ -155,18 +155,18 @@ depend-local: FORCE
DEPEND_BDB2="$(SRCS2)"; \
DEPEND=yes ; \
fi; \
if [ "$(HAVE_ISODE)" = "yes" ]; then \
DEPEND_ISODE="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
if [ "$(HAVE_QUIPU)" = "yes" ]; then \
DEPEND_QUIPU="$(QUIPUINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
DEPEND=yes ; \
fi; \
if [ "$$DEPEND" = "yes" ]; then \
$(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE \
$(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_QUIPU \
$$DEPEND_LDBM $$DEPEND_BDB2; \
else \
echo "slapd-tools: no dependencies to make"; \
fi
install-local: install-ldbm install-bdb2 install-isode FORCE
install-local: install-ldbm install-bdb2 install-quipu FORCE
install-ldbm: FORCE
@-$(MKDIR) $(sbindir)
@ -194,9 +194,9 @@ install-bdb2: FORCE
exit 0 ; \
fi
install-isode: FORCE
install-quipu: FORCE
@-$(MKDIR) $(sbindir)
@if [ "$(HAVE_ISODE)" = "yes" ]; then \
@if [ "$(HAVE_QUIPU)" = "yes" ]; then \
$(LTINSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
$(LTINSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \
else \

13
servers/slapd/tools/Vers-edb2.c
View file

@ -1,13 +0,0 @@
/*
* Copyright (c) 1995 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and that due credit is given
* to the University of Michigan at Ann Arbor. The name of the University
* may not be used to endorse or promote products derived from this
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
char Versionstr[] = " edb2ldif %VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";