mirror of https://github.com/vitalif/e2fsprogs
Makefile.in, configure.in, ChangeLog, configure:
Makefile.in: Move the generated types.h file from the linux/ directory to the asm/ directory. configure.in: Force Solaris to never use -static, due to its dynamic loader not being available to statically linked programs. Create the asm/ directory if needed. .del-types.h.in~ca55114a, .del-ext2_fs.h~7a460879, .del-types.h.in~7a460879: Move the types.h header file from linux/ to asm/.bitmap-optimize
parent
73f17cfc39
commit
defde7840c
|
@ -1,3 +1,12 @@
|
||||||
|
Mon Jan 4 02:36:23 1999 Theodore Y. Ts'o <tytso@mit.edu>
|
||||||
|
|
||||||
|
* Makefile.in: Move the generated types.h file from the linux/
|
||||||
|
directory to the asm/ directory.
|
||||||
|
|
||||||
|
* configure.in: Force Solaris to never use -static, due to its
|
||||||
|
dynamic loader not being available to statically linked
|
||||||
|
programs. Create the asm/ directory if needed.
|
||||||
|
|
||||||
1999-01-01 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
1999-01-01 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
||||||
|
|
||||||
* INSTALL.elfbin (NOTE): Add a warning that the ELF binaries
|
* INSTALL.elfbin (NOTE): Add a warning that the ELF binaries
|
||||||
|
|
10
Makefile.in
10
Makefile.in
|
@ -11,7 +11,7 @@ LIB_SUBDIRS=lib/et lib/ss lib/ext2fs lib/e2p lib/uuid
|
||||||
PROG_SUBDIRS=e2fsck debugfs misc resize tests/progs
|
PROG_SUBDIRS=e2fsck debugfs misc resize tests/progs
|
||||||
SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
|
SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
|
||||||
|
|
||||||
SUBS= include/linux/types.h
|
SUBS= include/asm/types.h
|
||||||
|
|
||||||
TAR=tar
|
TAR=tar
|
||||||
|
|
||||||
|
@ -76,15 +76,15 @@ distclean: distclean-recursive distclean-local
|
||||||
|
|
||||||
realclean: realclean-recursive realclean-local
|
realclean: realclean-recursive realclean-local
|
||||||
|
|
||||||
include/linux/types.h: $(DEP_SUBSTITUTE) $(srcdir)/include/linux/types.h.in
|
include/asm/types.h: $(DEP_SUBSTITUTE) $(srcdir)/include/asm/types.h.in
|
||||||
$(SUBSTITUTE) $(srcdir)/include/linux/types.h.in \
|
$(SUBSTITUTE) $(srcdir)/include/asm/types.h.in \
|
||||||
> include/linux/types.h
|
> include/asm/types.h
|
||||||
|
|
||||||
mostlyclean-local:
|
mostlyclean-local:
|
||||||
$(RM) -f \#* *~ core MAKELOG
|
$(RM) -f \#* *~ core MAKELOG
|
||||||
clean-local: mostlyclean-local
|
clean-local: mostlyclean-local
|
||||||
distclean-local: clean-local
|
distclean-local: clean-local
|
||||||
$(RM) -f include/linux/types.h $(SUBSTITUTE)
|
$(RM) -f include/asm/types.h $(SUBSTITUTE)
|
||||||
$(RM) -f config.status config.log config.cache MCONFIG Makefile
|
$(RM) -f config.status config.log config.cache MCONFIG Makefile
|
||||||
realclean-local: distclean-local
|
realclean-local: distclean-local
|
||||||
$(RM) -f configure
|
$(RM) -f configure
|
||||||
|
|
|
@ -2378,6 +2378,11 @@ rm -f conftest*
|
||||||
LDFLAGS=$SAVE_LDFLAGS
|
LDFLAGS=$SAVE_LDFLAGS
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case "$host_os" in
|
||||||
|
solaris2.*)
|
||||||
|
ac_cv_e2fsprogs_use_static=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
echo "$ac_t""$ac_cv_e2fsprogs_use_static" 1>&6
|
echo "$ac_t""$ac_cv_e2fsprogs_use_static" 1>&6
|
||||||
LDFLAG_STATIC=
|
LDFLAG_STATIC=
|
||||||
if test $ac_cv_e2fsprogs_use_static = yes; then
|
if test $ac_cv_e2fsprogs_use_static = yes; then
|
||||||
|
@ -2399,6 +2404,7 @@ DO_SUBSTITUTE_SCRIPT=$srcdir/lib/do_substitute
|
||||||
test -d lib || mkdir lib
|
test -d lib || mkdir lib
|
||||||
test -d include || mkdir include
|
test -d include || mkdir include
|
||||||
test -d include/linux || mkdir include/linux
|
test -d include/linux || mkdir include/linux
|
||||||
|
test -d include/asm || mkdir include/asm
|
||||||
rmakefile=
|
rmakefile=
|
||||||
if test -d ${srcdir}/resize ; then
|
if test -d ${srcdir}/resize ; then
|
||||||
rmakefile=resize/Makefile
|
rmakefile=resize/Makefile
|
||||||
|
|
13
configure.in
13
configure.in
|
@ -488,6 +488,18 @@ AC_CACHE_VAL(ac_cv_e2fsprogs_use_static,
|
||||||
AC_TRY_LINK([#include <stdio.h>],[fflush(stdout);],
|
AC_TRY_LINK([#include <stdio.h>],[fflush(stdout);],
|
||||||
ac_cv_e2fsprogs_use_static=yes, ac_cv_e2fsprogs_use_static=no)
|
ac_cv_e2fsprogs_use_static=yes, ac_cv_e2fsprogs_use_static=no)
|
||||||
LDFLAGS=$SAVE_LDFLAGS])
|
LDFLAGS=$SAVE_LDFLAGS])
|
||||||
|
dnl
|
||||||
|
dnl Regardless of how the test turns out, Solaris doesn't handle -static
|
||||||
|
dnl This is caused by the socket library requiring the nsl library, which
|
||||||
|
dnl requires the -dl library, which only works for dynamically linked
|
||||||
|
dnl programs. It basically means you can't have statically linked programs
|
||||||
|
dnl which use the network under Solaris.
|
||||||
|
dnl
|
||||||
|
case "$host_os" in
|
||||||
|
solaris2.*)
|
||||||
|
ac_cv_e2fsprogs_use_static=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
AC_MSG_RESULT($ac_cv_e2fsprogs_use_static)
|
AC_MSG_RESULT($ac_cv_e2fsprogs_use_static)
|
||||||
LDFLAG_STATIC=
|
LDFLAG_STATIC=
|
||||||
if test $ac_cv_e2fsprogs_use_static = yes; then
|
if test $ac_cv_e2fsprogs_use_static = yes; then
|
||||||
|
@ -522,6 +534,7 @@ dnl
|
||||||
test -d lib || mkdir lib
|
test -d lib || mkdir lib
|
||||||
test -d include || mkdir include
|
test -d include || mkdir include
|
||||||
test -d include/linux || mkdir include/linux
|
test -d include/linux || mkdir include/linux
|
||||||
|
test -d include/asm || mkdir include/asm
|
||||||
rmakefile=
|
rmakefile=
|
||||||
if test -d ${srcdir}/resize ; then
|
if test -d ${srcdir}/resize ; then
|
||||||
rmakefile=resize/Makefile
|
rmakefile=resize/Makefile
|
||||||
|
|
|
@ -11,7 +11,11 @@ typedef unsigned int __u64;
|
||||||
typedef long __s64;
|
typedef long __s64;
|
||||||
typedef unsigned long __u64;
|
typedef unsigned long __u64;
|
||||||
#elif (@SIZEOF_LONG_LONG@ == 8)
|
#elif (@SIZEOF_LONG_LONG@ == 8)
|
||||||
|
#if defined(__GNUC__)
|
||||||
typedef __signed__ long long __s64;
|
typedef __signed__ long long __s64;
|
||||||
|
#else
|
||||||
|
typedef signed long long __s64;
|
||||||
|
#endif
|
||||||
typedef unsigned long long __u64;
|
typedef unsigned long long __u64;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#ifndef _LINUX_EXT2_FS_H
|
#ifndef _LINUX_EXT2_FS_H
|
||||||
#define _LINUX_EXT2_FS_H
|
#define _LINUX_EXT2_FS_H
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <asm/types.h> /* Changed from linux/types.h */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The second extended filesystem constants/structures
|
* The second extended filesystem constants/structures
|
||||||
|
|
Loading…
Reference in New Issue