mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-09 02:52:04 +08:00
Misc configure cleanup
This commit is contained in:
parent
2e1809d76f
commit
20df7df206
@ -111,7 +111,6 @@ LTFINISH = $(LIBTOOL) --mode=finish
|
||||
|
||||
# Misc UNIX commands used in build environment
|
||||
AR = @AR@
|
||||
AWK = @AWK@
|
||||
BASENAME = basename
|
||||
CAT = cat
|
||||
CHMOD = chmod
|
||||
@ -128,10 +127,6 @@ RANLIB = @RANLIB@
|
||||
RM = rm -f
|
||||
SED = sed
|
||||
|
||||
# Misc UNIX commands used in programs
|
||||
EDITOR = @EDITOR@
|
||||
SENDMAIL = @SENDMAIL@
|
||||
|
||||
# For manual pages
|
||||
# MANCOMPRESS=@MANCOMPRESS@
|
||||
# MANCOMPRESSSUFFIX=@MANCOMPRESSSUFFIX@
|
||||
|
10
configure.in
10
configure.in
@ -641,14 +641,9 @@ AC_LIBTOOL_WIN32_DLL
|
||||
AC_LIBTOOL_DLOPEN
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
AC_PROG_AWK
|
||||
OL_PROG_LN_H
|
||||
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 Perl
|
||||
ol_link_perl=no
|
||||
@ -701,7 +696,7 @@ AC_MINGW32
|
||||
AC_EXEEXT
|
||||
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 BeOS requires -lbe -lroot -lnet
|
||||
@ -1242,7 +1237,8 @@ ol_link_tls=no
|
||||
if test $ol_with_tls != no ; then
|
||||
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,
|
||||
[have_ssleay=yes
|
||||
need_rsaref=no],
|
||||
|
@ -60,12 +60,4 @@
|
||||
#define LDAP_RUNDIR "%RUNDIR%"
|
||||
#endif
|
||||
|
||||
/* command locations */
|
||||
#ifndef LDAP_EDITOR
|
||||
#define LDAP_EDITOR "%EDITOR%"
|
||||
#endif
|
||||
#ifndef LDAP_SENDMAIL
|
||||
#define LDAP_SENDMAIL "%SENDMAIL%"
|
||||
#endif
|
||||
|
||||
#endif /* _LDAP_CONFIG_H */
|
||||
|
@ -52,12 +52,4 @@
|
||||
#define LDAP_RUNDIR LDAP_PREFIX "\\run"
|
||||
#endif
|
||||
|
||||
/* command locations */
|
||||
#ifndef LDAP_EDITOR
|
||||
#define LDAP_EDITOR "%EDITOR%"
|
||||
#endif
|
||||
#ifndef LDAP_SENDMAIL
|
||||
#define LDAP_SENDMAIL "%SENDMAIL%"
|
||||
#endif
|
||||
|
||||
#endif /* _LDAP_CONFIG_H */
|
||||
|
Loading…
Reference in New Issue
Block a user