Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3475
Modified Files:
Changelog configure configure.in
Log Message:
Config file and loadable module bug fixes
Index: Changelog
===================================================================
RCS file: /cvsroot/nagios/nagios/Changelog,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Changelog 16 Dec 2004 01:15:24 -0000 1.65
--- Changelog 16 Dec 2004 05:24:10 -0000 1.66
***************
*** 8,11 ****
--- 8,12 ----
* Removed (un)setenv() calls for systems that don't support it
* Fixed problem with installing sample config files
+ * Sample config file fix
Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** configure 16 Dec 2004 01:15:24 -0000 1.64
--- configure 16 Dec 2004 05:24:10 -0000 1.65
***************
*** 3114,3118 ****
! echo $ac_n "checking for linker flags for loadable modules""...
$ac_c" 1>&6
echo "configure:3118: checking for linker flags for loadable modules" >&5
case $host_os in
--- 3114,3118 ----
! echo $ac_n "checking for linker flags for loadable
modules""... $ac_c" 1>&6
echo "configure:3118: checking for linker flags for loadable modules" >&5
case $host_os in
***************
*** 3121,3125 ****
;;
aix4*)
! MOD_LDFLAGS="-G -bnoentry -bexpall"
;;
freebsd2*)
--- 3121,3126 ----
;;
aix4*)
! #MOD_LDFLAGS="-G -bnoentry -bexpall"
! MOD_LDFLAGS="-bM:SRE -bnoentry -bexpall"
;;
freebsd2*)
***************
*** 3133,3136 ****
--- 3134,3142 ----
MOD_CFLAGS="$MOD_CFLAGS -fno-common"
;;
+ linux*)
+ # assume GNU linker and ELF
+ MOD_LDFLAGS="-shared"
+ MOD_CFLAGS="-fPIC"
+ ;;
*)
# assume GNU linker and ELF
***************
*** 3241,3245 ****
set dummy traceroute; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:3244: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PATH_TO_TRACEROUTE'+set}'`\" = set";
then
echo $ac_n "(cached) $ac_c" 1>&6
--- 3247,3251 ----
set dummy traceroute; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:3250: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PATH_TO_TRACEROUTE'+set}'`\" = set";
then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 3286,3295 ****
echo $ac_n "checking for snprintf""... $ac_c" 1>&6
! echo "configure:3289: checking for snprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 3294 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 3292,3301 ----
echo $ac_n "checking for snprintf""... $ac_c" 1>&6
! echo "configure:3295: checking for snprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 3300 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 3314,3318 ****
; return 0; }
EOF
! if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_snprintf=yes"
--- 3320,3324 ----
; return 0; }
EOF
! if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_snprintf=yes"
***************
*** 3340,3346 ****
echo $ac_n "checking for type va_list""... $ac_c" 1>&6
! echo "configure:3343: checking for type va_list" >&5
cat > conftest.$ac_ext <<EOF
! #line 3345 "configure"
#include "confdefs.h"
#ifdef __STDC__
--- 3346,3352 ----
echo $ac_n "checking for type va_list""... $ac_c" 1>&6
! echo "configure:3349: checking for type va_list" >&5
cat > conftest.$ac_ext <<EOF
! #line 3351 "configure"
#include "confdefs.h"
#ifdef __STDC__
***************
*** 3357,3361 ****
; return 0; }
EOF
! if { (eval echo configure:3360: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
--- 3363,3367 ----
; return 0; }
EOF
! if { (eval echo configure:3366: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
***************
*** 3383,3387 ****
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:3386: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 3389,3393 ----
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:3392: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** configure.in 16 Dec 2004 01:15:25 -0000 1.65
--- configure.in 16 Dec 2004 05:24:10 -0000 1.66
***************
*** 510,513 ****
--- 510,514 ----
dnl - Modified version from www.erlang.org
+ dnl - Some 12/15/05 mods made after reading
http://xaxxon.slackworks.com/phuku/dl.html
AC_MSG_CHECKING(for linker flags for loadable modules)
case $host_os in
***************
*** 516,520 ****
;;
aix4*)
! MOD_LDFLAGS="-G -bnoentry -bexpall"
;;
freebsd2*)
--- 517,522 ----
;;
aix4*)
! #MOD_LDFLAGS="-G -bnoentry -bexpall"
! MOD_LDFLAGS="-G -bM:SRE -bnoentry -bexpall"
;;
freebsd2*)
***************
*** 528,531 ****
--- 530,538 ----
MOD_CFLAGS="$MOD_CFLAGS -fno-common"
;;
+ linux*)
+ # assume GNU linker and ELF
+ MOD_LDFLAGS="-shared"
+ MOD_CFLAGS="-fPIC"
+ ;;
*)
# assume GNU linker and ELF
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
|
