Be more strict when checking presence of fadvise, fix build for old glibc versions.

diff --git a/VERSION b/VERSION
index 714a5aabcb401e6add98cdb0849c48ebc1af6f6e..c99eb5a3ad2dce0cfe96c6db6d80e495fa7e798b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=6
-PKG_REVISION=24
+PKG_REVISION=25
 PKG_BUILD=1

diff --git a/aclocal.m4 b/aclocal.m4
index f96624c6db78f15b0508382fa593ec6036010e69..ed611d78c8265498604a2783ed57e61fcb422106 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -242,7 +242,7 @@ AC_DEFUN([AC_HAVE_FADVISE],
 #define _FILE_OFFSET_BITS 64
 #include <fcntl.h>
     ], [
-       posix_fadvise(0, 1, 0, 0);
+       posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL);
     ], have_fadvise=yes
        AC_MSG_RESULT(yes),
        AC_MSG_RESULT(no))

diff --git a/debian/changelog b/debian/changelog
index 741c7d00ab34130d6508c6bc1ad88e7f995135d9..a53e1d631c2a5bbb72d6bda182f57989615dff17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xfsprogs (2.6.24-1) unstable; urgency=low
+xfsprogs (2.6.25-1) unstable; urgency=low
 
   * New upstream release
 
- -- Nathan Scott <nathans@debian.org>  Wed, 29 Sep 2004 11:28:20 +1000
+ -- Nathan Scott <nathans@debian.org>  Fri, 08 Oct 2004 08:55:03 +1000
 
 xfsprogs (2.6.23-1) unstable; urgency=low
 

diff --git a/doc/CHANGES b/doc/CHANGES
index 0cc43a53967fdd66e0b2f72ed380d6f830d693f0..41ea9fefb3556f97e2d6e3b71d959cd62bc68803 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+xfsprogs-2.6.25 (08 October 2004)
+       - Fix build with really old glibc versions.
+
 xfsprogs-2.6.24 (29 September 2004)
        - Allow 'e' suffix in size arguments to mkfs.
        - Update mkfs man page description of maximum allocation

diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index d612da2721ba83a2731df455301a36d6c6324754..a66ae4791b97cee9cfdb7b38028cc32b8b9cbbf7 100644 (file)
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -8,7 +8,7 @@ AC_DEFUN([AC_HAVE_FADVISE],
 #define _FILE_OFFSET_BITS 64
 #include <fcntl.h>
     ], [
-       posix_fadvise(0, 1, 0, 0);
+       posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL);
     ], have_fadvise=yes
        AC_MSG_RESULT(yes),
        AC_MSG_RESULT(no))