|
Lines 1-5
Link Here
|
| 1 |
--- configure.in.orig Thu Nov 1 04:05:38 2007 |
1 |
--- configure.in.orig 2007-12-18 04:21:51.000000000 +1030 |
| 2 |
+++ configure.in Thu Nov 1 19:33:42 2007 |
2 |
+++ configure.in 2008-01-02 12:15:05.000000000 +1030 |
| 3 |
@@ -6,7 +6,6 @@ |
3 |
@@ -6,7 +6,6 @@ |
| 4 |
|
4 |
|
| 5 |
AC_INIT(base/nagios.c) |
5 |
AC_INIT(base/nagios.c) |
|
Lines 7-14
Link Here
|
| 7 |
-AC_PREFIX_DEFAULT(/usr/local/nagios) |
7 |
-AC_PREFIX_DEFAULT(/usr/local/nagios) |
| 8 |
|
8 |
|
| 9 |
PKG_NAME=nagios |
9 |
PKG_NAME=nagios |
| 10 |
PKG_VERSION="3.0b7" |
10 |
PKG_VERSION="3.0rc1" |
| 11 |
@@ -196,7 +195,7 @@ |
11 |
@@ -119,7 +118,15 @@ |
|
|
12 |
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script |
| 13 |
THREADLIBS="" |
| 14 |
have_pthreads="no" |
| 15 |
+have_thr="no" |
| 16 |
|
| 17 |
+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues |
| 18 |
+AC_CHECK_LIB(thr,pthread_create) |
| 19 |
+if test $ac_cv_lib_thr_pthread_create = yes; then |
| 20 |
+ THREADLIBS="-lthr" |
| 21 |
+ have_pthreads="yes" |
| 22 |
+ have_thr="yes" |
| 23 |
+else |
| 24 |
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com> |
| 25 |
dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li> |
| 26 |
AC_DEFUN(AC_PTHREAD_FREEBSD,[ |
| 27 |
@@ -180,6 +187,7 @@ |
| 28 |
if test $have_pthreads = "no"; then |
| 29 |
AC_PTHREAD_FREEBSD |
| 30 |
fi |
| 31 |
+fi |
| 32 |
|
| 33 |
AC_SUBST(THREADLIBS) |
| 34 |
|
| 35 |
@@ -196,7 +204,7 @@ |
| 12 |
AC_SUBST(nagios_grp) |
36 |
AC_SUBST(nagios_grp) |
| 13 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") |
37 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") |
| 14 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") |
38 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") |
|
Lines 17-23
Link Here
|
| 17 |
AC_SUBST(INSTALL_OPTS) |
41 |
AC_SUBST(INSTALL_OPTS) |
| 18 |
|
42 |
|
| 19 |
AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user) |
43 |
AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user) |
| 20 |
@@ -520,9 +519,9 @@ |
44 |
@@ -520,9 +528,9 @@ |
| 21 |
fi |
45 |
fi |
| 22 |
|
46 |
|
| 23 |
dnl Try and locate glib |
47 |
dnl Try and locate glib |
|
Lines 29-31
Link Here
|
| 29 |
AC_SUBST(GLIB_LIBS) |
53 |
AC_SUBST(GLIB_LIBS) |
| 30 |
if test x$GLIB_LIBS != x; then |
54 |
if test x$GLIB_LIBS != x; then |
| 31 |
AC_DEFINE_UNQUOTED(HAVE_GLIB) |
55 |
AC_DEFINE_UNQUOTED(HAVE_GLIB) |
|
|
56 |
@@ -667,6 +675,9 @@ |
| 57 |
|
| 58 |
AC_DEFINE_UNQUOTED(EMBEDDEDPERL) |
| 59 |
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" |
| 60 |
+ if test x$have_thr = xyes; then |
| 61 |
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" |
| 62 |
+ fi |
| 63 |
PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" |
| 64 |
CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" |
| 65 |
USEPERL=yes |