AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])
dnl HP-UX requires -lV3
+dnl this is not needed on newer versions of HP-UX
AC_CHECK_LIB(V3, sigset)
dnl The following is INTENTIONALLY scripted out because shell does not
if test $ol_cv_cthread_all_load = yes ; then
LTHREAD_LIBS="$LTHREAD_LIBS -all_load"
ol_link_threads=mach
+ ol_with_threads=found
fi
fi
if test $ol_link_threads = yes ; then
LTHREAD_LIBS="-lthreads"
ol_link_threads=mach
+ ol_with_threads=found
else
AC_MSG_ERROR([could not link with Mach CThreads])
fi
AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth])
LTHREAD_LIBS="$LTHREAD_LIBS -lpth"
ol_link_threads=pth
+ ol_with_threads=found
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then
- AC_MSG_ERROR(BerkeleyDB not available)
-elif test $ol_enable_bdb != no -a $ol_link_ldbm != berkeley ; then
- ol_enable_bdb=yes
+ AC_MSG_ERROR(BDB: BerkeleyDB not available)
+elif test $ol_enable_bdb != no -a $ol_link_ldbm = berkeley ; then
+ OL_BDB_COMPAT
+
+ if test $ol_cv_bdb_compat = yes ; then
+ ol_enable_bdb=yes
+ elif test $ol_enable_bdb = yes ; then
+ AC_MSG_ERROR(BDB: BerkeleyDB version incompatible)
+ else
+ ol_enable_bdb=no
+ fi
fi
if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
dnl ----------------------------------------------------------------
if test $ol_enable_wrappers != no ; then
- AC_CHECK_HEADERS(tcpd.h)
+ AC_CHECK_HEADERS(tcpd.h,[
+ AC_MSG_CHECKING([for TCP wrappers library])
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -lwrap"
+ AC_TRY_LINK([
+#include <tcpd.h>
+int allow_severity = 0;
+int deny_severity = 0;
- if test $ac_cv_header_tcpd_h != yes ; then
- have_wrappers=no
- else
- AC_TRY_COMPILE([
+struct request_info *req;
+ ],[
+hosts_access(req)
+ ],[AC_MSG_RESULT([-lwrap])
+ have_wrappers=yes
+ LIBS="$save_LIBS"],[
+ dnl try with -lnsl
+ LIBS="$LIBS -lnsl"
+ AC_TRY_LINK([
+#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
- ],[hosts_access()],[have_wrappers=yes],[have_wrappers=no])
- fi
+
+struct request_info *req;
+ ],[
+hosts_access(req)
+ ],[AC_MSG_RESULT([-lwrap -lnsl])
+ have_wrappers=yes
+ LIBS="$save_LIBS -lnsl"],[
+ AC_MSG_RESULT(no)
+ have_wrappers=no
+ LIBS=$save_LIBS])],[
+ have_wrappers=no])],[have_wrappers=no])
if test $have_wrappers = yes ; then
AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
WRAP_LIBS="-lwrap"
-
- dnl We add another check for -lnsl since some libwrap's
- dnl need it, but it isn't always included from above
- AC_CHECK_LIB(nsl, main)
+ elif test $ol_enable_wrappers = yes ; then
+ AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options ore disable])
else
- AC_MSG_WARN(could not find -lwrap)
- if test $ol_enable_wrappers = yes ; then
- AC_MSG_ERROR(could not find wrappers, select appropriate options or disable)
- fi
-
- AC_MSG_WARN(disabling wrappers support)
- ol_enable_wrappers=no
+ AC_MSG_WARN([could not find TCP wrappers, support disabled])
WRAP_LIBS=""
fi
fi