Merge branch 'maint'

Conflicts:

	configure

diff --cc configure
index b34f34b,bdef3cc..7ec9091
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -16051,14 -16095,11 +16067,11 @@@ CHECKER_CMT!$CHECKER_CMT$ac_deli
  LIB_EXT!$LIB_EXT$ac_delim
  STATIC_LIB_EXT!$STATIC_LIB_EXT$ac_delim
  PROFILED_LIB_EXT!$PROFILED_LIB_EXT$ac_delim
 -SWAPFS_CMT!$SWAPFS_CMT$ac_delim
  DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
- RESIZER_CMT!$RESIZER_CMT$ac_delim
- FSCK_PROG!$FSCK_PROG$ac_delim
- FSCK_MAN!$FSCK_MAN$ac_delim
 +IMAGER_CMT!$IMAGER_CMT$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@@ -16125,6 -16170,10 +16142,9 @@@ _ACEO
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
 -IMAGER_CMT!$IMAGER_CMT$ac_delim
+ RESIZER_CMT!$RESIZER_CMT$ac_delim
+ FSCK_PROG!$FSCK_PROG$ac_delim
+ FSCK_MAN!$FSCK_MAN$ac_delim
  E2INITRD_PROG!$E2INITRD_PROG$ac_delim
  E2INITRD_MAN!$E2INITRD_MAN$ac_delim
  PKG_CONFIG!$PKG_CONFIG$ac_delim
@@@ -16210,7 -16259,7 +16230,7 @@@ LIBOBJS!$LIBOBJS$ac_deli
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --cc configure.in
Simple merge