[pkgsrc/trunk]: pkgsrc/sysutils/fam The configure script defines HAVE_STATVFS...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2cb8a195988
branches:  trunk
changeset: 471205:e2cb8a195988
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Mar 21 07:35:17 2004 +0000

description:
The configure script defines HAVE_STATVFS as 0 on non-IRIX platforms,
regardless of the result of sys/statvfs.h availability test.  It
results in two definitions of HAVE_STATVFS in confdefs.h.  Check the
availability of sys/statvfs.h only on IRIX platforms to ensure that
HAVE_STATVFS is defined at most once.

diffstat:

 sysutils/fam/distinfo         |    4 +-
 sysutils/fam/patches/patch-ax |  399 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 399 insertions(+), 4 deletions(-)

diffs (truncated from 423 to 300 lines):

diff -r 36cbf1309ae1 -r e2cb8a195988 sysutils/fam/distinfo
--- a/sysutils/fam/distinfo     Sun Mar 21 07:06:58 2004 +0000
+++ b/sysutils/fam/distinfo     Sun Mar 21 07:35:17 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/02/09 18:14:45 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/03/21 07:35:17 minskim Exp $
 
 SHA1 (fam-2.6.10.tar.gz) = 24899a1afe6a520c6980f1c41d5657db01d11692
 Size (fam-2.6.10.tar.gz) = 321189 bytes
@@ -16,4 +16,4 @@
 SHA1 (patch-au) = 5e87df2bb202b6a45f588474a4df1e7ecc575288
 SHA1 (patch-av) = 8da3b718921df0f4a1e9a8924c6914d1bdc03bab
 SHA1 (patch-aw) = e94071bbefa01c54232915a0fbe211984e59943b
-SHA1 (patch-ax) = a055c366d7be91c4c5b96c3877de1a42947b9372
+SHA1 (patch-ax) = 40890a24d0c767324b1432fb0a0585f3084e6d17
diff -r 36cbf1309ae1 -r e2cb8a195988 sysutils/fam/patches/patch-ax
--- a/sysutils/fam/patches/patch-ax     Sun Mar 21 07:06:58 2004 +0000
+++ b/sysutils/fam/patches/patch-ax     Sun Mar 21 07:35:17 2004 +0000
@@ -1,7 +1,402 @@
-$NetBSD: patch-ax,v 1.3 2004/02/09 18:14:45 jmmv Exp $
+$NetBSD: patch-ax,v 1.4 2004/03/21 07:35:17 minskim Exp $
 
---- configure.orig     2003-04-15 08:17:16.000000000 +0200
+--- configure.orig     2003-04-15 01:17:16.000000000 -0500
 +++ configure
+@@ -8899,18 +8899,18 @@ fi
+ 
+ echo "Using imon support module $IMON_FUNCS"
+ 
+-if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
+-echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
++if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
++echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/statvfs.h usability" >&5
+-echo $ECHO_N "checking sys/statvfs.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking sys/syssgi.h usability" >&5
++echo $ECHO_N "checking sys/syssgi.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -8919,7 +8919,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <sys/statvfs.h>
++#include <sys/syssgi.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -8945,8 +8945,8 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking sys/statvfs.h presence" >&5
+-echo $ECHO_N "checking sys/statvfs.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking sys/syssgi.h presence" >&5
++echo $ECHO_N "checking sys/syssgi.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -8954,7 +8954,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <sys/statvfs.h>
++#include <sys/syssgi.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -8987,10 +8987,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -9001,12 +9001,12 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+   no:yes )
+-    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sys/statvfs.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/syssgi.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -9017,42 +9017,42 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
+-echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
++echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
++echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_sys_statvfs_h=$ac_header_preproc
++  ac_cv_header_sys_syssgi_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
+ 
+ fi
+-if test $ac_cv_header_sys_statvfs_h = yes; then
++if test $ac_cv_header_sys_syssgi_h = yes; then
+   cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STATVFS 1
++#define HAVE_SYSSGI 1
+ _ACEOF
+- have_statvfs="yes"
++
+ else
+   cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STATVFS 0
++#define HAVE_SYSSGI 0
+ _ACEOF
+- have_statvfs="no"
++
+ fi
+ 
+ 
+-if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
+-echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
++if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
++echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/syssgi.h usability" >&5
+-echo $ECHO_N "checking sys/syssgi.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking sys/fs/nfs_clnt.h usability" >&5
++echo $ECHO_N "checking sys/fs/nfs_clnt.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -9061,7 +9061,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <sys/syssgi.h>
++#include <sys/fs/nfs_clnt.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -9087,8 +9087,8 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking sys/syssgi.h presence" >&5
+-echo $ECHO_N "checking sys/syssgi.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking sys/fs/nfs_clnt.h presence" >&5
++echo $ECHO_N "checking sys/fs/nfs_clnt.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -9096,7 +9096,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <sys/syssgi.h>
++#include <sys/fs/nfs_clnt.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -9129,10 +9129,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sys/syssgi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/fs/nfs_clnt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -9143,12 +9143,12 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+   no:yes )
+-    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sys/syssgi.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sys/syssgi.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/syssgi.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/fs/nfs_clnt.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/fs/nfs_clnt.h: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/fs/nfs_clnt.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -9159,42 +9159,50 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for sys/syssgi.h" >&5
+-echo $ECHO_N "checking for sys/syssgi.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_syssgi_h+set}" = set; then
++echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
++echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_sys_syssgi_h=$ac_header_preproc
++  ac_cv_header_sys_fs_nfs_clnt_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_syssgi_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_syssgi_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
+ 
+ fi
+-if test $ac_cv_header_sys_syssgi_h = yes; then
++if test $ac_cv_header_sys_fs_nfs_clnt_h = yes; then
+   cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYSSGI 1
++#define HAVE_SYS_FS_NFS_CLNT_H 1
+ _ACEOF
+ 
+ else
+   cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYSSGI 0
++#define HAVE_SYS_FS_NFS_CLNT_H 0
+ _ACEOF
+ 
+ fi
+ 
+ 
+-if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/fs/nfs_clnt.h" >&5
+-echo $ECHO_N "checking for sys/fs/nfs_clnt.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_fs_nfs_clnt_h+set}" = set; then
++
++if test `uname` != 'IRIX' && test `uname` != 'IRIX64'; then
++    cat >>confdefs.h <<\_ACEOF
++#define HAVE_STATVFS 0
++_ACEOF
++
++    have_statvfs="no"
++else
++    if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
++echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_fs_nfs_clnt_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_fs_nfs_clnt_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
+ else