Commit 4a48744d authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Import minor configure fixes from devel.

parent c4639359
This diff is collapsed.
......@@ -462,7 +462,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
],,[-lexc])
],:,[-lexc])
LIBS="$save_LIBS"
fi
......@@ -475,7 +475,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
],,[-lmach -lexc -lc_r])
],:,[-lmach -lexc -lc_r])
LIBS="$save_LIBS"
fi
......@@ -484,7 +484,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
save_LIBS="$LIBS"
AC_CHECK_LIB(pthread, pthread_create, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"])
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"],:)
LIBS="$save_LIBS"
fi
......@@ -493,7 +493,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
save_LIBS="$LIBS"
AC_CHECK_LIB(c_r, pthread_create, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"])
LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"],:)
LIBS="$save_LIBS"
fi
......@@ -502,7 +502,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
save_LIBS="$LIBS"
AC_CHECK_LIB(pthreads, pthread_create, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"])
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"],:)
LIBS="$save_LIBS"
fi
......@@ -513,7 +513,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
AC_CHECK_LIB(pthreads, pthread_join, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
],[-Wl,-woff,85])
],:,[-Wl,-woff,85])
LIBS="$save_LIBS"
fi
......@@ -1001,9 +1001,15 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
ol_enable_ldbm=no
fi
if test $ol_enable_wrappers = yes ; then
AC_CHECK_LIB(wrap, main,
[have_wrappers=yes], [have_wrappers=no])
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,
[have_wrappers=yes], [have_wrappers=no])
fi
if test $have_wrappers = yes ; then
AC_DEFINE(HAVE_TCPD)
......@@ -1017,6 +1023,7 @@ if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN(disabling wrappers support)
ol_enable_wrappers=no
fi
fi
fi
......
......@@ -545,6 +545,9 @@
/* Define if you have the <syslog.h> header file. */
#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. */
#undef HAVE_TERMCAP_H
......
Markdown is supported
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