[Nagiosplug-checkins] CVS: nagiosplug/lib afs.m4,1.2,1.3 fstypename.m4,1.1,1.2 fsusage.m4,1.1,1.2

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22929/lib

Modified Files:
	afs.m4 fstypename.m4 fsusage.m4 
Log Message:
underquoted defines cause warning on FC2

Index: afs.m4
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/lib/afs.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** afs.m4	18 Mar 2003 08:50:27 -0000	1.2
--- afs.m4	18 Feb 2004 14:56:39 -0000	1.3
***************
*** 1,12 ****
! #serial 3
  
! AC_DEFUN(jm_AFS,
!   AC_MSG_CHECKING(for AFS)
!   if test -d /afs; then
!     AC_DEFINE_UNQUOTED(AFS, 1, [Define if you have the Andrew File System.])
!     ac_result=yes
!   else
!     ac_result=no
!   fi
!   AC_MSG_RESULT($ac_result)
! )
--- 1,13 ----
! #serial 5
  
! AC_DEFUN([jm_AFS],
!   [
!     AC_MSG_CHECKING(for AFS)
!     if test -d /afs; then
!       AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
!       ac_result=yes
!     else
!       ac_result=no
!     fi
!     AC_MSG_RESULT($ac_result)
!   ])

Index: fstypename.m4
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/lib/fstypename.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** fstypename.m4	18 Mar 2003 07:47:37 -0000	1.1
--- fstypename.m4	18 Feb 2004 14:56:39 -0000	1.2
***************
*** 1,3 ****
! #serial 2
  
  dnl From Jim Meyering.
--- 1,3 ----
! #serial 3
  
  dnl From Jim Meyering.
***************
*** 7,11 ****
  dnl
  
! AC_DEFUN(jm_FSTYPENAME,
    [
      AC_CACHE_CHECK([for f_fstypename in struct statfs],
--- 7,11 ----
  dnl
  
! AC_DEFUN([jm_FSTYPENAME],
    [
      AC_CACHE_CHECK([for f_fstypename in struct statfs],
***************
*** 26,31 ****
  
      if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
!       AC_DEFINE_UNQUOTED(HAVE_F_FSTYPENAME_IN_STATFS, 1,
! 			 [Define if struct statfs has the f_fstypename member.])
      fi
    ]
--- 26,31 ----
  
      if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
!       AC_DEFINE(HAVE_F_FSTYPENAME_IN_STATFS, 1,
! 		[Define if struct statfs has the f_fstypename member.])
      fi
    ]

Index: fsusage.m4
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/lib/fsusage.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** fsusage.m4	18 Mar 2003 07:47:37 -0000	1.1
--- fsusage.m4	18 Feb 2004 14:56:39 -0000	1.2
***************
*** 1,3 ****
! #serial 7
  
  # From fileutils/configure.in
--- 1,3 ----
! #serial 9
  
  # From fileutils/configure.in
***************
*** 9,13 ****
  # jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
  
! AC_DEFUN(jm_FILE_SYSTEM_USAGE,
  [
  
--- 9,13 ----
  # jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
  
! AC_DEFUN([jm_FILE_SYSTEM_USAGE],
  [
  
***************
*** 25,28 ****
--- 25,33 ----
    AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
  		 [AC_TRY_LINK([#include <sys/types.h>
+ #ifdef __GLIBC__
+ Do not use statvfs on systems with GNU libc, because that function stats
+ all preceding entries in /proc/mounts, and that makes df hang if even
+ one of the corresponding file systems is hard-mounted, but not available.
+ #endif
  #include <sys/statvfs.h>],
  			      [struct statvfs fsd; statvfs (0, &fsd);],
***************
*** 31,35 ****
    if test $fu_cv_sys_stat_statvfs = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE_UNQUOTED(STAT_STATVFS, 1,
  	      [  Define if there is a function named statvfs.  (SVR4)])
    fi
--- 36,40 ----
    if test $fu_cv_sys_stat_statvfs = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE(STAT_STATVFS, 1,
  	      [  Define if there is a function named statvfs.  (SVR4)])
    fi
***************
*** 56,60 ****
    if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE_UNQUOTED(STAT_STATFS3_OSF1, 1,
  	      [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
    fi
--- 61,65 ----
    if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE(STAT_STATFS3_OSF1, 1,
  	      [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
    fi
***************
*** 88,92 ****
    if test $fu_cv_sys_stat_statfs2_bsize = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE_UNQUOTED(STAT_STATFS2_BSIZE, 1,
  [  Define if statfs takes 2 args and struct statfs has a field named f_bsize.
     (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
--- 93,97 ----
    if test $fu_cv_sys_stat_statfs2_bsize = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE(STAT_STATFS2_BSIZE, 1,
  [  Define if statfs takes 2 args and struct statfs has a field named f_bsize.
     (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
***************
*** 111,115 ****
    if test $fu_cv_sys_stat_statfs4 = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE_UNQUOTED(STAT_STATFS4, 1,
  	      [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
    fi
--- 116,120 ----
    if test $fu_cv_sys_stat_statfs4 = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE(STAT_STATFS4, 1,
  	      [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
    fi
***************
*** 140,144 ****
    if test $fu_cv_sys_stat_statfs2_fsize = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE_UNQUOTED(STAT_STATFS2_FSIZE, 1,
  [  Define if statfs takes 2 args and struct statfs has a field named f_fsize.
     (4.4BSD, NetBSD)])
--- 145,149 ----
    if test $fu_cv_sys_stat_statfs2_fsize = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE(STAT_STATFS2_FSIZE, 1,
  [  Define if statfs takes 2 args and struct statfs has a field named f_fsize.
     (4.4BSD, NetBSD)])
***************
*** 173,177 ****
    if test $fu_cv_sys_stat_fs_data = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE_UNQUOTED(STAT_STATFS2_FS_DATA, 1,
  [  Define if statfs takes 2 args and the second argument has
     type struct fs_data.  (Ultrix)])
--- 178,182 ----
    if test $fu_cv_sys_stat_fs_data = yes; then
      ac_fsusage_space=yes
!     AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
  [  Define if statfs takes 2 args and the second argument has
     type struct fs_data.  (Ultrix)])
***************
*** 183,187 ****
    AC_TRY_CPP([#include <sys/filsys.h>
      ],
!     AC_DEFINE_UNQUOTED(STAT_READ_FILSYS, 1,
        [Define if there is no specific function for reading filesystems usage
         information and you have the <sys/filsys.h> header file.  (SVR2)])
--- 188,192 ----
    AC_TRY_CPP([#include <sys/filsys.h>
      ],
!     AC_DEFINE(STAT_READ_FILSYS, 1,
        [Define if there is no specific function for reading filesystems usage
         information and you have the <sys/filsys.h> header file.  (SVR2)])