Integrate ext2ed into the e2fsprogs build system, and make minimal changes so
that it will compile on modern systems. The top-level makefile does not recurse
into the ext2ed directory for now, pending determination of whether the original
author is still maintaining ext2ed.
The documentation files have been renamed to remove the version from the filename.
In addition, the SGML files have been converted from LinuxDoc to DocBook.
The way root_bindir, root_sbindir, and root_libdir have been changed so that
if root_prefix is not set, the values set by the configure command-line options to
set the directory names using --bindir, --sbindir, --libdir will affect the
root_bindir, et.al Makefile variables.
diff --git a/configure b/configure
index 9559910..f42d35a 100644
--- a/configure
+++ b/configure
@@ -4774,23 +4774,36 @@
else
root_prefix="$prefix"
fi
+ root_bindir=$bindir
+ root_sbindir=$sbindir
+ root_libdir=$libdir
+ root_sysconfdir=$sysconfdir
+else
+ root_bindir='${root_prefix}/bin'
+ root_sbindir='${root_prefix}/sbin'
+ root_libdir='${root_prefix}/lib'
+ root_sysconfdir='${root_prefix}/etc'
fi
+
+
+
+
echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6
-echo "configure:4781: checking whether linker accepts -static" >&5
+echo "configure:4794: 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 4787 "configure"
+#line 4800 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
fflush(stdout);
; return 0; }
EOF
-if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4807: \"$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
@@ -4947,8 +4960,8 @@
trap 'rm -fr `echo "MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile
lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile lib/uuid/Makefile
- misc/Makefile e2fsck/Makefile debugfs/Makefile tests/Makefile
- tests/progs/Makefile $rmakefile doc/Makefile
+ misc/Makefile ext2ed/Makefile e2fsck/Makefile debugfs/Makefile \
+ tests/Makefile tests/progs/Makefile $rmakefile doc/Makefile
intl/Makefile po/Makefile.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -5075,6 +5088,10 @@
s%@SIZEOF_LONG_LONG@%$SIZEOF_LONG_LONG%g
s%@SOCKET_LIB@%$SOCKET_LIB%g
s%@root_prefix@%$root_prefix%g
+s%@root_bindir@%$root_bindir%g
+s%@root_sbindir@%$root_sbindir%g
+s%@root_libdir@%$root_libdir%g
+s%@root_sysconfdir@%$root_sysconfdir%g
s%@LDFLAG_STATIC@%$LDFLAG_STATIC%g
s%@SS_DIR@%$SS_DIR%g
s%@ET_DIR@%$ET_DIR%g
@@ -5122,8 +5139,8 @@
CONFIG_FILES=\${CONFIG_FILES-"MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile
lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile lib/uuid/Makefile
- misc/Makefile e2fsck/Makefile debugfs/Makefile tests/Makefile
- tests/progs/Makefile $rmakefile doc/Makefile
+ misc/Makefile ext2ed/Makefile e2fsck/Makefile debugfs/Makefile \
+ tests/Makefile tests/progs/Makefile $rmakefile doc/Makefile
intl/Makefile po/Makefile.in"}
EOF
cat >> $CONFIG_STATUS <<\EOF