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

Cleanup config.status and Makefile:Makefile.in dependency rules

Browse source 
Add basics of Kerberos detection.
This commit is contained in:
Kurt Zeilenga 1998-09-22 02:25:42 +00:00
parent e27fd5e0d9
commit 4662b7d124
11 changed files with 497 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile.in
View file

@ -9,19 +9,23 @@ INSTALLDIRS= doc
makefiles: FORCE
./config.status
configure: configure.in aclocal.m4
autoconf
${srcdir}/configure: configure.in aclocal.m4
cd ${srcdir} && autoconf
# autoheader might not change config.h.in, so touch a stamp file
# autoheader might not change portable.h.in, so touch a stamp file
${srcdir}/include/portable.h.in: stamp-h.in
${srcdir}/stamp-h.in: configure.in aclocal.m4 acconfig.h
${srcdir}/stamp-h.in: configure.in aclocal.m4 acconfig.h \
${srcdir}/include/portable.h.top ${srcdir}/include/portable.h.bot
cd ${srcdir} && autoheader
@echo timestamp > ${srcdir}/stamp-h.in
config.h: stamp-h
./include/portable.h: stamp-h
stamp-h: config.h.in config.status
./config.status
Makefile: Makefile.in config.status
./config.status
config.status: configure
./config.status --recheck

2
build/dir.mk
View file

@ -43,3 +43,5 @@ depend-common: depend-local FORCE
( cd $$i; $(MAKE) $(MFLAGS) depend ); \
echo " "; \
done
Makefile: $(top_srcdir)/build/dir.mk

1
build/info.mk
View file

@ -3,3 +3,4 @@
## Makefile Template for Non-Source Directories
##
Makefile: $(top_srcdir)/build/info.mk

2
build/lib.mk
View file

@ -38,3 +38,5 @@ veryclean-common: veryclean-local clean-common
lint-local: FORCE
lint5-local: FORCE
Makefile: $(top_srcdir)/build/lib.mk

2
build/man.mk
View file

@ -41,3 +41,5 @@ lint5: lint5-local
# these could be empty
lint-local: FORCE
lint5-local: FORCE
Makefile: $(top_srcdir)/build/lib.mk

2
build/rules.mk
View file

@ -24,3 +24,5 @@ lint5: lint5-local
# these could be empty
lint-local: FORCE
lint5-local: FORCE
Makefile: $(top_srcdir)/build/rules.mk

2
build/srv.mk
View file

@ -69,3 +69,5 @@ depend-srv: depend-local
$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
veryclean-srv: clean-srv veryclean-local
Makefile: $(top_srcdir)/build/srv.mk

10
build/top.mk
View file

@ -73,6 +73,8 @@ AC_LIBS = @LDFLAGS@ @LIBS@
AC_CFLAGS = @CFLAGS@
AC_LDFLAGS =
KRB_DEFS = @KRB_DEFS@
KRB_LIBS = @KRB_LIBS@
TERMCAP_DEFS = @TERMCAP_DEFS@
TERMCAP_LIBS = @TERMCAP_LIBS@
@ -99,13 +101,7 @@ depend-local:
lint-local:
lint5-local:
Makefile: Makefile.in ${top_srcdir}/config.status
@if test "$(top_srcdir)" = "$(srcdir)" ; then ; \
./config.status ; \
else ; \
echo "Makefile out of date, run config.status from $top_srcdir" ; \
exit 1 ; \
fi
Makefile: Makefile.in $(top_srcdir)/build/top.mk
# empty rule for forcing rules
FORCE:

648
configure vendored
View file

File diff suppressed because it is too large Load diff

51
configure.in
View file

@ -186,6 +186,11 @@ BUILD_LDBM=no
BUILD_PASSWD=no
BUILD_SHELL=no
KRB_DEFS=
KRB_LIBS=
TERMCAP_DEFS=
TERMCAP_LIBS=
dnl ----------------------------------------------------------------
dnl Checks for programs
@ -211,11 +216,44 @@ AC_CHECK_FUNC(socket, :,
AC_CHECK_LIB(inet, socket)
])
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h)
if test $ac_cv_header_kerberosIV_krb_h = yes ; then
AC_CHECK_LIB(krb4, main, [have_k5=yes], [have_k5=no],
[-lkrb5 -ldes425])
if test $have_k5 = yes ; then
ol_with_kerberos=found
ol_link_kerberos=yes
KRB_DEFS="-DKERBEROS"
KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
fi
fi
fi
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
AC_CHECK_HEADERS(krb.h des.h)
if test $ac_cv_header_krb_h = yes ; then
AC_CHECK_LIB(krb, main, [have_k4=yes], [have_k4=no], [-ldes])
if test $have_k4 = yes ; then
ol_with_kerberos=found
ol_link_kerberos=yes
KRB_DEFS="-DKERBEROS"
KRB_LIBS="-lkrb -ldes"
fi
fi
fi
ol_link_threads=no
if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
AC_CHECK_HEADERS(pthread.h sched.h)
if test "$ac_cv_header_pthread_h" = yes ; then
if test $ac_cv_header_pthread_h = yes ; then
OL_POSIX_THREAD_VERSION
if test $ol_cv_pthread_version = final ; then
@ -472,9 +510,6 @@ fi
# ud needs termcap (should insert check here)
ol_link_termcap=no
TERMCAP_DEFS=
TERMCAP_LIBS=
AC_CHECK_HEADERS(termcap.h ncurses.h)
if test $ol_link_termcap = no ; then
@ -498,9 +533,6 @@ if test $ol_link_termcap = no ; then
TERMCAP_LIBS=
fi
AC_SUBST(TERMCAP_DEFS)
AC_SUBST(TERMCAP_LIBS)
# FreeBSD (and others) have crypt(3) in -lcrypt
if test $ol_enable_crypt != no ; then
AC_CHECK_FUNC(crypt, [have_crypt=yes], [
@ -695,6 +727,11 @@ AC_SUBST(LTHREAD_LIBS)
AC_SUBST(LUTIL_DEFS)
AC_SUBST(LUTIL_LIBS)
AC_SUBST(KRB_DEFS)
AC_SUBST(KRB_LIBS)
AC_SUBST(TERMCAP_DEFS)
AC_SUBST(TERMCAP_LIBS)
dnl ----------------------------------------------------------------
dnl final output
dnl

12
include/portable.h.in
View file

@ -160,6 +160,9 @@
/* Define if you have the <db_185.h> header file. */
#undef HAVE_DB_185_H
/* Define if you have the <des.h> header file. */
#undef HAVE_DES_H
/* Define if you have the <dirent.h> header file. */
#undef HAVE_DIRENT_H
@ -172,6 +175,15 @@
/* Define if you have the <gdbm.h> header file. */
#undef HAVE_GDBM_H
/* Define if you have the <kerberosIV/des.h> header file. */
#undef HAVE_KERBEROSIV_DES_H
/* Define if you have the <kerberosIV/krb.h> header file. */
#undef HAVE_KERBEROSIV_KRB_H
/* Define if you have the <krb.h> header file. */
#undef HAVE_KRB_H
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H