vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
bitmap-optimize
Theodore Ts'o 2000-02-11 05:04:44 +00:00
parent e1a0a3e304
commit 8f3f29d383
4 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2000-02-11 Theodore Ts'o <tytso@valinux.com>
* 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.
2000-02-08 Theodore Ts'o <tytso@valinux.com>
* configure.in, aclocal.m4: Add support for GNU gettext

41
configure vendored
View File

@ -4502,39 +4502,14 @@ if test $ac_cv_have_optreset = yes; then
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 @@ if test "$root_prefix" = NONE ; then
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

18
configure.in
View File

@ -462,19 +462,13 @@ if test $ac_cv_have_optreset = yes; then
AC_DEFINE(HAVE_OPTRESET)
fi
dnl
dnl See if using the EXT2 ioctls causes a compile-time barf (as on the Hurd).
dnl We use the EXT2 ioctls only under Linux
dnl
AC_MSG_CHECKING(whether the ext2 ioctls compile)
AC_CACHE_VAL(e2fsprogs_cv_ioctl_ext2,
AC_TRY_COMPILE([#include <linux/ext2_fs.h>
#include <sys/ioctl.h>],
[ioctl (0, EXT2_IOC_SETVERSION, 0);],
[e2fsprogs_cv_ioctl_ext2=yes],
[e2fsprogs_cv_ioctl_ext2=no]))
AC_MSG_RESULT($e2fsprogs_cv_ioctl_ext2)
if test "$e2fsprogs_cv_ioctl_ext2" = yes; then
AC_DEFINE(HAVE_EXT2_IOCTLS)
fi
case "$host_os" in
linux*)
AC_DEFINE(HAVE_EXT2_IOCTLS)
;;
esac
dnl
dnl Linux and Hurd places root files in the / by default
dnl

2
include/nonunix/asm/types.h
View File

@ -1 +1 @@
#include "../linux/types.h"
#include "../linux/types.h"