mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-14 20:41:20 +02:00
62 lines
2.0 KiB
Plaintext
62 lines
2.0 KiB
Plaintext
--- ./configure.in.orig 2015-04-05 19:02:09.000000000 +0200
|
|
+++ ./configure.in 2015-05-19 15:53:43.606051000 +0200
|
|
@@ -6,7 +6,6 @@
|
|
|
|
AC_INIT(base/icinga.c)
|
|
AC_CONFIG_HEADER(include/config.h)
|
|
-AC_PREFIX_DEFAULT(/usr/local/icinga)
|
|
|
|
PKG_NAME=icinga-core
|
|
PKG_VERSION="1.13.1"
|
|
@@ -144,6 +143,15 @@
|
|
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
|
|
THREADLIBS=""
|
|
have_pthreads="no"
|
|
+have_thr="no"
|
|
+
|
|
+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
|
|
+AC_CHECK_LIB(thr,pthread_create)
|
|
+if test $ac_cv_lib_thr_pthread_create = yes; then
|
|
+ THREADLIBS="-lthr"
|
|
+ have_pthreads="yes"
|
|
+ have_thr="yes"
|
|
+else
|
|
|
|
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
|
|
dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
|
|
@@ -205,6 +213,7 @@
|
|
if test $have_pthreads = "no"; then
|
|
AC_PTHREAD_FREEBSD
|
|
fi
|
|
+fi
|
|
|
|
AC_SUBST(THREADLIBS)
|
|
|
|
@@ -223,7 +232,6 @@
|
|
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])
|
|
AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])
|
|
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])
|
|
-INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
|
|
AC_SUBST(INSTALL_OPTS)
|
|
|
|
AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$icinga_user)
|
|
@@ -503,7 +511,7 @@
|
|
P1FILELOC=no
|
|
AC_ARG_WITH(p1-file-dir,AC_HELP_STRING([--with-p1-file-dir=<path>],[sets path to embedded perl p1.pl directory]),P1FILELOC=$withval,P1FILELOC=no)
|
|
if test x$P1FILELOC = xno; then
|
|
- P1FILELOC="$libdir"
|
|
+ P1FILELOC="$bindir"
|
|
fi
|
|
AC_SUBST(P1FILELOC)
|
|
|
|
@@ -1134,6 +1142,9 @@
|
|
|
|
AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
|
|
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
|
|
+ if test x$have_thr = xyes; then
|
|
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
|
|
+ fi
|
|
PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`"
|
|
CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`"
|
|
USEPERL=yes
|