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

Misc configure cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2002-10-29 04:55:15 +00:00
parent 2e1809d76f
commit 20df7df206
5 changed files with 708 additions and 841 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/top.mk
View file

@ -111,7 +111,6 @@ LTFINISH = $(LIBTOOL) --mode=finish
# Misc UNIX commands used in build environment # Misc UNIX commands used in build environment
AR = @AR@ AR = @AR@
AWK = @AWK@
BASENAME = basename BASENAME = basename
CAT = cat CAT = cat
CHMOD = chmod CHMOD = chmod
@ -128,10 +127,6 @@ RANLIB = @RANLIB@
RM = rm -f RM = rm -f
SED = sed SED = sed
# Misc UNIX commands used in programs
EDITOR = @EDITOR@
SENDMAIL = @SENDMAIL@
# For manual pages # For manual pages
# MANCOMPRESS=@MANCOMPRESS@ # MANCOMPRESS=@MANCOMPRESS@
# MANCOMPRESSSUFFIX=@MANCOMPRESSSUFFIX@ # MANCOMPRESSSUFFIX=@MANCOMPRESSSUFFIX@

1518
configure vendored
View file

File diff suppressed because it is too large Load diff

10
configure.in
View file

@ -641,14 +641,9 @@ AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_AWK
OL_PROG_LN_H OL_PROG_LN_H
AC_PROG_LN_S AC_PROG_LN_S
AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Perl dnl Perl
ol_link_perl=no ol_link_perl=no
@ -701,7 +696,7 @@ AC_MINGW32
AC_EXEEXT AC_EXEEXT
AC_OBJEXT AC_OBJEXT
AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension]) AC_DEFINE_UNQUOTED(EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl BeOS requires -lbe -lroot -lnet dnl BeOS requires -lbe -lroot -lnet
@ -1242,7 +1237,8 @@ ol_link_tls=no
if test $ol_with_tls != no ; then if test $ol_with_tls != no ; then
AC_CHECK_HEADERS(openssl/ssl.h ssl.h) AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then if test $ac_cv_header_openssl_ssl_h = yes \
-o $ac_cv_header_ssl_h = yes ; then
AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms,
[have_ssleay=yes [have_ssleay=yes
need_rsaref=no], need_rsaref=no],

8
include/ldap_config.h.in
View file

@ -60,12 +60,4 @@
#define LDAP_RUNDIR "%RUNDIR%" #define LDAP_RUNDIR "%RUNDIR%"
#endif #endif
/* command locations */
#ifndef LDAP_EDITOR
#define LDAP_EDITOR "%EDITOR%"
#endif
#ifndef LDAP_SENDMAIL
#define LDAP_SENDMAIL "%SENDMAIL%"
#endif
#endif /* _LDAP_CONFIG_H */ #endif /* _LDAP_CONFIG_H */

8
include/ldap_config.nt
View file

@ -52,12 +52,4 @@
#define LDAP_RUNDIR LDAP_PREFIX "\\run" #define LDAP_RUNDIR LDAP_PREFIX "\\run"
#endif #endif
/* command locations */
#ifndef LDAP_EDITOR
#define LDAP_EDITOR "%EDITOR%"
#endif
#ifndef LDAP_SENDMAIL
#define LDAP_SENDMAIL "%SENDMAIL%"
#endif
#endif /* _LDAP_CONFIG_H */ #endif /* _LDAP_CONFIG_H */