korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-23 18:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ChangeLog, configure, MCONFIG.in, configure.in:

Browse Source 
MCONFIG.in: Always include src/include in the include path now.  This
  	forces us to use our internally provided ext2_fs.h file, for sanity's
  	sake.
  configure.in: If linux/fs.h isn't found, then add build/include into
  	the include path only, since src/include is now always included.
  	Removed define of HAVE_LINUX_FS_H, since we're not using it any more.
  	Removed i_version vs. i_generation check, since with the included
  	header file it is a permanently known quantity.  Removed AC_C_CROSS
  	since it has been merged into AC_PROG_CC in autoconf 2.13.
This commit is contained in:
Theodore Ts'o 2000-02-02 16:13:14 +00:00
parent 41a817eb13
commit 73ae2d4a23
4 changed files with 323 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2000-02-02 Theodore Ts'o <tytso@valinux.com>
* MCONFIG.in: Always include src/include in the include path now.
This forces us to use our internally provided ext2_fs.h
file, for sanity's sake.
* configure.in: If linux/fs.h isn't found, then add
build/include into the include path only, since
src/include is now always included. Removed define of
HAVE_LINUX_FS_H, since we're not using it any more.
Removed i_version vs. i_generation check, since with the
included header file it is a permanently known quantity.
Removed AC_C_CROSS since it has been merged into
AC_PROG_CC in autoconf 2.13.
2000-01-18 Theodore Ts'o <tytso@valinux.com>
* MCONFIG.in (DEPLIBUUID): Since LIBUUID can sometimes include

3
MCONFIG.in
View File

@ -30,7 +30,8 @@ BUILD_CC = @BUILD_CC@
DEFS = @DEFS@
CFLAGS = @CFLAGS@
ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
-I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE)
-I$(top_builddir)/lib -I$(top_srcdir)/lib \
-I$(top_srcdir)/include $(LINUX_INCLUDE)
LDFLAGS = @LDFLAGS@
ALL_LDFLAGS = $(LDFLAGS)
RM = @RM@

646
configure vendored
View File

File diff suppressed because it is too large Load Diff

24
configure.in
View File

@ -55,6 +55,7 @@ if test -z "$CC" ; then CC=cc; fi
[AC_MSG_RESULT(CC defaults to $CC)])dnl
export CC
AC_SUBST([CC])
AC_PROG_CC
dnl
dnl set $(LD) from --with-linker=value
dnl
@ -82,12 +83,8 @@ dnl that holds enough to fake it (hopefully). Note that the $(top_srcdir) here
dnl is quoted so that it gets expanded by make, not by configure.
dnl
AC_CHECK_HEADER(linux/fs.h, [linux_headers=yes], [linux_headers=no])
if test "$linux_headers" = yes; then
AC_DEFINE(HAVE_LINUX_FS_H)
else
LINUX_INCLUDE='-I$(top_srcdir)/include -I$(top_builddir)/include'
# Use this include directory with test compiles in the configure script too.
CPPFLAGS="$CPPFLAGS -I$srcdir/include -I./include"
if test "$linux_headers" != yes; then
LINUX_INCLUDE='-I$(top_builddir)/include'
fi
AC_SUBST(LINUX_INCLUDE)
dnl
@ -330,9 +327,7 @@ AC_PATH_PROG(PERL, perl, perl)
AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :)
AC_PROG_CC
AC_PROG_INSTALL
AC_C_CROSS
# See if we need a separate native compiler.
if test $cross_compiling = no; then
BUILD_CC="$CC"
@ -469,19 +464,6 @@ if test "$e2fsprogs_cv_ioctl_ext2" = yes; then
AC_DEFINE(HAVE_EXT2_IOCTLS)
fi
dnl
dnl Check if ext2_inode has i_version (changed to i_generation in Linux 2.3)
dnl
AC_MSG_CHECKING(whether struct ext2_inode has an i_version field)
AC_CACHE_VAL(e2fsprogs_cv_ext2_inode_version,
AC_TRY_COMPILE([#include <linux/ext2_fs.h>],
[struct ext2_inode e2i; e2i.i_version=0;],
[e2fsprogs_cv_ext2_inode_version=yes],
[e2fsprogs_cv_ext2_inode_version=no]))
AC_MSG_RESULT($e2fsprogs_cv_ext2_inode_version)
if test "$e2fsprogs_cv_ext2_inode_version" = yes; then
AC_DEFINE(HAVE_EXT2_INODE_VERSION)
fi
dnl
dnl Linux and Hurd places root files in the / by default
dnl
case "$host_os" in