ChangeLog, configure, configure.in:
configure.in: Define HAVE_EXT2_IOCTLS based solely on the OS type,
instead of basising on whether a test program compiles. This was
screwing up on some Linux kernel header files, and we know the Hurd
doesn't support the ext2 ioctls anyway.
types.h:
Add newline at end of file.
diff --git a/configure b/configure
index f9eab55..b91a71b 100644
--- a/configure
+++ b/configure
@@ -4502,39 +4502,14 @@
EOF
fi
-echo $ac_n "checking whether the ext2 ioctls compile""... $ac_c" 1>&6
-echo "configure:4507: checking whether the ext2 ioctls compile" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_ioctl_ext2'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 4512 "configure"
-#include "confdefs.h"
-#include <linux/ext2_fs.h>
-#include <sys/ioctl.h>
-int main() {
-ioctl (0, EXT2_IOC_SETVERSION, 0);
-; return 0; }
-EOF
-if { (eval echo configure:4520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- e2fsprogs_cv_ioctl_ext2=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_ioctl_ext2=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$e2fsprogs_cv_ioctl_ext2" 1>&6
-if test "$e2fsprogs_cv_ioctl_ext2" = yes; then
- cat >> confdefs.h <<\EOF
+case "$host_os" in
+linux*)
+ cat >> confdefs.h <<\EOF
#define HAVE_EXT2_IOCTLS 1
EOF
-fi
+ ;;
+esac
case "$host_os" in
linux* | gnu*)
if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
@@ -4560,20 +4535,20 @@
fi
echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6
-echo "configure:4564: checking whether linker accepts -static" >&5
+echo "configure:4539: checking whether linker accepts -static" >&5
if eval "test \"`echo '$''{'ac_cv_e2fsprogs_use_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
cat > conftest.$ac_ext <<EOF
-#line 4570 "configure"
+#line 4545 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
fflush(stdout);
; return 0; }
EOF
-if { (eval echo configure:4577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_e2fsprogs_use_static=yes
else