Commit 7434c310 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

autoupdate + manual fixes

parent 54b633f3
This diff is collapsed.
......@@ -30333,13 +30333,14 @@ if test "${ol_cv_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
 
if test "$cross_compiling" = yes; then
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -30442,11 +30443,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -30568,6 +30565,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -30670,11 +30668,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -30801,6 +30795,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -30903,11 +30898,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31034,6 +31025,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31136,11 +31128,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31267,6 +31255,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31369,11 +31358,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31500,6 +31485,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31602,11 +31588,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31734,6 +31716,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31836,11 +31819,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -31967,6 +31946,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32069,11 +32049,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32201,6 +32177,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32303,11 +32280,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32435,6 +32408,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32537,11 +32511,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32668,6 +32638,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32770,11 +32741,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -32902,6 +32869,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33004,11 +32972,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33136,6 +33100,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33238,11 +33203,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33369,6 +33330,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33471,11 +33433,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33602,6 +33560,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33704,11 +33663,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33836,6 +33791,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -33938,11 +33894,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -34691,11 +34643,7 @@ else
ol_cv_pthread_create_works=yes
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* pthread test headers */
#include <pthread.h>
#if HAVE_PTHREADS < 7
......@@ -43102,8 +43050,8 @@ if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then
echo "$as_me: error: BDB/HDB: BerkeleyDB not available" >&2;}
{ (exit 1); exit 1; }; }
else
echo "$as_me:$LINENO: checking Berkeley DB version for BDB backend" >&5
echo $ECHO_N "checking Berkeley DB version for BDB backend... $ECHO_C" >&6
echo "$as_me:$LINENO: checking Berkeley DB version for BDB/HDB backends" >&5
echo $ECHO_N "checking Berkeley DB version for BDB/HDB backends... $ECHO_C" >&6
if test "${ol_cv_bdb_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
......@@ -925,15 +925,13 @@ AC_CACHE_CHECK([for winsock], [ol_cv_winsock],
save_LIBS="$LIBS"
for curlib in ws2_32 wsock32; do
LIBS="$LIBS -l$curlib"
AC_TRY_LINK([#include <winsock.h>
],
[
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
]], [[
socket(0,0,0);
select(0,NULL,NULL,NULL,NULL);
closesocket(0);
gethostname(NULL,0);
],
ol_cv_winsock=yes, ol_cv_winsock=no)
]])],[ol_cv_winsock=yes],[ol_cv_winsock=no])
if test $ol_cv_winsock = yes; then
AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
......@@ -988,14 +986,12 @@ dnl ----------------------------------------------------------------
AC_CHECK_HEADERS( sys/epoll.h )
if test "${ac_cv_header_sys_epoll_h}" = yes; then
AC_MSG_CHECKING(for epoll system call)
AC_TRY_RUN(
int main(int argc, char *argv[])
AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char *argv)
{
int epfd = epoll_create(256);
exit (epfd == -1 ? 1 : 0);
}, [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_EPOLL,1, [define if your system supports epoll])],
AC_MSG_RESULT(no),AC_MSG_RESULT(no))
}]])],[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_EPOLL,1, [define if your system supports epoll])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
fi
dnl ----------------------------------------------------------------
......@@ -1040,15 +1036,13 @@ if test $have_uuid = no ; then
AC_MSG_CHECKING(to see if -lrpcrt4 is needed for win32 UUID support)
save_LIBS="$LIBS"
LIBS="$LIBS -lrpcrt4"
AC_TRY_LINK([
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
int __stdcall UuidCreate(void *);
int __stdcall UuidToStringA(void *,void **);
],
[
]], [[
UuidCreate(0);
UuidToStringA(0,0);
],
need_rpcrt=yes, need_rpcrt=no)
]])],[need_rpcrt=yes],[need_rpcrt=no])
if test $need_rpcrt = yes; then
SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
fi
......@@ -1105,13 +1099,12 @@ elif test $ol_enable_ipv6 != no ; then
AC_CACHE_CHECK([struct sockaddr_storage],ol_cv_struct_sockaddr_storage,[
AC_TRY_COMPILE([
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/socket.h>
],[
]], [[
struct sockaddr_storage ss;
], [ol_cv_struct_sockaddr_storage=yes],
[ol_cv_struct_sockaddr_storage=no])])
]])],[ol_cv_struct_sockaddr_storage=yes],[ol_cv_struct_sockaddr_storage=no])])
if test $ol_cv_inet6_addrstrlen = yes \
-a $ol_cv_struct_sockaddr_storage = yes ; then
......@@ -1238,13 +1231,13 @@ if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \
dnl save the flags
save_LIBS="$LIBS"
LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS"
AC_TRY_LINK([
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <kerberosIV/krb.h>
#include <kerberosIV/des.h>
extern int des_debug;
],[
]], [[
des_debug = 1;
], ol_cv_var_des_debug=yes, ol_cv_var_des_debug=no)
]])],[ol_cv_var_des_debug=yes],[ol_cv_var_des_debug=no])
dnl restore the LIBS
LIBS="$save_LIBS"
])
......@@ -1357,7 +1350,7 @@ if test $ol_with_tls != no ; then
fi
else
AC_WARN([TLS data protection not supported!])
AC_MSG_WARN([TLS data protection not supported!])
fi
WITH_TLS=no
......@@ -1366,18 +1359,18 @@ if test $ol_link_tls = yes ; then
WITH_TLS=yes
elif test $ol_with_tls = auto ; then
AC_WARN([Could not locate TLS/SSL package])
AC_WARN([TLS data protection not supported!])
AC_MSG_WARN([Could not locate TLS/SSL package])
AC_MSG_WARN([TLS data protection not supported!])
elif test $ol_with_tls != no ; then
AC_ERROR([Could not locate TLS/SSL package])
AC_MSG_ERROR([Could not locate TLS/SSL package])
fi
dnl ----------------------------------------------------------------
dnl LAN Manger password checking requires DES from OpenSSL
if test $ol_enable_lmpasswd != no; then
if test $ol_link_tls != yes ; then
AC_ERROR([LAN Manager passwords require OpenSSL])
AC_MSG_ERROR([LAN Manager passwords require OpenSSL])
fi
AC_DEFINE(SLAPD_LMHASH, 1, [define to support LAN Manager passwords])
......@@ -1467,12 +1460,12 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
dnl pthread_create in $LIBS
AC_CACHE_CHECK([for pthread_create in default libraries],
ol_cv_pthread_create,[
AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
[ol_cv_pthread_create=yes],
[ol_cv_pthread_create=no],
[AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION,
AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM],
[ol_cv_pthread_create=yes],
[ol_cv_pthread_create=no])])])
[ol_cv_pthread_create=no],
[AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION,
[ol_cv_pthread_create=yes],
[ol_cv_pthread_create=no])])])
if test $ol_cv_pthread_create != no ; then
ol_link_threads=posix
......@@ -1548,15 +1541,12 @@ dnl [ol_cv_pthread_lpthread_lexc])
AC_CACHE_CHECK([for pthread_detach with <pthread.h>],
[ol_cv_func_pthread_detach], [
dnl save the flags
AC_TRY_LINK([
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <pthread.h>
#ifndef NULL
#define NULL (void*)0
#endif
],
[pthread_detach(NULL);],
[ol_cv_func_pthread_detach=yes],
[ol_cv_func_pthread_detach=no])
]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
])
if test $ol_cv_func_pthread_detach = no ; then
......@@ -1583,7 +1573,7 @@ dnl [ol_cv_pthread_lpthread_lexc])
AC_CACHE_CHECK([if pthread_create() works],
ol_cv_pthread_create_works,[
AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM,
AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM],
[ol_cv_pthread_create_works=yes],
[ol_cv_pthread_create_works=no],
[dnl assume yes
......@@ -1597,7 +1587,7 @@ dnl [ol_cv_pthread_lpthread_lexc])
if test $ol_with_yielding_select = auto ; then
AC_CACHE_CHECK([if select yields when using pthreads],
ol_cv_pthread_select_yields,[
AC_TRY_RUN([
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
......@@ -1670,10 +1660,7 @@ int main(argc, argv)
#endif
exit(2);
}],
[ol_cv_pthread_select_yields=no],
[ol_cv_pthread_select_yields=yes],
[ol_cv_pthread_select_yields=cross])])
}]])],[ol_cv_pthread_select_yields=no],[ol_cv_pthread_select_yields=yes],[ol_cv_pthread_select_yields=cross])])
if test $ol_cv_pthread_select_yields = cross ; then
AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])
......@@ -1716,9 +1703,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
dnl save the flags
save_LIBS="$LIBS"
LIBS="-all_load $LIBS"
AC_TRY_LINK([#include <mach/cthreads.h>],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mach/cthreads.h>]], [[
cthread_fork((void *)0, (void *)0);
], ol_cv_cthread_all_load=yes, ol_cv_cthread_all_load=no)
]])],[ol_cv_cthread_all_load=yes],[ol_cv_cthread_all_load=no])
dnl restore the LIBS
LIBS="$save_LIBS"
])
......@@ -1862,18 +1849,14 @@ if test $ol_link_threads != no -a $ol_link_threads != nt ; then
dnl If it does, we must link with thread support.
AC_CACHE_CHECK([for thread specific errno],
[ol_cv_errno_thread_specific], [
AC_TRY_LINK([#include <errno.h>], [errno = 0;],
[ol_cv_errno_thread_specific=yes],
[ol_cv_errno_thread_specific=no])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[errno = 0;]])],[ol_cv_errno_thread_specific=yes],[ol_cv_errno_thread_specific=no])
])
dnl The h_errno declaration may dependent upon _REENTRANT.
dnl If it does, we must link with thread support.
AC_CACHE_CHECK([for thread specific h_errno],
[ol_cv_h_errno_thread_specific], [
AC_TRY_LINK([#include <netdb.h>], [h_errno = 0;],
[ol_cv_h_errno_thread_specific=yes],
[ol_cv_h_errno_thread_specific=no])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[h_errno = 0;]])],[ol_cv_h_errno_thread_specific=yes],[ol_cv_h_errno_thread_specific=no])
])
if test $ol_cv_errno_thread_specific != yes \
......@@ -2098,15 +2081,15 @@ if test $ol_enable_wrappers != no ; then
AC_MSG_CHECKING([for TCP wrappers library])
save_LIBS="$LIBS"
LIBS="$LIBS -lwrap"
AC_TRY_LINK([
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
struct request_info *req;
],[
]], [[
hosts_access(req)
],[AC_MSG_RESULT([-lwrap])
]])],[AC_MSG_RESULT([-lwrap])
have_wrappers=yes
LIBS="$save_LIBS"],[
dnl try with -lnsl
......@@ -2124,8 +2107,7 @@ hosts_access(req)
LIBS="$save_LIBS -lnsl"],[
AC_MSG_RESULT(no)
have_wrappers=no
LIBS=$save_LIBS])],[
have_wrappers=no])],[have_wrappers=no])
LIBS=$save_LIBS])])],[have_wrappers=no])
if test $have_wrappers = yes ; then
AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
......@@ -2438,9 +2420,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for long long
AC_CACHE_CHECK([long long], ol_cv_type_long_long, [
AC_TRY_COMPILE([], [long long x;],
[ol_cv_type_long_long=yes],
[ol_cv_type_long_long=no])])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x;]])],[ol_cv_type_long_long=yes],[ol_cv_type_long_long=no])])
if test $ol_cv_type_long_long = yes; then
AC_DEFINE(HAVE_LONG_LONG, 1, [define if you have 'long long'])
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment