mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Minor cleanup of various detections...
This commit is contained in:
parent
941087a09d
commit
a31de60768
3 changed files with 363 additions and 306 deletions
19
configure.in
19
configure.in
|
|
@ -507,7 +507,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||||
if test $ol_with_yielding_select = auto ; then
|
if test $ol_with_yielding_select = auto ; then
|
||||||
ol_with_yielding_select=yes
|
ol_with_yielding_select=yes
|
||||||
fi
|
fi
|
||||||
],,[-lexc])
|
],:,[-lexc])
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -520,7 +520,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||||
if test $ol_with_yielding_select = auto ; then
|
if test $ol_with_yielding_select = auto ; then
|
||||||
ol_with_yielding_select=yes
|
ol_with_yielding_select=yes
|
||||||
fi
|
fi
|
||||||
],,[-lmach -lexc -lc_r])
|
],:,[-lmach -lexc -lc_r])
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -529,7 +529,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||||
save_LIBS="$LIBS"
|
save_LIBS="$LIBS"
|
||||||
AC_CHECK_LIB(pthread, pthread_create, [
|
AC_CHECK_LIB(pthread, pthread_create, [
|
||||||
ol_link_threads=posix
|
ol_link_threads=posix
|
||||||
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"])
|
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"],:)
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -538,7 +538,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||||
save_LIBS="$LIBS"
|
save_LIBS="$LIBS"
|
||||||
AC_CHECK_LIB(c_r, pthread_create, [
|
AC_CHECK_LIB(c_r, pthread_create, [
|
||||||
ol_link_threads=posix
|
ol_link_threads=posix
|
||||||
LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"])
|
LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"],:)
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -547,7 +547,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||||
save_LIBS="$LIBS"
|
save_LIBS="$LIBS"
|
||||||
AC_CHECK_LIB(pthreads, pthread_create, [
|
AC_CHECK_LIB(pthreads, pthread_create, [
|
||||||
ol_link_threads=posix
|
ol_link_threads=posix
|
||||||
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"])
|
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"],:)
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -558,7 +558,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||||
AC_CHECK_LIB(pthreads, pthread_join, [
|
AC_CHECK_LIB(pthreads, pthread_join, [
|
||||||
ol_link_threads=posix
|
ol_link_threads=posix
|
||||||
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
|
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
|
||||||
],[-Wl,-woff,85])
|
],:,[-Wl,-woff,85])
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -1099,8 +1099,14 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $ol_enable_wrappers != no ; then
|
if test $ol_enable_wrappers != no ; then
|
||||||
|
AC_CHECK_HEADERS(tcpd.h)
|
||||||
|
|
||||||
|
if test $ac_cv_header_tcpd_h != yes ; then
|
||||||
|
have_wrappers=no
|
||||||
|
else
|
||||||
AC_CHECK_LIB(wrap, main,
|
AC_CHECK_LIB(wrap, main,
|
||||||
[have_wrappers=yes], [have_wrappers=no])
|
[have_wrappers=yes], [have_wrappers=no])
|
||||||
|
fi
|
||||||
|
|
||||||
if test $have_wrappers = yes ; then
|
if test $have_wrappers = yes ; then
|
||||||
AC_DEFINE(HAVE_TCPD)
|
AC_DEFINE(HAVE_TCPD)
|
||||||
|
|
@ -1114,7 +1120,6 @@ if test $ol_enable_wrappers != no ; then
|
||||||
AC_MSG_WARN(disabling wrappers support)
|
AC_MSG_WARN(disabling wrappers support)
|
||||||
ol_enable_wrappers=no
|
ol_enable_wrappers=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $ol_enable_syslog != no ; then
|
if test $ol_enable_syslog != no ; then
|
||||||
|
|
|
||||||
|
|
@ -580,6 +580,9 @@
|
||||||
/* Define if you have the <syslog.h> header file. */
|
/* Define if you have the <syslog.h> header file. */
|
||||||
#undef HAVE_SYSLOG_H
|
#undef HAVE_SYSLOG_H
|
||||||
|
|
||||||
|
/* Define if you have the <tcpd.h> header file. */
|
||||||
|
#undef HAVE_TCPD_H
|
||||||
|
|
||||||
/* Define if you have the <termcap.h> header file. */
|
/* Define if you have the <termcap.h> header file. */
|
||||||
#undef HAVE_TERMCAP_H
|
#undef HAVE_TERMCAP_H
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue