diff options
| -rw-r--r-- | ChangeLog | 30 | ||||
| -rw-r--r-- | MCONFIG.in | 35 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | RELEASE-NOTES | 8 | ||||
| -rw-r--r-- | configure | 201 | ||||
| -rw-r--r-- | configure.in | 37 | ||||
| -rw-r--r-- | e2fsprogs-1.12.spec | 10 | ||||
| -rw-r--r-- | tests/progs/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/progs/Makefile.in | 2 | ||||
| -rw-r--r-- | version.h | 3 |
10 files changed, 206 insertions, 135 deletions
@@ -1,3 +1,33 @@ +1998-03-30 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Change how the installation directions are + selected. Previously, we had prefix and usr_prefix, where + prefix was '' and usr_prefix was /usr, and we then defined + bindir, ubindir, libdir, ulibdir, etc. in terms of that. + In autoconf 2.12, it's possible to override bindir, + libdir, etc., and so in order to make our installation + directory makefile variables more in line with autoconf + 2.12, I've changed all of the various makefiles to use + prefix and root_prefix, where the default Linux + definitions are /usr and '', respectively. What used to + be bindir is now root_bindir, and what used to be ubindir, + is now bindir. + + * MCONFIG.in: Change directories to match with new installation + directory convention (see above). Add Makefile + dependencies for makefile fragments, and define + DEP_LIB_MAKEFILES which library makefiles can use to + define DEP_MAKEFILES, so that the library makefiles will + get regenerated when the makefile fragments change. + Remove the cat?dir variables, since we aren't creating + those directories any more. + + * Makefile.in: Add top-level uninstall targets. + + * e2fsprogs-1.12.spec: Add to the RPM package the e2label man + page, and to reflect that fact that we now compile_et and + mk_cmds for the development package. + 1998-03-28 Theodore Ts'o <tytso@rsts-11.mit.edu> * Makefile.in: Use && after a cd command so that the right thing @@ -3,22 +3,21 @@ SHELL = /bin/sh prefix = @prefix@ +root_prefix = @root_prefix@ exec_prefix = @exec_prefix@ -usr_prefix = @usr_prefix@ -bindir = $(exec_prefix)/bin -ubindir = $(usr_prefix)/bin -sbindir = $(exec_prefix)/sbin -usbindir = $(usr_prefix)/sbin -libdir = $(exec_prefix)/lib -ulibdir = $(usr_prefix)/lib -includedir = $(usr_prefix)/include -mandir = $(usr_prefix)/man -man1dir = $(usr_prefix)/man/man1 -man8dir = $(usr_prefix)/man/man8 -cat1dir = $(usr_prefix)/man/cat1 -cat8dir = $(usr_prefix)/man/cat8 -infodir = $(usr_prefix)/info -sharedir = $(usr_prefix)/share +root_bindir = $(root_prefix)/bin +root_sbindir = $(root_prefix)/sbin +root_libdir = $(root_prefix)/lib +bindir = @bindir@ +sbindir = @sbindir@ +libdir = @libdir@ +includedir = @includedir@ +mandir = @mandir@ +man1dir = $(prefix)/man/man1 +man3dir = $(prefix)/man/man3 +man8dir = $(prefix)/man/man8 +infodir = @infodir@ +datadir = @datadir@ @SET_MAKE@ @@ -124,6 +123,10 @@ all:: # Autoconf magic... # +DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.elf-lib \ + $(top_srcdir)/lib/Makefile.dll-lib $(top_srcdir)/lib/Makefile.bsd-lib \ + $(top_srcdir)/lib/Makefile.checker $(top_srcdir)/lib/Makefile.profile + $(top_builddir)/config.status: $(top_srcdir)/configure (cd $(top_builddir); ./config.status --recheck) @@ -139,7 +142,7 @@ $(top_builddir)/util/subst.conf: $(top_srcdir)/util/subst.conf.in \ (cd $(top_builddir); CONFIG_FILES=util/subst.conf ./config.status) Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \ - $(top_builddir)/config.status + $(DEP_MAKEFILE) $(top_builddir)/config.status (cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status) $(top_srcdir)/configure: $(top_srcdir)/configure.in diff --git a/Makefile.in b/Makefile.in index f235517e..cbb17bb8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,12 +26,19 @@ docs: install-doc-libs: (cd doc && make install-doc-libs) +uninstall-doc-libs: + (cd doc && make uninstall-doc-libs) + install: all-libs-recursive install-progs-recursive \ install-shlibs-libs-recursive install-doc-libs # (export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages) +uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs + install-libs: install-libs-recursive +uninstall-libs: uninstall-libs-recursive + TAGS clean-recursive distclean-recursive \ mostlyclean-recursive realclean-recursive install-recursive: for subdir in $(SUBDIRS); do \ @@ -42,7 +49,7 @@ TAGS clean-recursive distclean-recursive \ fi ; \ done -all-progs-recursive install-progs-recursive: +all-progs-recursive install-progs-recursive uninstall-progs-recursive: for subdir in $(PROG_SUBDIRS); do \ if test -d $$subdir ; then \ target=`echo $@|$(SED) 's/-progs-recursive//'`; \ @@ -51,7 +58,7 @@ all-progs-recursive install-progs-recursive: fi ; \ done -all-libs-recursive install-libs-recursive install-shlibs-libs-recursive: +all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-libs-recursive uninstall-shlibs-libs-recursive: for subdir in $(LIB_SUBDIRS); do \ if test -d $$subdir ; then \ target=`echo $@|$(SED) 's/-libs-recursive//'`; \ diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 4cfa621f..03c60eb1 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -22,9 +22,15 @@ Added support for the EXT2_FEATURE_COMPAT_DIR_PREALLOC feature. Added new program "e2label", contributed by Andries Brouwer. E2label provides an easy-to-use interface to modify the filesystem label. +Fixed bug so that lsattr -v works instead of producing a core dump. + Fixed a minor bug in mke2fs so that all groups with bad superblock backup blocks are printed (not just the first one). - + +Mke2fs will check the size of the device, and if the user specifies a +filesystem size larger than the apparent size of the device it will +print a warning message and ask if the user wants to proceed. + Fixed a bug in e2fsck which could cause a core dump when it needs to expand the /lost+found directory, and sometimes the bitmaps haven't been merged in. Also fixed a related bug where ext2fs_write_dir_block @@ -20,7 +20,7 @@ ac_help="$ac_help ac_help="$ac_help --with-ldopts=LDOPTS select linker command line options" ac_help="$ac_help - --with-usr-prefx=PREFIX specify a prefix corresponding to /usr (default ${prefix})" + --with-root-prefix=PREFIX override prefix variable for files to be placed in the root" ac_help="$ac_help --enable-dll-shlibs select DLL libraries" ac_help="$ac_help @@ -546,6 +546,7 @@ else fi + MCONFIG=./MCONFIG BINARY_TYPE=bin @@ -611,7 +612,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:615: checking host system type" >&5 +echo "configure:616: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -675,12 +676,12 @@ else LDFLAGS= fi -# Check whether --with-usr-prefix or --without-usr-prefix was given. -if test "${with_usr_prefix+set}" = set; then - withval="$with_usr_prefix" - usr_prefix=$withval +# Check whether --with-root-prefix or --without-root-prefix was given. +if test "${with_root_prefix+set}" = set; then + withval="$with_root_prefix" + root_prefix=$withval else - usr_prefix=NONE + root_prefix=NONE fi # Check whether --enable-dll-shlibs or --disable-dll-shlibs was given. if test "${enable_dll_shlibs+set}" = set; then @@ -895,7 +896,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:899: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:900: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -924,7 +925,7 @@ fi # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:928: checking for $ac_word" >&5 +echo "configure:929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -954,7 +955,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:958: checking whether ln -s works" >&5 +echo "configure:959: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -977,7 +978,7 @@ fi # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:981: checking for $ac_word" >&5 +echo "configure:982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1009,7 +1010,7 @@ fi # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1013: checking for $ac_word" >&5 +echo "configure:1014: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1041,7 +1042,7 @@ fi # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1045: checking for $ac_word" >&5 +echo "configure:1046: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1073,7 +1074,7 @@ fi # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1077: checking for $ac_word" >&5 +echo "configure:1078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1105,7 +1106,7 @@ fi # Extract the first word of "awk", so it can be a program name with args. set dummy awk; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1109: checking for $ac_word" >&5 +echo "configure:1110: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1137,7 +1138,7 @@ fi # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1141: checking for $ac_word" >&5 +echo "configure:1142: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1167,7 +1168,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1171: checking build system type" >&5 +echo "configure:1172: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1193,7 +1194,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1197: checking for $ac_word" >&5 +echo "configure:1198: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1224,7 +1225,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1228: checking for $ac_word" >&5 +echo "configure:1229: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1258,7 +1259,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1262: checking for $ac_word" >&5 +echo "configure:1263: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1289,7 +1290,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1293: checking for $ac_word" >&5 +echo "configure:1294: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1323,7 +1324,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1327: checking for $ac_word" >&5 +echo "configure:1328: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1354,7 +1355,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1358: checking for $ac_word" >&5 +echo "configure:1359: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1388,7 +1389,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1392: checking for $ac_word" >&5 +echo "configure:1393: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1417,7 +1418,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1421: checking for $ac_word" >&5 +echo "configure:1422: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1465,7 +1466,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1469: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1470: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1475,11 +1476,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 1479 "configure" +#line 1480 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1499,12 +1500,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1503: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1504: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1508: checking whether we are using GNU C" >&5 +echo "configure:1509: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1513,7 +1514,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1528,7 +1529,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1532: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1533: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1566,7 +1567,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1570: checking for a BSD compatible install" >&5 +echo "configure:1571: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1617,7 +1618,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1621: checking how to run the C preprocessor" >&5 +echo "configure:1622: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1632,13 +1633,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1636 "configure" +#line 1637 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1649,13 +1650,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1653 "configure" +#line 1654 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1681,17 +1682,17 @@ for ac_hdr in stdlib.h unistd.h stdarg.h errno.h mntent.h dirent.h getopt.h setj do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1685: checking for $ac_hdr" >&5 +echo "configure:1686: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1690 "configure" +#line 1691 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1718,12 +1719,12 @@ fi done echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1722: checking for vprintf" >&5 +echo "configure:1723: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1727 "configure" +#line 1728 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -1746,7 +1747,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:1750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1770,12 +1771,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1774: checking for _doprnt" >&5 +echo "configure:1775: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1779 "configure" +#line 1780 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -1798,7 +1799,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1823,12 +1824,12 @@ fi fi echo $ac_n "checking whether struct dirent has a d_namlen field""... $ac_c" 1>&6 -echo "configure:1827: checking whether struct dirent has a d_namlen field" >&5 +echo "configure:1828: checking whether struct dirent has a d_namlen field" >&5 if eval "test \"`echo '$''{'e2fsprogs_cv_struct_d_namlen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1832 "configure" +#line 1833 "configure" #include "confdefs.h" #include <sys/types.h> #include <dirent.h> @@ -1836,7 +1837,7 @@ int main() { struct dirent de; de.d_namlen = 0; ; return 0; } EOF -if { (eval echo configure:1840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* e2fsprogs_cv_struct_d_namlen=yes else @@ -1856,19 +1857,19 @@ EOF fi echo $ac_n "checking whether llseek declared in unistd.h""... $ac_c" 1>&6 -echo "configure:1860: checking whether llseek declared in unistd.h" >&5 +echo "configure:1861: checking whether llseek declared in unistd.h" >&5 if eval "test \"`echo '$''{'e2fsprogs_cv_have_llseek_prototype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1865 "configure" +#line 1866 "configure" #include "confdefs.h" #include <unistd.h> int main() { extern int llseek(int); ; return 0; } EOF -if { (eval echo configure:1872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* e2fsprogs_cv_have_llseek_prototype=no else @@ -1896,7 +1897,7 @@ if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then echo "configure: warning: Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4" 1>&2 fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1900: checking size of short" >&5 +echo "configure:1901: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1904,7 +1905,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1908 "configure" +#line 1909 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1915,7 +1916,7 @@ main() exit(0); } EOF -if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -1935,7 +1936,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1939: checking size of int" >&5 +echo "configure:1940: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1943,7 +1944,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1947 "configure" +#line 1948 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1954,7 +1955,7 @@ main() exit(0); } EOF -if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1974,7 +1975,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1978: checking size of long" >&5 +echo "configure:1979: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1982,7 +1983,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1986 "configure" +#line 1987 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1993,7 +1994,7 @@ main() exit(0); } EOF -if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2013,7 +2014,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2017: checking size of long long" >&5 +echo "configure:2018: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2022,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2025 "configure" +#line 2026 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2032,7 +2033,7 @@ main() exit(0); } EOF -if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2060,19 +2061,19 @@ SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long echo $ac_n "checking whether struct stat has a st_flags field""... $ac_c" 1>&6 -echo "configure:2064: checking whether struct stat has a st_flags field" >&5 +echo "configure:2065: checking whether struct stat has a st_flags field" >&5 if eval "test \"`echo '$''{'e2fsprogs_cv_struct_st_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2069 "configure" +#line 2070 "configure" #include "confdefs.h" #include <sys/stat.h> int main() { struct stat stat; stat.st_flags = 0; ; return 0; } EOF -if { (eval echo configure:2076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* e2fsprogs_cv_struct_st_flags=yes else @@ -2094,12 +2095,12 @@ fi for ac_func in chflags getrusage llseek strdup getmntinfo strcasecmp srandom fchown do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2098: checking for $ac_func" >&5 +echo "configure:2099: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2103 "configure" +#line 2104 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2122,7 +2123,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2147,19 +2148,19 @@ fi done echo $ac_n "checking ino_t defined by sys/types.h""... $ac_c" 1>&6 -echo "configure:2151: checking ino_t defined by sys/types.h" >&5 +echo "configure:2152: checking ino_t defined by sys/types.h" >&5 if eval "test \"`echo '$''{'e2fsprogs_cv_ino_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2156 "configure" +#line 2157 "configure" #include "confdefs.h" #include <sys/types.h> int main() { ino_t ino; ino = 0; ; return 0; } EOF -if { (eval echo configure:2163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* e2fsprogs_cv_ino_t=yes else @@ -2180,17 +2181,17 @@ EOF fi ac_safe=`echo "linux/fs.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/fs.h""... $ac_c" 1>&6 -echo "configure:2184: checking for linux/fs.h" >&5 +echo "configure:2185: checking for linux/fs.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2189 "configure" +#line 2190 "configure" #include "confdefs.h" #include <linux/fs.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2225,7 +2226,7 @@ fi SOCKET_LIB='' echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2229: checking for socket in -lsocket" >&5 +echo "configure:2230: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2233,7 +2234,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2237 "configure" +#line 2238 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2244,7 +2245,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2266,12 +2267,12 @@ fi echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:2270: checking for optreset" >&5 +echo "configure:2271: checking for optreset" >&5 if eval "test \"`echo '$''{'ac_cv_have_optreset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2275 "configure" +#line 2276 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -2294,12 +2295,12 @@ EOF fi echo $ac_n "checking whether the ext2 ioctls compile""... $ac_c" 1>&6 -echo "configure:2298: checking whether the ext2 ioctls compile" >&5 +echo "configure:2299: 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 2303 "configure" +#line 2304 "configure" #include "confdefs.h" #include <linux/ext2_fs.h> #include <sys/ioctl.h> @@ -2307,7 +2308,7 @@ int main() { ioctl (0, EXT2_IOC_SETVERSION, 0); ; return 0; } EOF -if { (eval echo configure:2311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* e2fsprogs_cv_ioctl_ext2=yes else @@ -2328,39 +2329,43 @@ EOF fi case "$host_os" in linux*) - if test "$prefix" = NONE ; then - usr_prefix="\${prefix}/usr"; - echo "On $host_os systems, usr_prefix defaults to $usr_prefix" + if test "$prefix" = NONE -a "$root_prefix" = NONE ; then + root_prefix=""; + echo "On $host_os systems, root_prefix defaults to ''" fi ;; esac -if test "$usr_prefix" = NONE ; then - usr_prefix="\${prefix}" -fi - case "$host_os" in linux* | gnu*) if test "$prefix" = NONE ; then - prefix=''; - echo "On $host_os systems, prefix defaults to ''" + prefix="/usr"; + echo "On $host_os systems, prefix defaults to /usr" fi ;; esac +if test "$root_prefix" = NONE ; then + if "$prefix" = NONE ; then + root_prefix="$ac_default_prefix" + else + root_prefix="$prefix" + fi +fi + echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6 -echo "configure:2351: checking whether linker accepts -static" >&5 +echo "configure:2356: 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 2357 "configure" +#line 2362 "configure" #include "confdefs.h" #include <stdio.h> int main() { fflush(stdout); ; return 0; } EOF -if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_e2fsprogs_use_static=yes else @@ -2608,7 +2613,7 @@ s%@SIZEOF_LONG@%$SIZEOF_LONG%g s%@SIZEOF_LONG_LONG@%$SIZEOF_LONG_LONG%g s%@LINUX_INCLUDE@%$LINUX_INCLUDE%g s%@SOCKET_LIB@%$SOCKET_LIB%g -s%@usr_prefix@%$usr_prefix%g +s%@root_prefix@%$root_prefix%g s%@LDFLAG_STATIC@%$LDFLAG_STATIC%g s%@SS_DIR@%$SS_DIR%g s%@ET_DIR@%$ET_DIR%g diff --git a/configure.in b/configure.in index 8b5f4b55..9d405254 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,5 @@ AC_INIT(version.h) +AC_PREREQ(2.12) MCONFIG=./MCONFIG AC_SUBST_FILE(MCONFIG) BINARY_TYPE=bin @@ -90,12 +91,12 @@ LDFLAGS=$withval, LDFLAGS=)dnl AC_SUBST(LDFLAGS) dnl -dnl Allow separate `usr_prefix' to be specified +dnl Allow separate `root_prefix' to be specified dnl -AC_ARG_WITH([usr-prefix], -[ --with-usr-prefx=PREFIX specify a prefix corresponding to /usr (default ${prefix})], -usr_prefix=$withval, -usr_prefix=NONE)dnl +AC_ARG_WITH([root-prefix], +[ --with-root-prefix=PREFIX override prefix variable for files to be placed in the root], +root_prefix=$withval, +root_prefix=NONE)dnl dnl dnl handle --enable-dll-shlibs dnl @@ -449,31 +450,35 @@ if test "$e2fsprogs_cv_ioctl_ext2" = yes; then AC_DEFINE(HAVE_EXT2_IOCTLS) fi dnl -dnl Linux uses a separate usr_prefix by default +dnl Linux places root files in the / by default dnl case "$host_os" in linux*) - if test "$prefix" = NONE ; then - usr_prefix="\${prefix}/usr"; - echo "On $host_os systems, usr_prefix defaults to $usr_prefix" + if test "$prefix" = NONE -a "$root_prefix" = NONE ; then + root_prefix=""; + echo "On $host_os systems, root_prefix defaults to ''" fi ;; esac -if test "$usr_prefix" = NONE ; then - usr_prefix="\${prefix}" -fi -AC_SUBST(usr_prefix) dnl -dnl On Linux/hurd, force the prefix to be '' +dnl On Linux/hurd, force the prefix to be /usr dnl case "$host_os" in linux* | gnu*) if test "$prefix" = NONE ; then - prefix=''; - echo "On $host_os systems, prefix defaults to ''" + prefix="/usr"; + echo "On $host_os systems, prefix defaults to /usr" fi ;; esac +if test "$root_prefix" = NONE ; then + if "$prefix" = NONE ; then + root_prefix="$ac_default_prefix" + else + root_prefix="$prefix" + fi +fi +AC_SUBST(root_prefix) dnl dnl See if -static works. dnl diff --git a/e2fsprogs-1.12.spec b/e2fsprogs-1.12.spec index 346736a7..59299e5a 100644 --- a/e2fsprogs-1.12.spec +++ b/e2fsprogs-1.12.spec @@ -65,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT %attr(-, root, root) /usr/bin/chattr %attr(-, root, root) /usr/bin/lsattr %attr(-, root, root) /usr/man/man8/e2fsck.8 +%attr(-, root, root) /usr/man/man8/e2label.8 %attr(-, root, root) /usr/man/man8/debugfs.8 %attr(-, root, root) /usr/man/man8/tune2fs.8 %attr(-, root, root) /usr/man/man8/mklost+found.8 @@ -91,3 +92,12 @@ rm -rf $RPM_BUILD_ROOT %attr(-, root, root) /usr/lib/libss.so %attr(-, root, root) /usr/lib/libcom_err.so %attr(-, root, root) /usr/lib/libuuid.so +%attr(-, root, root) /usr/bin/mk_cmds +%attr(-, root, root) /usr/bin/compile_et +%attr(-, root, root) /usr/share/et/et_c.awk +%attr(-, root, root) /usr/share/et/et_h.awk +%attr(-, root, root) /usr/share/ss/ct_c.awk +%attr(-, root, root) /usr/share/ss/ct_c.sed +%attr(-, root, root) /usr/man/man1/compile_et.1 +%attr(-, root, root) /usr/man/man3/com_err.3 + diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog index 98048723..cdb19ce2 100644 --- a/tests/progs/ChangeLog +++ b/tests/progs/ChangeLog @@ -1,3 +1,7 @@ +1998-03-31 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Add uninstall target (which is a just a no-op). + 1998-03-29 Theodore Ts'o <tytso@rsts-11.mit.edu> * test_icount.h (do_dump, do_validate): Add prototypes to fix diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in index 25a74280..f39a97f1 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -47,6 +47,8 @@ clean: install: +uninstall: + check: mostlyclean: clean @@ -7,5 +7,4 @@ */ #define E2FSPROGS_VERSION "1.12-WIP" -#define E2FSPROGS_DATE "23-Mar-98" - +#define E2FSPROGS_DATE "2-Apr-98" |