[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files Also check for presence of ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71f4e60b1392
branches:  trunk
changeset: 460896:71f4e60b1392
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 06 12:45:47 2003 +0000

description:
Also check for presence of <sys/statfs.h>, and pretend we don't have it if
we use libnbcompat's statfs.

diffstat:

 pkgtools/libnbcompat/files/configure              |  6 ++++--
 pkgtools/libnbcompat/files/configure.ac           |  5 +++--
 pkgtools/libnbcompat/files/nbcompat.h             |  7 +++++--
 pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in |  3 +++
 4 files changed, 15 insertions(+), 6 deletions(-)

diffs (79 lines):

diff -r 26b1f6de22f2 -r 71f4e60b1392 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure      Sat Sep 06 12:22:26 2003 +0000
+++ b/pkgtools/libnbcompat/files/configure      Sat Sep 06 12:45:47 2003 +0000
@@ -3167,6 +3167,7 @@
 
 
 
+
 for ac_header in arpa/nameser.h assert.h bind/bitypes.h dirent.h err.h \
        errno.h fcntl.h fts.h glob.h inttypes.h libutil.h limits.h \
        machine/endian.h memory.h ndir.h netdb.h netinet/in6_machtypes.h \
@@ -3174,8 +3175,9 @@
        string.h sys/bitypes.h sys/byteorder.h sys/cdefs.h sys/dir.h \
        sys/endian.h sys/file.h sys/mkdev.h sys/mount.h sys/ndir.h \
        sys/param.h sys/poll.h sys/queue.h sys/time.h sys/ttycom.h \
-       sys/stat.h sys/statvfs.h sys/vfs.h sys/types.h sys/vfs.h termcap.h \
-       termios.h time.h tzfile.h unistd.h util.h utmp.h
+       sys/stat.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/types.h \
+       sys/vfs.h termcap.h termios.h time.h tzfile.h unistd.h util.h \
+       utmp.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff -r 26b1f6de22f2 -r 71f4e60b1392 pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac   Sat Sep 06 12:22:26 2003 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac   Sat Sep 06 12:45:47 2003 +0000
@@ -37,8 +37,9 @@
        string.h sys/bitypes.h sys/byteorder.h sys/cdefs.h sys/dir.h \
        sys/endian.h sys/file.h sys/mkdev.h sys/mount.h sys/ndir.h \
        sys/param.h sys/poll.h sys/queue.h sys/time.h sys/ttycom.h \
-       sys/stat.h sys/statvfs.h sys/vfs.h sys/types.h sys/vfs.h termcap.h \
-       termios.h time.h tzfile.h unistd.h util.h utmp.h])
+       sys/stat.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/types.h \
+       sys/vfs.h termcap.h termios.h time.h tzfile.h unistd.h util.h \
+       utmp.h])
 
 AC_CHECK_HEADERS([md5.h rmd160.h sha1.h])
 
diff -r 26b1f6de22f2 -r 71f4e60b1392 pkgtools/libnbcompat/files/nbcompat.h
--- a/pkgtools/libnbcompat/files/nbcompat.h     Sat Sep 06 12:22:26 2003 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat.h     Sat Sep 06 12:45:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nbcompat.h,v 1.17 2003/09/06 06:13:48 jlam Exp $       */
+/*     $NetBSD: nbcompat.h,v 1.18 2003/09/06 12:45:48 jlam Exp $       */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -339,7 +339,7 @@
 #endif
 
 #if HAVE_NBCOMPAT_VIS
-# ifdef HAVE_VIS_H
+# if HAVE_VIS_H
 #  undef HAVE_VIS_H
 # endif
 #endif
@@ -508,6 +508,9 @@
 #endif
 
 #if HAVE_NBCOMPAT_STATFS
+# if HAVE_SYS_STATFS_H
+#  undef HAVE_SYS_STATFS_H
+# endif
 # include <nbcompat/statfs.h>
 #endif
 
diff -r 26b1f6de22f2 -r 71f4e60b1392 pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in
--- a/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in Sat Sep 06 12:22:26 2003 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in Sat Sep 06 12:45:47 2003 +0000
@@ -333,6 +333,9 @@
 /* Define to 1 if you have the <sys/queue.h> header file. */
 #undef HAVE_SYS_QUEUE_H
 
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+#undef HAVE_SYS_STATFS_H
+
 /* Define to 1 if you have the <sys/statvfs.h> header file. */
 #undef HAVE_SYS_STATVFS_H