upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.in: Added better check for libwrap (the old way failed when

Browse source 
libwrap was a dynamic library) and also included extraneous check for
  -lnsl after libwrap check (from head branch). Add -lwrap to new subst
  var WRAP_LIBS so we have more control over where it get's linked
  (dynamic libwrap causes problems when we link to programs that don't
  define certains globals that libwrap expects).
* build/top.mk: Added placeholder for WRAP_LIBS subst
* servers/slapd/Makefile.in: Added $(WRAP_LIBS) to the slapd and sslapd
  link command line specifically so it doesn't get thrown in with the rest
  of the LIBS.
* configure: rebuilt
This commit is contained in:
Ben Collins 1999-09-22 14:58:56 +00:00
parent 342c82123d
commit d4f275c85f
4 changed files with 829 additions and 866 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/top.mk
View file

@ -114,6 +114,7 @@ AC_LIBS = @LIBS@
KRB_LIBS = @KRB_LIBS@
TERMCAP_LIBS = @TERMCAP_LIBS@
WRAP_LIBS = @WRAP_LIBS@
LDAPD_LIBS = @LDAPD_LIBS@
SLAPD_LIBS = @SLAPD_LIBS@

1675
configure vendored
View file

File diff suppressed because it is too large Load diff

15
configure.in
View file

@ -1191,13 +1191,19 @@ if test $ol_enable_wrappers != no ; then
if test $ac_cv_header_tcpd_h != yes ; then
have_wrappers=no
else
AC_CHECK_LIB(wrap, main,
[have_wrappers=yes], [have_wrappers=no])
AC_TRY_COMPILE([
int allow_severity = 0;
int deny_severity = 0;
],[hosts_access()],[have_wrappers=yes],[have_wrappers=no])
fi
if test $have_wrappers = yes ; then
AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
SLAPD_LIBS="$SLAPD_LIBS -lwrap"
WRAP_LIBS="-lwrap"
dnl We add another check for -lnsl since some libwrap's
dnl need it, but it isn't always included from above
AC_CHECK_LIB(nsl, main)
else
AC_MSG_WARN(could not find -lwrap)
if test $ol_enable_wrappers = yes ; then
@ -1206,6 +1212,7 @@ if test $ol_enable_wrappers != no ; then
AC_MSG_WARN(disabling wrappers support)
ol_enable_wrappers=no
WRAP_LIBS=""
fi
fi
@ -1486,7 +1493,7 @@ AC_SUBST(SLURPD_LIBS)
AC_SUBST(LDBM_LIBS)
AC_SUBST(LTHREAD_LIBS)
AC_SUBST(LUTIL_LIBS)
AC_SUBST(WRAP_LIBS)
AC_SUBST(KRB_LIBS)
AC_SUBST(TERMCAP_LIBS)

4
servers/slapd/Makefile.in
View file

@ -37,10 +37,10 @@ all-local-srv: FORCE
(cd tools; $(MAKE) $(MFLAGS) all)
slapd: version.o
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
sslapd: version.o
$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
backendslib: FORCE
@for i in back-*; do \