From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 7 Jun 2008 14:08:48 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.41-WIP-0617~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9345a0bddcbbe2dbdc6df3afdb97a9bb470f55;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint'

Conflicts:

	configure
---

dc9345a0bddcbbe2dbdc6df3afdb97a9bb470f55
diff --cc configure
index b34f34b37,bdef3cc93..7ec9091ba
--- a/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
 +IMAGER_CMT!$IMAGER_CMT$ac_delim
- RESIZER_CMT!$RESIZER_CMT$ac_delim
- FSCK_PROG!$FSCK_PROG$ac_delim
- FSCK_MAN!$FSCK_MAN$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