|
Lines 1-5
Link Here
|
| 1 |
--- configure.in.orig 2007-12-18 04:21:51.000000000 +1030 |
1 |
--- configure.in.orig 2010-03-09 19:39:59.000000000 +0100 |
| 2 |
+++ configure.in 2008-01-02 12:15:05.000000000 +1030 |
2 |
+++ configure.in 2010-04-07 20:18:58.585012048 +0200 |
| 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.0rc1" |
10 |
PKG_VERSION="3.2.1" |
| 11 |
@@ -119,7 +118,15 @@ |
11 |
@@ -125,7 +124,15 @@ |
| 12 |
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script |
12 |
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script |
| 13 |
THREADLIBS="" |
13 |
THREADLIBS="" |
| 14 |
have_pthreads="no" |
14 |
have_pthreads="no" |
|
Lines 23-30
Link Here
|
| 23 |
+else |
23 |
+else |
| 24 |
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com> |
24 |
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com> |
| 25 |
dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li> |
25 |
dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li> |
| 26 |
AC_DEFUN(AC_PTHREAD_FREEBSD,[ |
26 |
AC_DEFUN([AC_PTHREAD_FREEBSD],[ |
| 27 |
@@ -180,6 +187,7 @@ |
27 |
@@ -186,6 +193,7 @@ |
| 28 |
if test $have_pthreads = "no"; then |
28 |
if test $have_pthreads = "no"; then |
| 29 |
AC_PTHREAD_FREEBSD |
29 |
AC_PTHREAD_FREEBSD |
| 30 |
fi |
30 |
fi |
|
Lines 32-49
Link Here
|
| 32 |
|
32 |
|
| 33 |
AC_SUBST(THREADLIBS) |
33 |
AC_SUBST(THREADLIBS) |
| 34 |
|
34 |
|
| 35 |
@@ -196,7 +204,7 @@ |
35 |
@@ -201,7 +209,7 @@ |
| 36 |
AC_SUBST(nagios_grp) |
36 |
AC_SUBST(nagios_grp) |
| 37 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") |
37 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios]) |
| 38 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") |
38 |
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios]) |
| 39 |
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp" |
39 |
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp" |
| 40 |
+INSTALL_OPTS="-o root -g wheel" |
40 |
+INSTALL_OPTS="-o root -g wheel" |
| 41 |
AC_SUBST(INSTALL_OPTS) |
41 |
AC_SUBST(INSTALL_OPTS) |
| 42 |
|
42 |
|
| 43 |
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,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user) |
| 44 |
@@ -667,6 +675,9 @@ |
44 |
@@ -668,6 +676,9 @@ |
| 45 |
|
45 |
|
| 46 |
AC_DEFINE_UNQUOTED(EMBEDDEDPERL) |
46 |
AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?]) |
| 47 |
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" |
47 |
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" |
| 48 |
+ if test x$have_thr = xyes; then |
48 |
+ if test x$have_thr = xyes; then |
| 49 |
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" |
49 |
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" |