--- util-linux-2.19.1.orig/configure
+++ util-linux-2.19.1/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for util-linux 2.19.1.
+# Generated by GNU Autoconf 2.65 for util-linux 2.19.1.
 #
 # Report bugs to <kzak@redhat.com>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -173,15 +173,7 @@
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -327,7 +319,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -367,19 +359,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -536,14 +528,161 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+
+
+# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+$*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+
+
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -783,14 +922,13 @@
 ENABLE_GTK_DOC_TRUE
 GTKDOC_CHECK
 HTML_DIR
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
 PKG_CONFIG
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
+lt_ECHO
 RANLIB
 AR
 OBJDUMP
@@ -970,8 +1108,6 @@
 CPPFLAGS
 CPP
 PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
 UUID_CFLAGS
 UUID_LIBS
 BLKID_CFLAGS
@@ -1087,7 +1223,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1113,7 +1249,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1317,7 +1453,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1333,7 +1469,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1363,8 +1499,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1372,7 +1508,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1390,13 +1526,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1419,7 +1555,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1433,8 +1569,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1449,9 +1585,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1490,11 +1626,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1534,7 +1670,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1696,10 +1832,6 @@
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
   UUID_CFLAGS C compiler flags for UUID, overriding pkg-config
   UUID_LIBS   linker flags for UUID, overriding pkg-config
   BLKID_CFLAGS
@@ -1778,9 +1910,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 util-linux configure 2.19.1
-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1874,10 +2006,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1936,15 +2068,17 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------ ##
+( cat <<\_ASBOX
+## ------------------------------ ##
 ## Report this to kzak@redhat.com ##
-## ------------------------------ ##"
+## ------------------------------ ##
+_ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2008,7 +2142,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2084,7 +2218,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2143,18 +2277,15 @@
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2163,12 +2294,8 @@
 int
 main ()
 {
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
+#ifndef $2
+  (void) $2;
 #endif
 
   ;
@@ -2198,7 +2325,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2255,7 +2382,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2304,7 +2431,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by util-linux $as_me 2.19.1, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2414,9 +2541,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2450,9 +2579,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2465,9 +2596,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -2481,9 +2614,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -2538,12 +2673,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2558,11 +2688,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
@@ -2638,7 +2764,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2656,22 +2782,16 @@
 
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2791,11 +2911,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2817,7 +2937,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2827,7 +2947,7 @@
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3065,7 +3185,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3073,7 +3193,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3107,7 +3227,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3603,8 +3723,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3718,8 +3838,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3761,8 +3882,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3819,9 +3940,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -3872,8 +3993,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4641,8 +4762,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4703,7 +4824,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4769,7 +4890,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4901,7 +5022,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4975,7 +5097,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -4986,16 +5108,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5020,7 +5142,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -5028,7 +5150,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5378,7 +5500,7 @@
 
      ;; #(
    *)
-     as_fn_error $? "unknown endianness
+     as_fn_error "unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
@@ -5391,8 +5513,8 @@
 
 
 
-macro_version='2.2.10'
-macro_revision='1.3175'
+macro_version='2.2.6b'
+macro_revision='1.3017'
 
 
 
@@ -5408,75 +5530,6 @@
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then :
@@ -5534,7 +5587,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -5613,7 +5666,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -5729,7 +5782,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5812,11 +5865,8 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5860,7 +5910,7 @@
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5915,15 +5965,6 @@
   fi
 fi
 
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
 
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -5943,13 +5984,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5987: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5990: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  (eval echo "\"\$as_me:5993: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6006,11 +6047,6 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -6075,8 +6111,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -6347,18 +6383,16 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc*)
+cegcc)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -6388,10 +6422,6 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -6400,11 +6430,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -6430,7 +6460,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -6842,18 +6872,6 @@
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
 
 
 
@@ -7023,8 +7041,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -7177,7 +7195,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  echo '#line 7198 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7889,38 +7907,6 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if test "${lt_cv_ld_force_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -7948,7 +7934,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test "$DSYMUTIL" != ":"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -7971,8 +7957,6 @@
 
 
 
-
-
 # Set options
 
 
@@ -8125,7 +8109,6 @@
 
 
 
-
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8175,6 +8158,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -8187,6 +8183,23 @@
   ;;
 esac
 
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -8215,7 +8228,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -8424,12 +8437,7 @@
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@ -8449,15 +8457,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8460: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:8464: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -8535,12 +8543,6 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -8583,13 +8585,6 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
-      ;;
-    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -8652,7 +8647,7 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+      pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -8664,26 +8659,26 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
 	esac
 	;;
       esac
@@ -8714,7 +8709,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+      f77* | f90* | f95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -8801,15 +8796,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8799: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:8803: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -8857,7 +8852,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -8906,16 +8901,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8904: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:8908: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -8961,16 +8956,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8959: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   echo "$as_me:8963: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9080,36 +9075,13 @@
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -9143,12 +9115,11 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
 _LT_EOF
       fi
@@ -9184,7 +9155,6 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
@@ -9206,11 +9176,6 @@
       fi
       ;;
 
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -9240,12 +9205,11 @@
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -9256,17 +9220,13 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -9282,17 +9242,17 @@
         fi
 
 	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
+	xlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
 	  hardcode_libdir_flag_spec=
 	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -9301,7 +9261,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9413,10 +9373,8 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -9478,6 +9436,7 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9534,7 +9493,7 @@
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -9578,13 +9537,8 @@
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
+	  # Exported symbols can be pulled into shared objects from archives
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9623,7 +9577,7 @@
       # Tell ltmain to make .dll files, not .so files.
       shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_from_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
@@ -9639,11 +9593,7 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    whole_archive_flag_spec=''
-  fi
+  whole_archive_flag_spec=''
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -9651,7 +9601,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -9717,7 +9667,7 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -9736,7 +9686,7 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9757,46 +9707,7 @@
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if test "${lt_cv_prog_compiler__b+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
@@ -9824,7 +9735,7 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
@@ -9835,15 +9746,15 @@
 int foo(void) {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$save_LDFLAGS"
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9852,7 +9763,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -9905,17 +9816,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9925,13 +9836,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10134,50 +10045,44 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+        then
+	  archive_cmds_need_lc=no
+        else
+	  archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
@@ -10348,23 +10253,16 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -10377,7 +10275,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -10397,13 +10295,7 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -10491,7 +10383,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -10544,12 +10436,23 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -10649,19 +10552,6 @@
   hardcode_into_libs=yes
   ;;
 
-haiku*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@ -10704,10 +10594,8 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
   postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
   ;;
 
 interix[3-9]*)
@@ -10774,17 +10662,12 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10797,31 +10680,23 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10833,6 +10708,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11123,11 +11010,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
@@ -11458,7 +11340,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 11343 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11499,13 +11381,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
-#endif
-
-void fnord () { int i=42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11514,11 +11390,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -11564,7 +11436,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
+#line 11439 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11605,13 +11477,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
-#endif
-
-void fnord () { int i=42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11620,11 +11486,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -11804,10 +11666,6 @@
 
 
 
-
-
-
-
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11920,6 +11778,7 @@
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
+
 fi
 
 
@@ -11951,7 +11810,7 @@
   test $ac_status = 0; }; then
   :
 else
-  as_fn_error $? "You need to have gtk-doc >= 1.10 installed to build gtk-doc" "$LINENO" 5
+  as_fn_error "You need to have gtk-doc >= 1.10 installed to build gtk-doc" "$LINENO" 5
 fi
   fi
 
@@ -12328,7 +12187,8 @@
 #endif
 
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -12380,7 +12240,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -12516,7 +12377,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -12597,7 +12459,8 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -12795,7 +12658,7 @@
 
 case "$have_dirfd:$have_ddfd" in
 no:no)
-  as_fn_error $? "cannot find a method to get filedescriptor of directory" "$LINENO" 5 ;;
+  as_fn_error "cannot find a method to get filedescriptor of directory" "$LINENO" 5 ;;
 esac
 
 
@@ -13024,8 +12887,8 @@
   if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13078,8 +12941,8 @@
 	  if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13212,10 +13075,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
 $as_echo_n "checking for UUID... " >&6; }
 
-if test -n "$UUID_CFLAGS"; then
-    pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$UUID_CFLAGS"; then
+        pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
   ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
   ac_status=$?
@@ -13225,13 +13089,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$UUID_LIBS"; then
-    pkg_cv_UUID_LIBS="$UUID_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$UUID_LIBS"; then
+        pkg_cv_UUID_LIBS="$UUID_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
   ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
   ac_status=$?
@@ -13241,15 +13107,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13257,17 +13122,17 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "uuid" 2>&1`
+	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "uuid"`
         else
-	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "uuid" 2>&1`
+	        UUID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "uuid"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$UUID_PKG_ERRORS" >&5
 
-	have_uuid=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+                have_uuid=no
+elif test $pkg_failed = untried; then
 	have_uuid=no
 else
 	UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
@@ -13334,7 +13199,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13387,7 +13253,7 @@
 
 case "$enable_uuidd:$have_uuid" in
 yes:no)
-  as_fn_error $? "cannot enable uuidd when libuuid is disabled" "$LINENO" 5 ;;
+  as_fn_error "cannot enable uuidd when libuuid is disabled" "$LINENO" 5 ;;
 auto:*)
   enable_uuidd=$have_uuid ;;
 esac
@@ -13445,10 +13311,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
 $as_echo_n "checking for BLKID... " >&6; }
 
-if test -n "$BLKID_CFLAGS"; then
-    pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$BLKID_CFLAGS"; then
+        pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid\""; } >&5
   ($PKG_CONFIG --exists --print-errors "blkid") 2>&5
   ac_status=$?
@@ -13458,13 +13325,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$BLKID_LIBS"; then
-    pkg_cv_BLKID_LIBS="$BLKID_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$BLKID_LIBS"; then
+        pkg_cv_BLKID_LIBS="$BLKID_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid\""; } >&5
   ($PKG_CONFIG --exists --print-errors "blkid") 2>&5
   ac_status=$?
@@ -13474,15 +13343,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13490,17 +13358,17 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "blkid" 2>&1`
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "blkid"`
         else
-	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors "blkid" 2>&1`
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "blkid"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$BLKID_PKG_ERRORS" >&5
 
-	have_blkid=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+                have_blkid=no
+elif test $pkg_failed = untried; then
 	have_blkid=no
 else
 	BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
@@ -13567,7 +13435,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13592,7 +13461,7 @@
   test $ac_status = 0; }; then
     BLKID_LIBS_STATIC=`pkg-config --libs --static "blkid"`
   else
-    as_fn_error $? "pkg-config description of blkid, needed for static build, is not available" "$LINENO" 5
+    as_fn_error "pkg-config description of blkid, needed for static build, is not available" "$LINENO" 5
   fi
 
     fi
@@ -13613,10 +13482,10 @@
 
 else
   if test "x$build_mount" = xyes; then
-    as_fn_error $? "libblkid is needed to build util-linux mount" "$LINENO" 5
+    as_fn_error "libblkid is needed to build util-linux mount" "$LINENO" 5
   fi
   if test "x$enable_fsck" = xyes; then
-    as_fn_error $? "libblkid is needed to build util-linux fsck" "$LINENO" 5
+    as_fn_error "libblkid is needed to build util-linux fsck" "$LINENO" 5
   fi
 fi
  if test "x$have_blkid" = xyes; then
@@ -13654,7 +13523,7 @@
 
 case "$enable_libblkid:$build_libmount" in
 no:yes)
-  as_fn_error $? "cannot enable libmount when libblkid is disabled" "$LINENO" 5 ;;
+  as_fn_error "cannot enable libmount when libblkid is disabled" "$LINENO" 5 ;;
 esac
 
 
@@ -13685,7 +13554,7 @@
 
 case "$build_libmount:$enable_libmount_mount" in
 no:yes)
-  as_fn_error $? "cannot link mount(8) with libmount when libmount is disabled" "$LINENO" 5 ;;
+  as_fn_error "cannot link mount(8) with libmount when libmount is disabled" "$LINENO" 5 ;;
 yes:yes)
 
 $as_echo "#define HAVE_LIBMOUNT_MOUNT 1" >>confdefs.h
@@ -14239,7 +14108,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then :
@@ -15426,7 +15295,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15577,7 +15447,7 @@
 done
 
   if test "x$have_ncurses" = xno; then
-    as_fn_error $? "ncurses or ncursesw selected, but library not found (--without-ncurses to disable)" "$LINENO" 5
+    as_fn_error "ncurses or ncursesw selected, but library not found (--without-ncurses to disable)" "$LINENO" 5
   fi
 fi
 
@@ -15649,7 +15519,8 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15669,7 +15540,8 @@
 #endif
 
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15679,7 +15551,7 @@
 done
 
   if test "x$use_slang" = xno; then
-    as_fn_error $? "slang selected but slcurses.h not found" "$LINENO" 5
+    as_fn_error "slang selected but slcurses.h not found" "$LINENO" 5
   fi
 fi
  if test "x$use_slang" = xyes; then
@@ -15763,7 +15635,7 @@
 
 
   if test "x$have_utempter" = xno; then
-    as_fn_error $? "utempter selected but libutempter not found" "$LINENO" 5
+    as_fn_error "utempter selected but libutempter not found" "$LINENO" 5
   fi
 else
    if false; then
@@ -15845,7 +15717,7 @@
 
 else
 
-  as_fn_error $? "crypt() is not available" "$LINENO" 5
+  as_fn_error "crypt() is not available" "$LINENO" 5
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -16368,6 +16240,20 @@
   esac
 
 
+for ac_header in fcntl.h linux/falloc.h sys/types.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid fallocate() function" >&5
 $as_echo_n "checking for valid fallocate() function... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16967,7 +16853,7 @@
 fi
 
   case $enable_cramfs:$build_cramfs in
-  yes:no) as_fn_error $? "cramfs selected but libz not found" "$LINENO" 5;;
+  yes:no) as_fn_error "cramfs selected but libz not found" "$LINENO" 5;;
   esac
 fi
  if test "x$build_cramfs" = xyes; then
@@ -17011,14 +16897,14 @@
 else
   build_switch_root=yes
   case $enable_switch_root:$linux_os in
-  yes:no) as_fn_error $? "switch_root selected for non-linux system" "$LINENO" 5;;
+  yes:no) as_fn_error "switch_root selected for non-linux system" "$LINENO" 5;;
   check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: non-linux system; do not build switch_root" >&5
 $as_echo "$as_me: WARNING: non-linux system; do not build switch_root" >&2;}
             build_switch_root=no;;
   esac
   if test "x$build_switch_root" = xyes; then
     case $enable_switch_root:$have_openat in
-    yes:no) as_fn_error $? "switch_root selected but openat() function not found" "$LINENO" 5;;
+    yes:no) as_fn_error "switch_root selected but openat() function not found" "$LINENO" 5;;
     check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: openat() function not found; do not build switch_root" >&5
 $as_echo "$as_me: WARNING: openat() function not found; do not build switch_root" >&2;}
               build_switch_root=no;;
@@ -17048,14 +16934,14 @@
 else
   build_pivot_root=yes
   case $enable_pivot_root:$linux_os in
-  yes:no) as_fn_error $? "pivot_root selected for non-linux system" "$LINENO" 5;;
+  yes:no) as_fn_error "pivot_root selected for non-linux system" "$LINENO" 5;;
   check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: non-linux system; do not build pivot_root" >&5
 $as_echo "$as_me: WARNING: non-linux system; do not build pivot_root" >&2;}
             build_pivot_root=no;;
   esac
   if test "x$build_pivot_root" = xyes; then
     case $enable_pivot_root:$util_cv_syscall_pivot_root in
-    yes:no) as_fn_error $? "pivot_root selected but pivot_root syscall not found" "$LINENO" 5;;
+    yes:no) as_fn_error "pivot_root selected but pivot_root syscall not found" "$LINENO" 5;;
     check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pivot_root syscall not found; do not build pivot_root" >&5
 $as_echo "$as_me: WARNING: pivot_root syscall not found; do not build pivot_root" >&2;}
               build_pivot_root=no;;
@@ -17085,14 +16971,14 @@
 else
   build_fallocate=yes
   case $enable_fallocate:$linux_os in
-  yes:no) as_fn_error $? "fallocate selected for non-linux system" "$LINENO" 5;;
+  yes:no) as_fn_error "fallocate selected for non-linux system" "$LINENO" 5;;
   check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: non-linux system; do not build fallocate" >&5
 $as_echo "$as_me: WARNING: non-linux system; do not build fallocate" >&2;}
             build_fallocate=no;;
   esac
   if test "x$build_fallocate" = xyes; then
     case $enable_fallocate:$util_cv_syscall_fallocate in
-    yes:no) as_fn_error $? "fallocate selected but fallocate syscall not found" "$LINENO" 5;;
+    yes:no) as_fn_error "fallocate selected but fallocate syscall not found" "$LINENO" 5;;
     check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fallocate syscall not found; do not build fallocate" >&5
 $as_echo "$as_me: WARNING: fallocate syscall not found; do not build fallocate" >&2;}
               build_fallocate=no;;
@@ -17122,14 +17008,14 @@
 else
   build_unshare=yes
   case $enable_unshare:$linux_os in
-  yes:no) as_fn_error $? "unshare selected for non-linux system" "$LINENO" 5;;
+  yes:no) as_fn_error "unshare selected for non-linux system" "$LINENO" 5;;
   check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: non-linux system; do not build unshare" >&5
 $as_echo "$as_me: WARNING: non-linux system; do not build unshare" >&2;}
             build_unshare=no;;
   esac
   if test "x$build_unshare" = xyes; then
     case $enable_unshare:$util_cv_syscall_unshare in
-    yes:no) as_fn_error $? "unshare selected but unshare syscall not found" "$LINENO" 5;;
+    yes:no) as_fn_error "unshare selected but unshare syscall not found" "$LINENO" 5;;
     check:no) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unshare syscall not found; do not build unshare" >&5
 $as_echo "$as_me: WARNING: unshare syscall not found; do not build unshare" >&2;}
               build_unshare=no;;
@@ -17359,7 +17245,7 @@
 
 else
   if test "x$with_pam" = xyes; then
-	as_fn_error $? "PAM selected but security/pam_misc.h not found" "$LINENO" 5
+	as_fn_error "PAM selected but security/pam_misc.h not found" "$LINENO" 5
      fi
 
 fi
@@ -17448,7 +17334,7 @@
 
 
   case "$with_selinux:$have_selinux" in
-  yes:no) as_fn_error $? "SELinux selected but libselinux not found" "$LINENO" 5;;
+  yes:no) as_fn_error "SELinux selected but libselinux not found" "$LINENO" 5;;
   esac
 fi
 
@@ -17555,7 +17441,7 @@
 
   case "$with_audit:$have_audit" in
   yes:no)
-   as_fn_error $? "Audit selected but libaudit not found (or doesn't support audit_log_user_message())" "$LINENO" 5
+   as_fn_error "Audit selected but libaudit not found (or doesn't support audit_log_user_message())" "$LINENO" 5
    ;;
   esac
 fi
@@ -17886,7 +17772,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -17910,324 +17795,324 @@
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
+  as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
+  as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+  as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then
-  as_fn_error $? "conditional \"LINUX\" was never defined.
+  as_fn_error "conditional \"LINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_RAW_TRUE}" && test -z "${HAVE_RAW_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_RAW\" was never defined.
+  as_fn_error "conditional \"HAVE_RAW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_RAW_TRUE}" && test -z "${HAVE_RAW_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_RAW\" was never defined.
+  as_fn_error "conditional \"HAVE_RAW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LANGINFO_TRUE}" && test -z "${HAVE_LANGINFO_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LANGINFO\" was never defined.
+  as_fn_error "conditional \"HAVE_LANGINFO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LANGINFO_TRUE}" && test -z "${HAVE_LANGINFO_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LANGINFO\" was never defined.
+  as_fn_error "conditional \"HAVE_LANGINFO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_STATIC_LOSETUP_TRUE}" && test -z "${HAVE_STATIC_LOSETUP_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_LOSETUP\" was never defined.
+  as_fn_error "conditional \"HAVE_STATIC_LOSETUP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_STATIC_MOUNT_TRUE}" && test -z "${HAVE_STATIC_MOUNT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_MOUNT\" was never defined.
+  as_fn_error "conditional \"HAVE_STATIC_MOUNT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_STATIC_UMOUNT_TRUE}" && test -z "${HAVE_STATIC_UMOUNT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_UMOUNT\" was never defined.
+  as_fn_error "conditional \"HAVE_STATIC_UMOUNT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_STATIC_FDISK_TRUE}" && test -z "${HAVE_STATIC_FDISK_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_FDISK\" was never defined.
+  as_fn_error "conditional \"HAVE_STATIC_FDISK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_STATIC_SFDISK_TRUE}" && test -z "${HAVE_STATIC_SFDISK_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_SFDISK\" was never defined.
+  as_fn_error "conditional \"HAVE_STATIC_SFDISK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_STATIC_BLKID_TRUE}" && test -z "${HAVE_STATIC_BLKID_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_STATIC_BLKID\" was never defined.
+  as_fn_error "conditional \"HAVE_STATIC_BLKID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_MOUNT_TRUE}" && test -z "${BUILD_MOUNT_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_MOUNT\" was never defined.
+  as_fn_error "conditional \"BUILD_MOUNT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_FSCK_TRUE}" && test -z "${BUILD_FSCK_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_FSCK\" was never defined.
+  as_fn_error "conditional \"BUILD_FSCK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LIBUUID_TRUE}" && test -z "${BUILD_LIBUUID_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LIBUUID\" was never defined.
+  as_fn_error "conditional \"BUILD_LIBUUID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_UUID_TRUE}" && test -z "${HAVE_UUID_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_UUID\" was never defined.
+  as_fn_error "conditional \"HAVE_UUID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_UUIDD_TRUE}" && test -z "${BUILD_UUIDD_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_UUIDD\" was never defined.
+  as_fn_error "conditional \"BUILD_UUIDD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LIBBLKID_TRUE}" && test -z "${BUILD_LIBBLKID_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LIBBLKID\" was never defined.
+  as_fn_error "conditional \"BUILD_LIBBLKID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_BLKID_TRUE}" && test -z "${HAVE_BLKID_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_BLKID\" was never defined.
+  as_fn_error "conditional \"HAVE_BLKID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LIBMOUNT_TRUE}" && test -z "${BUILD_LIBMOUNT_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LIBMOUNT\" was never defined.
+  as_fn_error "conditional \"BUILD_LIBMOUNT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LIBMOUNT_MOUNT_TRUE}" && test -z "${BUILD_LIBMOUNT_MOUNT_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LIBMOUNT_MOUNT\" was never defined.
+  as_fn_error "conditional \"BUILD_LIBMOUNT_MOUNT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_UTIL_TRUE}" && test -z "${HAVE_UTIL_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_UTIL\" was never defined.
+  as_fn_error "conditional \"HAVE_UTIL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_TERMCAP_TRUE}" && test -z "${HAVE_TERMCAP_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_TERMCAP\" was never defined.
+  as_fn_error "conditional \"HAVE_TERMCAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_NCURSES_TRUE}" && test -z "${HAVE_NCURSES_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_NCURSES\" was never defined.
+  as_fn_error "conditional \"HAVE_NCURSES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_NCURSES_TRUE}" && test -z "${HAVE_NCURSES_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_NCURSES\" was never defined.
+  as_fn_error "conditional \"HAVE_NCURSES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_NCURSES_TRUE}" && test -z "${HAVE_NCURSES_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_NCURSES\" was never defined.
+  as_fn_error "conditional \"HAVE_NCURSES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_TINFO_TRUE}" && test -z "${HAVE_TINFO_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_TINFO\" was never defined.
+  as_fn_error "conditional \"HAVE_TINFO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_SLANG_TRUE}" && test -z "${USE_SLANG_FALSE}"; then
-  as_fn_error $? "conditional \"USE_SLANG\" was never defined.
+  as_fn_error "conditional \"USE_SLANG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_UTEMPTER_TRUE}" && test -z "${HAVE_UTEMPTER_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_UTEMPTER\" was never defined.
+  as_fn_error "conditional \"HAVE_UTEMPTER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_UTEMPTER_TRUE}" && test -z "${HAVE_UTEMPTER_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_UTEMPTER\" was never defined.
+  as_fn_error "conditional \"HAVE_UTEMPTER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${NEED_LIBCRYPT_TRUE}" && test -z "${NEED_LIBCRYPT_FALSE}"; then
-  as_fn_error $? "conditional \"NEED_LIBCRYPT\" was never defined.
+  as_fn_error "conditional \"NEED_LIBCRYPT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PIVOT_ROOT_TRUE}" && test -z "${HAVE_PIVOT_ROOT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PIVOT_ROOT\" was never defined.
+  as_fn_error "conditional \"HAVE_PIVOT_ROOT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_SCHED_GETAFFINITY_TRUE}" && test -z "${HAVE_SCHED_GETAFFINITY_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SCHED_GETAFFINITY\" was never defined.
+  as_fn_error "conditional \"HAVE_SCHED_GETAFFINITY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_IOPRIO_SET_TRUE}" && test -z "${HAVE_IOPRIO_SET_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_IOPRIO_SET\" was never defined.
+  as_fn_error "conditional \"HAVE_IOPRIO_SET\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_IOPRIO_GET_TRUE}" && test -z "${HAVE_IOPRIO_GET_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_IOPRIO_GET\" was never defined.
+  as_fn_error "conditional \"HAVE_IOPRIO_GET\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_FALLOCATE_TRUE}" && test -z "${HAVE_FALLOCATE_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_FALLOCATE\" was never defined.
+  as_fn_error "conditional \"HAVE_FALLOCATE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_UNSHARE_TRUE}" && test -z "${HAVE_UNSHARE_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_UNSHARE\" was never defined.
+  as_fn_error "conditional \"HAVE_UNSHARE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_CPU_SET_T_TRUE}" && test -z "${HAVE_CPU_SET_T_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_CPU_SET_T\" was never defined.
+  as_fn_error "conditional \"HAVE_CPU_SET_T\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_I86_TRUE}" && test -z "${ARCH_I86_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_I86\" was never defined.
+  as_fn_error "conditional \"ARCH_I86\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_86_64_TRUE}" && test -z "${ARCH_86_64_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_86_64\" was never defined.
+  as_fn_error "conditional \"ARCH_86_64\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_IA64_TRUE}" && test -z "${ARCH_IA64_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_IA64\" was never defined.
+  as_fn_error "conditional \"ARCH_IA64\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_S390_TRUE}" && test -z "${ARCH_S390_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_S390\" was never defined.
+  as_fn_error "conditional \"ARCH_S390\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_SPARC_TRUE}" && test -z "${ARCH_SPARC_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_SPARC\" was never defined.
+  as_fn_error "conditional \"ARCH_SPARC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_PPC\" was never defined.
+  as_fn_error "conditional \"ARCH_PPC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_M68K_TRUE}" && test -z "${ARCH_M68K_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_M68K\" was never defined.
+  as_fn_error "conditional \"ARCH_M68K\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_MIPS_TRUE}" && test -z "${ARCH_MIPS_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_MIPS\" was never defined.
+  as_fn_error "conditional \"ARCH_MIPS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ARCH_HPPA_TRUE}" && test -z "${ARCH_HPPA_FALSE}"; then
-  as_fn_error $? "conditional \"ARCH_HPPA\" was never defined.
+  as_fn_error "conditional \"ARCH_HPPA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ARCH_TRUE}" && test -z "${BUILD_ARCH_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_ARCH\" was never defined.
+  as_fn_error "conditional \"BUILD_ARCH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_AGETTY_TRUE}" && test -z "${BUILD_AGETTY_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_AGETTY\" was never defined.
+  as_fn_error "conditional \"BUILD_AGETTY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_CRAMFS_TRUE}" && test -z "${BUILD_CRAMFS_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_CRAMFS\" was never defined.
+  as_fn_error "conditional \"BUILD_CRAMFS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LSBLK_TRUE}" && test -z "${BUILD_LSBLK_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LSBLK\" was never defined.
+  as_fn_error "conditional \"BUILD_LSBLK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_SWITCH_ROOT_TRUE}" && test -z "${BUILD_SWITCH_ROOT_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SWITCH_ROOT\" was never defined.
+  as_fn_error "conditional \"BUILD_SWITCH_ROOT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_PIVOT_ROOT_TRUE}" && test -z "${BUILD_PIVOT_ROOT_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_PIVOT_ROOT\" was never defined.
+  as_fn_error "conditional \"BUILD_PIVOT_ROOT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_FALLOCATE_TRUE}" && test -z "${BUILD_FALLOCATE_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_FALLOCATE\" was never defined.
+  as_fn_error "conditional \"BUILD_FALLOCATE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_UNSHARE_TRUE}" && test -z "${BUILD_UNSHARE_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_UNSHARE\" was never defined.
+  as_fn_error "conditional \"BUILD_UNSHARE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ELVTUNE_TRUE}" && test -z "${BUILD_ELVTUNE_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_ELVTUNE\" was never defined.
+  as_fn_error "conditional \"BUILD_ELVTUNE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_INIT_TRUE}" && test -z "${BUILD_INIT_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_INIT\" was never defined.
+  as_fn_error "conditional \"BUILD_INIT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_KILL_TRUE}" && test -z "${BUILD_KILL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_KILL\" was never defined.
+  as_fn_error "conditional \"BUILD_KILL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LAST_TRUE}" && test -z "${BUILD_LAST_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LAST\" was never defined.
+  as_fn_error "conditional \"BUILD_LAST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_MESG_TRUE}" && test -z "${BUILD_MESG_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_MESG\" was never defined.
+  as_fn_error "conditional \"BUILD_MESG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_PARTX_TRUE}" && test -z "${BUILD_PARTX_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_PARTX\" was never defined.
+  as_fn_error "conditional \"BUILD_PARTX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_RAW_TRUE}" && test -z "${BUILD_RAW_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_RAW\" was never defined.
+  as_fn_error "conditional \"BUILD_RAW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_RENAME_TRUE}" && test -z "${BUILD_RENAME_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_RENAME\" was never defined.
+  as_fn_error "conditional \"BUILD_RENAME\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_RESET_TRUE}" && test -z "${BUILD_RESET_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_RESET\" was never defined.
+  as_fn_error "conditional \"BUILD_RESET\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LOGIN_UTILS_TRUE}" && test -z "${BUILD_LOGIN_UTILS_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_LOGIN_UTILS\" was never defined.
+  as_fn_error "conditional \"BUILD_LOGIN_UTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
+  as_fn_error "conditional \"HAVE_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
+  as_fn_error "conditional \"HAVE_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SELINUX\" was never defined.
+  as_fn_error "conditional \"HAVE_SELINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SELINUX\" was never defined.
+  as_fn_error "conditional \"HAVE_SELINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_AUDIT_TRUE}" && test -z "${HAVE_AUDIT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_AUDIT\" was never defined.
+  as_fn_error "conditional \"HAVE_AUDIT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_AUDIT_TRUE}" && test -z "${HAVE_AUDIT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_AUDIT\" was never defined.
+  as_fn_error "conditional \"HAVE_AUDIT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_SCHEDUTILS_TRUE}" && test -z "${BUILD_SCHEDUTILS_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SCHEDUTILS\" was never defined.
+  as_fn_error "conditional \"BUILD_SCHEDUTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_WALL_TRUE}" && test -z "${BUILD_WALL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_WALL\" was never defined.
+  as_fn_error "conditional \"BUILD_WALL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_WRITE_TRUE}" && test -z "${BUILD_WRITE_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_WRITE\" was never defined.
+  as_fn_error "conditional \"BUILD_WRITE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_TTY_GROUP_TRUE}" && test -z "${USE_TTY_GROUP_FALSE}"; then
-  as_fn_error $? "conditional \"USE_TTY_GROUP\" was never defined.
+  as_fn_error "conditional \"USE_TTY_GROUP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MAKEINSTALL_DO_CHOWN_TRUE}" && test -z "${MAKEINSTALL_DO_CHOWN_FALSE}"; then
-  as_fn_error $? "conditional \"MAKEINSTALL_DO_CHOWN\" was never defined.
+  as_fn_error "conditional \"MAKEINSTALL_DO_CHOWN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MAKEINSTALL_DO_SETUID_TRUE}" && test -z "${MAKEINSTALL_DO_SETUID_FALSE}"; then
-  as_fn_error $? "conditional \"MAKEINSTALL_DO_SETUID\" was never defined.
+  as_fn_error "conditional \"MAKEINSTALL_DO_SETUID\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -18377,19 +18262,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -18585,7 +18470,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -18639,7 +18524,7 @@
 # values after options handling.
 ac_log="
 This file was extended by util-linux $as_me 2.19.1, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18705,10 +18590,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 util-linux config.status 2.19.1
-configured by $0, generated by GNU Autoconf 2.66,
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18764,7 +18649,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -18773,7 +18658,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -18827,143 +18712,131 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
 # Quote evaled strings.
-for var in SHELL \
-ECHO \
-SED \
+for var in SED \
 GREP \
 EGREP \
 FGREP \
@@ -18987,6 +18860,8 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_wl \
 lt_prog_compiler_pic \
@@ -19016,13 +18891,12 @@
 libname_spec \
 library_names_spec \
 soname_spec \
-install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19049,9 +18923,9 @@
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19059,6 +18933,12 @@
     esac
 done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -19142,7 +19022,7 @@
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "text-utils/Makefile") CONFIG_FILES="$CONFIG_FILES text-utils/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -19180,7 +19060,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -19197,7 +19077,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -19211,18 +19091,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -19311,28 +19191,20 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -19360,7 +19232,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -19445,7 +19317,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -19458,7 +19330,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -19486,7 +19358,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -19513,7 +19385,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -19650,22 +19522,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -19676,19 +19548,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -19849,8 +19721,7 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -19898,12 +19769,6 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -19953,6 +19818,10 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
 
@@ -19974,9 +19843,6 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
 # A C compiler.
 LTCC=$lt_CC
 
@@ -19998,6 +19864,12 @@
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
 
@@ -20060,9 +19932,6 @@
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -20102,10 +19971,6 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -20365,7 +20230,7 @@
 func_dirname ()
 {
   # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
   if test "X$func_dirname_result" = "X${1}"; then
     func_dirname_result="${3}"
   else
@@ -20376,7 +20241,7 @@
 # func_basename file
 func_basename ()
 {
-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 }
 
 
@@ -20389,8 +20254,10 @@
 func_stripname ()
 {
   case ${2} in
-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
   esac
 }
 
@@ -20401,20 +20268,20 @@
 # func_opt_split
 func_opt_split ()
 {
-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
 }
 
 # func_lo2o object
 func_lo2o ()
 {
-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
 }
 
 # func_xform libobj-or-source
 func_xform ()
 {
-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
 }
 
 # func_arith arithmetic-term...
@@ -20587,7 +20454,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -20608,7 +20475,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- util-linux-2.19.1.orig/aclocal.m4
+++ util-linux-2.19.1/aclocal.m4
@@ -13,14 +13,13 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
-[m4_warning([this file was generated for autoconf 2.66.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
 # 
 # Copyright Â© 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -48,10 +47,7 @@
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -64,6 +60,7 @@
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
+		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -72,31 +69,34 @@
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
+  m4_ifval([$2], [$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
+
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -138,17 +138,16 @@
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	m4_default([$4], [AC_MSG_ERROR(
+	ifelse([$4], , [AC_MSG_ERROR(dnl
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -156,24 +155,25 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])
-        ])
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-        ])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	$3
+	ifelse([$3], , :, [$3])
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
--- util-linux-2.19.1.orig/configure.ac
+++ util-linux-2.19.1/configure.ac
@@ -734,6 +734,7 @@
 dnl and program can't be linked.
 dnl AC_CHECK_FUNC can't catch such errors since it's redefining
 dnl function prototype.
+AC_CHECK_HEADERS([fcntl.h linux/falloc.h sys/types.h unistd.h])
 AC_MSG_CHECKING([for valid fallocate() function])
 AC_LINK_IFELSE([
 AC_LANG_PROGRAM([[
--- util-linux-2.19.1.orig/Makefile.in
+++ util-linux-2.19.1/Makefile.in
@@ -211,8 +211,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -267,6 +265,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/docs/v2.15.1-ReleaseNotes
+++ util-linux-2.19.1/docs/v2.15.1-ReleaseNotes
@@ -0,0 +1,49 @@
+Util-linux-ng 2.15.1 Release Notes
+==================================
+
+Changes since v2.15
+-------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/
+
+build-sys:
+   - add UTIL_{SET,RESTORE}_FLAGS  [Karel Zak]
+   - fix "make -C" bug  [Karel Zak]
+   - fix blkid detection in configure.ac  [Karel Zak]
+   - fix blkid.h include for old e2fsprogs  [Karel Zak]
+cal:
+   - Highlight today even when month or year specified  [Rajeev V. Pillai]
+   - uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.  [Tom Prince]
+chrt:
+   - don't assume SCHED_BATCH and SCHED_IDLE exist  [Aurelien Jarno]
+docs:
+   - update AUTHORS file  [Karel Zak]
+fdisk:
+   - (and cfdisk) fix to be consistent about maximum heads  [Chris Webb]
+libblkid:
+   - fix reiserfs name  [Karel Zak]
+   - update man page  [Karel Zak]
+   - blkid_do_safeprobe() has to be tolerant to RAIDs  [Karel Zak]
+   - cleanup debug messages and return codes in blkid_do_probe()  [Karel Zak]
+   - fix "hangs forever with partition type mdraid"  [Karel Zak]
+   - make libuuid optional  [Karel Zak]
+losetup:
+   - handle symlinks in /dev/loop/  [Mike Frysinger]
+lscpu:
+   - fix cpuid code on x86/PIC  [Mike Frysinger]
+mount:
+   - fix undefined reference to `security_get_initial_context'  [Karel Zak]
+   - move MS_{PROPAGATION,BIND,MOVE} detection  [Karel Zak]
+   - use "none" fstype for MS_PROPAGATION mounts  [Karel Zak]
+po:
+   - merge changes  [Karel Zak]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+tests:
+   - add mdraid libblkid test  [Karel Zak]
+   - don't run some mount tests for non-root users  [Karel Zak]
+   - fix reiserfs test  [Karel Zak]
+   - fix script that creates lscpu dumps  [Karel Zak]
+   - move lscpu /proc and /sys dumps to tarballs  [Karel Zak]
+   - remove broken Xen dumps for lscpu  [Karel Zak]
+
--- util-linux-2.19.1.orig/docs/v2.14.2-ReleaseNotes
+++ util-linux-2.19.1/docs/v2.14.2-ReleaseNotes
@@ -0,0 +1,99 @@
+Util-linux-ng 2.14.2 Release Notes (9-Feb-2009)
+================================================
+
+ChangeLog between v2.14.1 and v2.14.2
+-------------------------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/
+
+build-sys:
+   - add -luuid to BLKID_LIBS  [Karel Zak]
+   - release++ (v2.14.2-rc1)  [Karel Zak]
+   - release++ (v2.14.2-rc2)  [Karel Zak]
+cfdisk:
+   - accept yes/no as fallback  [Matthias Koenig]
+chrt:
+   - output buglet when reporting scheduling class  [Karel Zak]
+   - support CFS SCHED_IDLE priority and document it  [Martin Steigerwald]
+docs:
+   - update AUTHORS file  [Karel Zak]
+   - update v2.14.2 ReleaseNotes  [Karel Zak]
+fdisk:
+   - add some missing includes  [Matthias Koenig]
+   - cannot create partition with starting beyond 1 TB  [Karel Zak]
+   - fix man page typo  [Karel Zak]
+   - remove obsolete information from man page  [Karel Zak]
+   - remove unnecessary gettext call  [Karel Zak]
+   - several strings without gettext calls  [Pedro Ribeiro]
+   - support +cylinder notation  [Karel Zak]
+hwclock:
+   - remove "cli" and "sti" from i386 CMOS code  [Karel Zak]
+   - remove x86_64-specific bogon  [David Brownell]
+include:
+   - use __BYTE_ORDER rather than AC specific WORDS_BIGENDIAN  [Karel Zak]
+ionice:
+   - Extend the man page to explain the "none" class and cpu-nice inheritance  [Jakob Unterwurzacher]
+   - a little cleanup of "none" description  [Karel Zak]
+ldattach:
+   - don't compile for non-linux systems  [Samuel Thibault]
+lib:
+   - add __BYTE_ORDER to md5.c  [Karel Zak]
+logger:
+   - several strings without gettext calls  [Pedro Ribeiro]
+login:
+   - fix compiler warning (int32 time() arg)  [Karel Zak]
+   - fix warning "dereferencing type-punned pointer will break strict-aliasing rules"  [Karel Zak]
+losetup:
+   - add warning about read-only mode  [Karel Zak]
+   - missing EBUSY error hint message  [Karel Zak]
+   - several strings without gettext strings  [Pedro Ribeiro]
+   - try to set up loop readonly if EACCES  [Matthias Koenig]
+mkfs.cramfs:
+   - several strings without gettext calls  [Pedro Ribeiro]
+mkfs.minix:
+   - fix size detection  [Matthias Koenig]
+more:
+   - dont use a.out.h  [Mike Frysinger]
+   - minor fixes to magic()  [James Youngman]
+mount:
+   - add i_version support  [Karel Zak]
+   - add info about /proc/mounts to mount.1  [Karel Zak]
+   - add info about semantics of read-only mount to mount.8  [Karel Zak]
+   - add rootcontext= SELinux mount option  [Karel Zak]
+   - clean up SPEC canonicalization  [Karel Zak]
+   - cleans up mount(8) troff markup  [Sam Varshavchik]
+   - create separate section for fs-independent options in mount.8  [Karel Zak]
+   - finalize support of quoted LABELs/UUIDs  [Karel Zak]
+   - fix mount_static_LDADD  [Karel Zak]
+   - fix typo  [Guan Xin]
+   - fix typo  [Karel Zak]
+   - fix typo in volume_id code  [Karel Zak]
+   - make file_t SELinux warning optional and shorter  [Karel Zak]
+   - mtab created multiple times with -a option  [Karel Zak]
+   - remove link to namesys.com  [Karel Zak]
+   - remove spurious newline from mount.8  [Mike Frysinger]
+   - reorder list of options in mount.8  [Karel Zak]
+   - retry on ENOMEDIUM  [Matthias Koenig]
+   - suggest to use blockdev --setro rather than losetup  [Karel Zak]
+   - sundries.h add klibc support  [maximilian attems]
+   - sync FAT info in mount.8 with Documentation/filesystems/vfat.txt  [Karel Zak]
+   - sync tmpfs info in mount.8 with Documentation/filesystems/tmpfs.txt  [Karel Zak]
+   - use subsections in mount.8 DESCRIPTION  [Karel Zak]
+   - warn on "file_t" selinux context  [Karel Zak]
+po:
+   - merge changes  [Karel Zak]
+   - update cs.po (from translationproject.org)  [Petr Pisar]
+   - update fr.po (from translationproject.org)  [Nicolas Provost]
+   - update ja.po (from translationproject.org)  [Makoto Kato]
+   - update nl.po (from translationproject.org)  [Benno Schulenberg]
+   - update pt_BR.po (from translationproject.org)  [Rodrigo Stulzer Lopes]
+   - update sv.po (from translationproject.org)  [Daniel Nylander]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+readprofile:
+   - several strings without gettext calls  [Pedro Ribeiro]
+setterm:
+   - fix -blank man page  [Karel Zak]
+
+- refresh gitignore  [Karel Zak]
+- use getpagesize()  [maximilian attems]
--- util-linux-2.19.1.orig/docs/v2.14.1-ReleaseNotes
+++ util-linux-2.19.1/docs/v2.14.1-ReleaseNotes
@@ -0,0 +1,55 @@
+Util-linux-ng 2.14.1 Release Notes (10-Aug-2008)
+================================================
+
+ChangeLog between v2.14 and v2.14.1
+-----------------------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/
+
+build-sys:
+   - cleanup sys-utils/Makefile.am  [Karel Zak]
+   - fix dmesg.1 installation  [Karel Zak]
+   - release++ (v2.14.1-rc1)  [Karel Zak]
+   - release++ (v2.14.1-rc2)  [Karel Zak]
+   - tgets is not in ncurses but in tinfo  [Arkadiusz Miskiewicz]
+docs:
+   - update AUTHORS file  [Karel Zak]
+   - update v2.14.1 ReleaseNotes  [Karel Zak]
+fdisk:
+   - don't check for GPT when asked for disk size only  [Karel Zak]
+hwclock:
+   - omit warning about drift if --noadjfile given  [Matthias Koenig]
+   - unshadow a diagnostic printf  [Kalev Soikonen]
+ipcs:
+   - ungettextize the spacing of the table headers  [Benno Schulenberg]
+losetup:
+   - remove unnecessary minor number check  [Karel Zak]
+mount:
+   - add docs about utf8=0 for vfat  [Karel Zak]
+   - add fallback for versionsort()  [Karel Zak]
+   - add info about tz=UTC option for FAT to mount.8  [Karel Zak]
+   - add norealtime to mount.8  [Karel Zak]
+po:
+   - add zh_CN.po (from translationproject.org)  [Ray Wang]
+   - merge changes  [Karel Zak]
+   - update cs.po (from translationproject.org)  [Petr Pisar]
+   - update fi.po (from translationproject.org)  [Lauri Nurmi]
+   - update id.po (from translationproject.org)  [Arif E. Nugroho]
+   - update nl.po (from translationproject.org)  [Benno Schulenberg]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+   - update zh_CN.po (from translationproject.org)  [Ray Wang]
+rtcwake:
+   - cleanup return codes  [Karel Zak]
+   - prefer RTC_WKALM_SET over RTC_ALM_SET  [Gabriel Burt]
+scriptreplay:
+   - new implementation is out-of-sync  [Karel Zak]
+selinux:
+   - is_selinux_enabled() returns 0, 1 and -1  [Karel Zak]
+sfdisk:
+   - print version should end with a newline  [Denis ChengRq]
+umount:
+   - improve "-d" option for autoclear loops  [Karel Zak]
+write:
+   - doesn't check for tty group  [Karel Zak]
+
--- util-linux-2.19.1.orig/getopt/getopt.1
+++ util-linux-2.19.1/getopt/getopt.1
@@ -424,8 +424,8 @@
 .SH EXAMPLES
 Example scripts for (ba)sh and (t)csh are provided with the
 .BR getopt (1)
-distribution, and are optionally installed in
-.BR /usr/share/getopt .
+distribution, and are optionally installed in 
+.BR /usr/share/doc/util-linux/examples .
 
 .SH ENVIRONMENT
 .IP POSIXLY_CORRECT
--- util-linux-2.19.1.orig/getopt/Makefile.in
+++ util-linux-2.19.1/getopt/Makefile.in
@@ -202,8 +202,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -258,6 +256,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/Makefile.in
@@ -208,8 +208,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -264,6 +262,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/docs/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/docs/Makefile.in
@@ -160,8 +160,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -216,6 +214,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/samples/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/samples/Makefile.in
@@ -182,8 +182,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -238,6 +236,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/src/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/src/Makefile.in
@@ -251,8 +251,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -307,6 +305,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/src/superblocks/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/src/superblocks/Makefile.in
@@ -179,8 +179,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -235,6 +233,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/src/topology/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/src/topology/Makefile.in
@@ -182,8 +182,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -238,6 +236,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/blkid/src/partitions/Makefile.in
+++ util-linux-2.19.1/shlibs/blkid/src/partitions/Makefile.in
@@ -173,8 +173,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -229,6 +227,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/uuid/Makefile.in
+++ util-linux-2.19.1/shlibs/uuid/Makefile.in
@@ -204,8 +204,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -260,6 +258,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/uuid/man/Makefile.in
+++ util-linux-2.19.1/shlibs/uuid/man/Makefile.in
@@ -167,8 +167,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -223,6 +221,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/uuid/src/Makefile.in
+++ util-linux-2.19.1/shlibs/uuid/src/Makefile.in
@@ -209,8 +209,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -265,6 +263,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/mount/Makefile.in
+++ util-linux-2.19.1/shlibs/mount/Makefile.in
@@ -205,8 +205,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -261,6 +259,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/mount/docs/Makefile.in
+++ util-linux-2.19.1/shlibs/mount/docs/Makefile.in
@@ -160,8 +160,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -216,6 +214,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/mount/samples/Makefile.in
+++ util-linux-2.19.1/shlibs/mount/samples/Makefile.in
@@ -172,8 +172,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -228,6 +226,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/shlibs/mount/src/Makefile.in
+++ util-linux-2.19.1/shlibs/mount/src/Makefile.in
@@ -206,8 +206,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -262,6 +260,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/man/ru/Makefile.in
+++ util-linux-2.19.1/man/ru/Makefile.in
@@ -167,8 +167,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -223,6 +221,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@/ru
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/login-utils/agetty.c
+++ util-linux-2.19.1/login-utils/agetty.c
@@ -37,7 +37,11 @@
 #include "pathnames.h"
 #include "c.h"
 
-#ifdef __linux__
+#if defined(__FreeBSD_kernel__)
+#include <pty.h>
+#endif
+
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
 #include <sys/param.h>
 #define USE_SYSLOG
 #endif
@@ -283,7 +287,7 @@
 
     parse_args(argc, argv, &options);
 
-#ifdef __linux__
+#if defined (__linux__) || defined(__FreeBSD_kernel__)
 	setsid();
 #endif
 	
@@ -677,6 +681,13 @@
     if (tcgetattr(0, tp) < 0)
 	error("%s: tcgetattr: %m", tty);
 
+     /*
+     * login_tty: steal tty from other process group.
+     */
+#if defined(__FreeBSD_kernel__)
+     login_tty (0);
+#endif
+
     /*
      * It seems to be a terminal. Set proper protections and ownership. Mode
      * 0622 is suitable for SYSV <4 because /bin/login does not change
--- util-linux-2.19.1.orig/login-utils/Makefile.am
+++ util-linux-2.19.1/login-utils/Makefile.am
@@ -12,6 +12,7 @@
 sbin_PROGRAMS += agetty
 dist_man_MANS += agetty.8
 agetty_SOURCES = agetty.c
+agetty_LDADD = -lutil
 if !HAVE_LANGINFO
 agetty_SOURCES += $(top_srcdir)/lib/langinfo.c
 endif
--- util-linux-2.19.1.orig/login-utils/Makefile.in
+++ util-linux-2.19.1/login-utils/Makefile.in
@@ -102,7 +102,7 @@
 @BUILD_AGETTY_TRUE@am_agetty_OBJECTS = agetty.$(OBJEXT) \
 @BUILD_AGETTY_TRUE@	$(am__objects_1)
 agetty_OBJECTS = $(am_agetty_OBJECTS)
-agetty_LDADD = $(LDADD)
+agetty_DEPENDENCIES =
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -318,8 +318,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -374,6 +372,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -430,6 +429,7 @@
 	$(am__append_20) $(am__append_22)
 EXTRA_DIST = README.getty  README.modems-with-agetty  README.poeigl
 @BUILD_AGETTY_TRUE@agetty_SOURCES = agetty.c $(am__append_3)
+@BUILD_AGETTY_TRUE@agetty_LDADD = -lutil
 
 # login, chfn and chsh libs
 @BUILD_LOGIN_UTILS_TRUE@login_ldadd_common = $(am__append_10) \
--- util-linux-2.19.1.orig/include/strverscmp.h
+++ util-linux-2.19.1/include/strverscmp.h
@@ -0,0 +1,7 @@
+#ifndef STRVERSCMP_H
+#define STRVERSCMP_H
+
+extern int strverscmp (const char *s1, const char *s2);
+extern int versionsort (const void *a, const void *b);
+
+#endif
--- util-linux-2.19.1.orig/include/Makefile.in
+++ util-linux-2.19.1/include/Makefile.in
@@ -146,8 +146,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -202,6 +200,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/fdisk/Makefile.in
+++ util-linux-2.19.1/fdisk/Makefile.in
@@ -322,8 +322,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -378,6 +376,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/fdisk/cfdisk.8
+++ util-linux-2.19.1/fdisk/cfdisk.8
@@ -13,7 +13,7 @@
 .\" " for hilit mode
 .TH CFDISK 8 "3 June 1995" "The BOGUS Linux Release" "Linux Programmer's Manual"
 .SH NAME
-cfdisk \- Curses based disk partition table manipulator for Linux
+cfdisk \- Curses/slang based disk partition table manipulator for Linux
 .SH SYNOPSIS
 .B cfdisk
 .RB [ \-agvz ]
@@ -28,7 +28,7 @@
 .RI [ device ]
 .SH DESCRIPTION
 .B cfdisk
-is a curses based program for partitioning any hard disk drive.
+is a curses/slang based program for partitioning any hard disk drive.
 Typical values of the
 .I device
 argument are:
--- util-linux-2.19.1.orig/misc-utils/whereis.c
+++ util-linux-2.19.1/misc-utils/whereis.c
@@ -77,10 +77,8 @@
    "/usr/TeX/bin",
    "/usr/tex/bin",
    "/usr/interviews/bin/LINUX",
-
-   "/usr/X11R6/bin",
+   
    "/usr/X386/bin",
-   "/usr/bin/X11",
    "/usr/X11/bin",
    "/usr/X11R5/bin",
 
--- util-linux-2.19.1.orig/misc-utils/Makefile.in
+++ util-linux-2.19.1/misc-utils/Makefile.in
@@ -381,8 +381,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -437,6 +435,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/text-utils/Makefile.in
+++ util-linux-2.19.1/text-utils/Makefile.in
@@ -242,8 +242,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -298,6 +296,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/disk-utils/Makefile.in
+++ util-linux-2.19.1/disk-utils/Makefile.in
@@ -321,8 +321,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -377,6 +375,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/hwclock/hwclock.8
+++ util-linux-2.19.1/hwclock/hwclock.8
@@ -607,8 +607,6 @@
 .SH FILES
 .I /etc/adjtime
 .I /usr/share/zoneinfo/
-.RI ( /usr/lib/zoneinfo
-on old systems)
 .I /dev/rtc
 .I /dev/rtc0
 .I /dev/port
@@ -622,6 +620,8 @@
 .BR settimeofday (2),
 .BR crontab (1),
 .BR tzset (3)
+.BR /etc/init.d/hwclock.sh,
+.BR /usr/share/doc/util-linux/README.Debian.hwclock
 
 .SH AUTHORS
 Written by Bryan Henderson, September 1996 (bryanh@giraffe-data.com),
--- util-linux-2.19.1.orig/hwclock/hwclock.c
+++ util-linux-2.19.1/hwclock/hwclock.c
@@ -1107,8 +1107,18 @@
   if (!ur)
 	  ur = probe_for_kd_clock();
 
+  /*
+   * This final clause is a really bad idea on x86/AT PCs. You run the
+   * risk of a race condition with another copy of hwclock
+   * that already has /dev/rtc open. The fallback case on
+   * x86 is to then raise I/O priviledge level and access
+   * the RTC CMOS directly using I/O instructions. Simultaneous
+   * access like that can really hose the RTC.
+   */
+#if !defined(__i386__)
   if (!ur && !user_requests_ISA)
 	  ur = probe_for_cmos_clock();
+#endif
 
   if (debug) {
 	  if (ur)
--- util-linux-2.19.1.orig/hwclock/Makefile.in
+++ util-linux-2.19.1/hwclock/Makefile.in
@@ -201,8 +201,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -257,6 +255,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/schedutils/Makefile.in
+++ util-linux-2.19.1/schedutils/Makefile.in
@@ -222,8 +222,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -278,6 +276,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/sys-utils/setarch.c
+++ util-linux-2.19.1/sys-utils/setarch.c
@@ -258,6 +258,10 @@
     argv[0] = argv[-1];      /* for getopt_long() to get the program name */
     if (!strcmp(p, "-h") || !strcmp(p, "--help"))
       show_help();
+  #if defined(__sparc64__) || defined(__sparc__)
+  } else if (!strcmp(p,"sparc64")) {
+      options |= ADDR_LIMIT_32BIT;
+  #endif
   }
   #if defined(__sparc64__) || defined(__sparc__)
    if (!strcmp(p, "sparc32bash")) {
--- util-linux-2.19.1.orig/sys-utils/Makefile.in
+++ util-linux-2.19.1/sys-utils/Makefile.in
@@ -326,8 +326,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -382,6 +380,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/sys-utils/ipcs.c
+++ util-linux-2.19.1/sys-utils/ipcs.c
@@ -523,8 +523,10 @@
 
 	case STATUS:
 		printf (_("------ Messages Status --------\n"));
+#ifndef __FreeBSD_kernel__
 		printf (_("allocated queues = %d\n"), msginfo.msgpool);
 		printf (_("used headers = %d\n"), msginfo.msgmap);
+#endif
 		printf (_("used space = %d bytes\n"), msginfo.msgtql);
 		return;
 
--- util-linux-2.19.1.orig/tests/Makefile.in
+++ util-linux-2.19.1/tests/Makefile.in
@@ -182,8 +182,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -238,6 +236,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/tests/helpers/Makefile.in
+++ util-linux-2.19.1/tests/helpers/Makefile.in
@@ -184,8 +184,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -240,6 +238,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/lib/strverscmp.c
+++ util-linux-2.19.1/lib/strverscmp.c
@@ -0,0 +1,120 @@
+/* Compare strings while treating digits characters numerically.
+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <string.h>
+#include <ctype.h>
+#include <dirent.h>
+
+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
+           fractionnal parts, S_Z: idem but with leading Zeroes only */
+#define  S_N    0x0
+#define  S_I    0x4
+#define  S_F    0x8
+#define  S_Z    0xC
+
+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
+#define  CMP    2
+#define  LEN    3
+
+
+/* Compare S1 and S2 as strings holding indices/version numbers,
+   returning less than, equal to or greater than zero if S1 is less than,
+   equal to or greater than S2 (for more info, see the texinfo doc).
+*/
+
+int
+strverscmp (s1, s2)
+     const char *s1;
+     const char *s2;
+{
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+  int state;
+  int diff;
+
+  /* Symbol(s)    0       [1-9]   others  (padding)
+     Transition   (10) 0  (01) d  (00) x  (11) -   */
+  static const unsigned int next_state[] =
+  {
+      /* state    x    d    0    - */
+      /* S_N */  S_N, S_I, S_Z, S_N,
+      /* S_I */  S_N, S_I, S_I, S_I,
+      /* S_F */  S_N, S_F, S_F, S_F,
+      /* S_Z */  S_N, S_F, S_Z, S_Z
+  };
+
+  static const int result_type[] =
+  {
+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
+
+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
+                 -1,  CMP, CMP, CMP
+  };
+
+  if (p1 == p2)
+    return 0;
+
+  c1 = *p1++;
+  c2 = *p2++;
+  /* Hint: '0' is a digit too.  */
+  state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
+
+  while ((diff = c1 - c2) == 0 && c1 != '\0')
+    {
+      state = next_state[state];
+      c1 = *p1++;
+      c2 = *p2++;
+      state |= (c1 == '0') + (isdigit (c1) != 0);
+    }
+
+  state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
+
+  switch (state)
+  {
+    case CMP:
+      return diff;
+
+    case LEN:
+      while (isdigit (*p1++))
+	if (!isdigit (*p2++))
+	  return 1;
+
+      return isdigit (*p2) ? -1 : diff;
+
+    default:
+      return state;
+  }
+}
+
+
+int
+versionsort (const void *a, const void *b)
+{
+  return strverscmp ((*(const struct dirent **) a)->d_name,
+		     (*(const struct dirent **) b)->d_name);
+}
--- util-linux-2.19.1.orig/lib/blkdev.c
+++ util-linux-2.19.1/lib/blkdev.c
@@ -20,6 +20,10 @@
 #include <sys/disk.h>
 #endif
 
+#ifdef __FreeBSD_kernel__
+#include <sys/disk.h>
+#endif
+
 #include "blkdev.h"
 #include "linux_version.h"
 
--- util-linux-2.19.1.orig/lib/Makefile.in
+++ util-linux-2.19.1/lib/Makefile.in
@@ -213,8 +213,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -269,6 +267,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/partx/Makefile.in
+++ util-linux-2.19.1/partx/Makefile.in
@@ -224,8 +224,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -280,6 +278,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/fsck/Makefile.in
+++ util-linux-2.19.1/fsck/Makefile.in
@@ -208,8 +208,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -264,6 +262,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/m4/ulonglong.m4
+++ util-linux-2.19.1/m4/ulonglong.m4
@@ -0,0 +1,25 @@
+# ulonglong.m4 serial 3
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the 'unsigned long long' type.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/intdiv0.m4
+++ util-linux-2.19.1/m4/intdiv0.m4
@@ -0,0 +1,72 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+        [
+          # Guess based on the CPU.
+          case "$host_cpu" in
+            alpha* | i[34567]86 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
+          esac
+        ])
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+    [Define if integer division by zero raises signal SIGFPE.])
+])
--- util-linux-2.19.1.orig/m4/isc-posix.m4
+++ util-linux-2.19.1/m4/isc-posix.m4
@@ -0,0 +1,26 @@
+# isc-posix.m4 serial 2 (gettext-0.11.2)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
+
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)
--- util-linux-2.19.1.orig/m4/codeset.m4
+++ util-linux-2.19.1/m4/codeset.m4
@@ -0,0 +1,23 @@
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
--- util-linux-2.19.1.orig/m4/inttypes_h.m4
+++ util-linux-2.19.1/m4/inttypes_h.m4
@@ -0,0 +1,28 @@
+# inttypes_h.m4 serial 5 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_inttypes_h=yes,
+    jm_ac_cv_header_inttypes_h=no)])
+  if test $jm_ac_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
--- util-linux-2.19.1.orig/m4/wint_t.m4
+++ util-linux-2.19.1/m4/wint_t.m4
@@ -0,0 +1,22 @@
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/lt~obsolete.m4
+++ util-linux-2.19.1/m4/lt~obsolete.m4
@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 5 lt~obsolete.m4
+# serial 4 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,6 +77,7 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -89,10 +90,3 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
--- util-linux-2.19.1.orig/m4/libtool.m4
+++ util-linux-2.19.1/m4/libtool.m4
@@ -1,8 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +10,7 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -39,7 +37,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 57 LT_INIT
+# serial 56 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -68,7 +66,6 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -85,8 +82,6 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -123,7 +118,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 ])
 
 
@@ -143,9 +138,6 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -187,6 +179,7 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -200,6 +193,23 @@
   ;;
 esac
 
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -240,28 +250,6 @@
 ])# _LT_SETUP
 
 
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -420,7 +408,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -430,7 +418,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -529,20 +517,12 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -553,9 +533,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -563,38 +543,16 @@
     esac
 done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -604,11 +562,20 @@
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
 
-cat >>"$CONFIG_LT" <<\_LTEOF
 lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -634,7 +601,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -679,13 +646,15 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
 ])# LT_OUTPUT
 
 
@@ -862,13 +831,11 @@
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -973,31 +940,6 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1025,7 +967,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test "$DSYMUTIL" != ":"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -1045,11 +987,7 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -1057,7 +995,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
+    output_verbose_link_cmd=echo
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1103,65 +1041,170 @@
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
 else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
 fi
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
 
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
 
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
 
+	  if test "$prev" != 'sed 50q "[$]0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
@@ -1193,7 +1236,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -1345,19 +1388,10 @@
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1382,15 +1416,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -1430,7 +1464,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1493,11 +1527,6 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -1562,8 +1591,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -1614,7 +1643,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
+[#line __oline__ "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1655,13 +1684,7 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
-#endif
-
-void fnord () { int i=42; }
+void fnord() { int i=42;}
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1670,11 +1693,7 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
   else
@@ -1850,16 +1869,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2018,7 +2037,6 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2027,23 +2045,16 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -2056,7 +2067,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2076,13 +2087,7 @@
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2170,7 +2175,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -2223,12 +2228,23 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -2328,19 +2344,6 @@
   hardcode_into_libs=yes
   ;;
 
-haiku*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@ -2383,10 +2386,8 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
   postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
@@ -2453,35 +2454,26 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-
   # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2493,6 +2485,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -2713,8 +2717,6 @@
     The last name is the one that the linker finds with -lNAME]])
 _LT_DECL([], [soname_spec], [1],
     [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
 _LT_DECL([], [postinstall_cmds], [2],
     [Command to use after installation of a shared archive])
 _LT_DECL([], [postuninstall_cmds], [2],
@@ -2827,7 +2829,6 @@
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
@@ -2957,8 +2958,8 @@
     fi
     ;;
 esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
@@ -3010,18 +3011,16 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc*)
+cegcc)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3051,10 +3050,6 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -3063,11 +3058,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3093,7 +3088,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3231,19 +3226,7 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -3256,13 +3239,13 @@
 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   [lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3285,7 +3268,7 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3313,12 +3296,7 @@
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3335,7 +3313,6 @@
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -3461,7 +3438,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -3623,11 +3600,6 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -3766,8 +3738,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3797,7 +3769,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -3829,7 +3801,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC* | sunCC*)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3933,12 +3905,6 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -3981,13 +3947,6 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
-      ;;
-    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -4051,7 +4010,7 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+      pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4063,26 +4022,26 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
 	esac
 	;;
       esac
@@ -4113,7 +4072,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+      f77* | f90* | f95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4223,10 +4182,8 @@
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
@@ -4237,6 +4194,9 @@
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -4301,36 +4261,13 @@
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -4364,12 +4301,11 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
 _LT_EOF
       fi
@@ -4405,7 +4341,6 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4427,11 +4362,6 @@
       fi
       ;;
 
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4461,12 +4391,11 @@
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4477,17 +4406,13 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -4503,17 +4428,17 @@
         fi
 
 	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
+	xlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4522,7 +4447,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -4634,10 +4559,8 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -4699,6 +4622,7 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -4726,7 +4650,7 @@
         # empty executable.
         _LT_SYS_MODULE_PATH_AIX
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -4741,13 +4665,8 @@
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -4786,7 +4705,7 @@
       # Tell ltmain to make .dll files, not .so files.
       shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
@@ -4853,7 +4772,7 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -4872,7 +4791,7 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -4893,14 +4812,7 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
@@ -4928,19 +4840,19 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
         save_LDFLAGS="$LDFLAGS"
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
         AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
         )
         LDFLAGS="$save_LDFLAGS"
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4949,7 +4861,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -5002,17 +4914,17 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5022,13 +4934,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5219,38 +5131,36 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
       ;;
     esac
   fi
@@ -5420,14 +5330,14 @@
 ])# _LT_LANG_C_CONFIG
 
 
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
@@ -5435,6 +5345,22 @@
 else
   _lt_caught_CXX_error=yes
 fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5456,8 +5382,6 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5560,7 +5484,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
     else
       GXX=no
@@ -5672,7 +5596,7 @@
           _LT_SYS_MODULE_PATH_AIX
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5687,13 +5611,8 @@
 	    # -berok will link without error, but may produce a broken library.
 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -5726,7 +5645,6 @@
         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
         # as there is no search path for DLLs.
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
         _LT_TAGVAR(always_export_symbols, $1)=no
         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5787,11 +5705,6 @@
       gnu*)
         ;;
 
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
       hpux9*)
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -5816,7 +5729,7 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
             ;;
           *)
             if test "$GXX" = yes; then
@@ -5881,7 +5794,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -5924,7 +5837,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -5935,9 +5848,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5966,7 +5879,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6003,26 +5916,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
 		$RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 and above use weak symbols
+	    *) # Version 6 will use weak symbols
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -6030,7 +5943,7 @@
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -6049,9 +5962,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
-	  xl* | mpixl* | bgxl*)
+	  xl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6071,13 +5984,13 @@
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
+	      output_verbose_link_cmd='echo'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6146,7 +6059,7 @@
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=func_echo_all
+	  output_verbose_link_cmd=echo
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6181,15 +6094,15 @@
 	    case $host in
 	      osf3*)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
@@ -6205,17 +6118,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6225,7 +6138,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6261,7 +6174,7 @@
 
       solaris*)
         case $cc_basename in
-          CC* | sunCC*)
+          CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6282,7 +6195,7 @@
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='func_echo_all'
+	    output_verbose_link_cmd='echo'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6309,7 +6222,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -6320,7 +6233,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6374,10 +6287,6 @@
           CC*)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6624,7 +6533,7 @@
 
 solaris*)
   case $cc_basename in
-  CC* | sunCC*)
+  CC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -6668,16 +6577,32 @@
 ])# _LT_SYS_HIDDEN_LIBDEPS
 
 
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6696,8 +6621,6 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6797,17 +6720,32 @@
 ])# _LT_LANG_F77_CONFIG
 
 
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6826,8 +6764,6 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6973,8 +6909,6 @@
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -7342,7 +7276,7 @@
 func_dirname ()
 {
   # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
   if test "X$func_dirname_result" = "X${1}"; then
     func_dirname_result="${3}"
   else
@@ -7353,7 +7287,7 @@
 # func_basename file
 func_basename ()
 {
-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 }
 
 dnl func_dirname_and_basename
@@ -7369,8 +7303,10 @@
 func_stripname ()
 {
   case ${2} in
-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
   esac
 }
 
@@ -7381,20 +7317,20 @@
 # func_opt_split
 func_opt_split ()
 {
-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
 }
 
 # func_lo2o object
 func_lo2o ()
 {
-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
 }
 
 # func_xform libobj-or-source
 func_xform ()
 {
-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
 }
 
 # func_arith arithmetic-term...
--- util-linux-2.19.1.orig/m4/uintmax_t.m4
+++ util-linux-2.19.1/m4/uintmax_t.m4
@@ -0,0 +1,32 @@
+# uintmax_t.m4 serial 7 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/stdint_h.m4
+++ util-linux-2.19.1/m4/stdint_h.m4
@@ -0,0 +1,28 @@
+# stdint_h.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_stdint_h=yes,
+    jm_ac_cv_header_stdint_h=no)])
+  if test $jm_ac_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
--- util-linux-2.19.1.orig/m4/signed.m4
+++ util-linux-2.19.1/m4/signed.m4
@@ -0,0 +1,19 @@
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([bh_C_SIGNED],
+[
+  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+  if test $bh_cv_c_signed = no; then
+    AC_DEFINE(signed, ,
+              [Define to empty if the C compiler doesn't support this keyword.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/size_max.m4
+++ util-linux-2.19.1/m4/size_max.m4
@@ -0,0 +1,61 @@
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/lcmessage.m4
+++ util-linux-2.19.1/m4/lcmessage.m4
@@ -0,0 +1,32 @@
+# lcmessage.m4 serial 3 (gettext-0.11.3)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
+
+# Check whether LC_MESSAGES is available in <locale.h>.
+
+AC_DEFUN([AM_LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+  if test $am_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/wchar_t.m4
+++ util-linux-2.19.1/m4/wchar_t.m4
@@ -0,0 +1,22 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/longlong.m4
+++ util-linux-2.19.1/m4/longlong.m4
@@ -0,0 +1,25 @@
+# longlong.m4 serial 4
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/intmax.m4
+++ util-linux-2.19.1/m4/intmax.m4
@@ -0,0 +1,32 @@
+# intmax.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#include <stddef.h> 
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE(HAVE_INTMAX_T, 1,
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/inttypes.m4
+++ util-linux-2.19.1/m4/inttypes.m4
@@ -0,0 +1,27 @@
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/inttypes-pri.m4
+++ util-linux-2.19.1/m4/inttypes-pri.m4
@@ -0,0 +1,32 @@
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/glibc21.m4
+++ util-linux-2.19.1/m4/glibc21.m4
@@ -0,0 +1,32 @@
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
--- util-linux-2.19.1.orig/m4/ltversion.m4
+++ util-linux-2.19.1/m4/ltversion.m4
@@ -9,15 +9,15 @@
 
 # Generated from ltversion.in.
 
-# serial 3175 ltversion.m4
+# serial 3017 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.10])
-m4_define([LT_PACKAGE_REVISION], [1.3175])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.10'
-macro_revision='1.3175'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
--- util-linux-2.19.1.orig/m4/printf-posix.m4
+++ util-linux-2.19.1/m4/printf-posix.m4
@@ -0,0 +1,46 @@
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+   dollar expansion (possibly an autoconf bug).  */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+  sprintf (buf, format, 33, 55);
+  return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])
--- util-linux-2.19.1.orig/m4/ltoptions.m4
+++ util-linux-2.19.1/m4/ltoptions.m4
@@ -1,14 +1,13 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 7 ltoptions.m4
+# serial 6 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -126,7 +125,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -134,13 +133,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
--- util-linux-2.19.1.orig/m4/longdouble.m4
+++ util-linux-2.19.1/m4/longdouble.m4
@@ -0,0 +1,30 @@
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])
--- util-linux-2.19.1.orig/m4/xsize.m4
+++ util-linux-2.19.1/m4/xsize.m4
@@ -0,0 +1,14 @@
+# xsize.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_CHECK_HEADERS(stdint.h)
+])
--- util-linux-2.19.1.orig/po/Makevars.template
+++ util-linux-2.19.1/po/Makevars.template
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
--- util-linux-2.19.1.orig/po/POTFILES.in
+++ util-linux-2.19.1/po/POTFILES.in
@@ -13,9 +13,9 @@
 disk-utils/raw.c
 disk-utils/swaplabel.c
 fdisk/cfdisk.c
+fdisk/fdisk.c
 fdisk/fdiskaixlabel.c
 fdisk/fdiskbsdlabel.c
-fdisk/fdisk.c
 fdisk/fdiskmaclabel.c
 fdisk/fdisksgilabel.c
 fdisk/fdisksunlabel.c
@@ -46,6 +46,7 @@
 lib/md5.c
 lib/setproctitle.c
 lib/strutils.c
+lib/strverscmp.c
 lib/tt.c
 lib/wholedisk.c
 login-utils/agetty.c
@@ -89,6 +90,7 @@
 mount/lomount.c
 mount/mount.c
 mount/mount_mntent.c
+mount/rmd160.c
 mount/sundries.c
 mount/swapon.c
 mount/umount.c
--- util-linux-2.19.1.orig/simpleinit/Makefile.in
+++ util-linux-2.19.1/simpleinit/Makefile.in
@@ -204,8 +204,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -260,6 +258,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- util-linux-2.19.1.orig/mount/Makefile.am
+++ util-linux-2.19.1/mount/Makefile.am
@@ -7,7 +7,7 @@
 dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
 
 # generic sources for all programs (mount, umount, losetup)
-srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h
+srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c
 
 # generic header for mount and umount
 hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
--- util-linux-2.19.1.orig/mount/losetup.8
+++ util-linux-2.19.1/mount/losetup.8
@@ -99,6 +99,11 @@
 .IP "\fB\-j, \-\-associated \fIfile\fP"
 show status of all loop devices associated with given
 .I file
+.IP "\fB\-k, \-\-keybits \fInum\fP"
+set the number of bits to use in key to \fInum\fP.
+.IP "\fB\-N, \-\-nohashpass\fP"
+Do not hash the password.  By default, Debian systems run the password through a
+hash function, non-Debian systems tend not to.
 .IP "\fB\-o, \-\-offset \fIoffset\fP"
 the data start is moved \fIoffset\fP bytes into the specified file or
 device
@@ -169,6 +174,8 @@
 .fi
 .SH RESTRICTION
 DES encryption is painfully slow. On the other hand, XOR is terribly weak.
+Both are insecure nowadays. Some ciphers may require a licence for you to be
+allowed to use them.
 
 Cryptoloop is deprecated in favor of dm-crypt. For more details see
 .BR cryptsetup (8).
--- util-linux-2.19.1.orig/mount/rmd160.c
+++ util-linux-2.19.1/mount/rmd160.c
@@ -0,0 +1,532 @@
+/* rmd160.c  -	RIPE-MD160
+ *	Copyright (C) 1998 Free Software Foundation, Inc.
+ */
+
+/* This file was part of GnuPG. Modified for use within the Linux
+ * mount utility by Marc Mutz <Marc@Mutz.com>. None of this code is
+ * by myself. I just removed everything that you don't need when all
+ * you want to do is to use rmd160_hash_buffer().
+ * My comments are marked with (mm).  */
+
+/* GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */
+
+#include <string.h> /* (mm) for memcpy */
+#include <endian.h> /* (mm) for BIG_ENDIAN and BYTE_ORDER */
+#include "rmd160.h"
+
+/* (mm) these are used by the original GnuPG file. In order to modify
+ * that file not too much, we keep the notations. maybe it would be
+ * better to include linux/types.h and typedef __u32 to u32 and __u8
+ * to byte?  */
+typedef unsigned int u32; /* taken from e.g. util-linux's minix.h */
+typedef unsigned char byte;
+
+typedef struct {
+    u32  h0,h1,h2,h3,h4;
+    u32  nblocks;
+    byte buf[64];
+    int  count;
+} RMD160_CONTEXT;
+
+/****************
+ * Rotate a 32 bit integer by n bytes
+ */
+#if defined(__GNUC__) && defined(__i386__)
+static inline u32
+rol( u32 x, int n)
+{
+	__asm__("roll %%cl,%0"
+		:"=r" (x)
+		:"0" (x),"c" (n));
+	return x;
+}
+#else
+  #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+#endif
+
+/*********************************
+ * RIPEMD-160 is not patented, see (as of 25.10.97)
+ *   http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
+ * Note that the code uses Little Endian byteorder, which is good for
+ * 386 etc, but we must add some conversion when used on a big endian box.
+ *
+ *
+ * Pseudo-code for RIPEMD-160
+ *
+ * RIPEMD-160 is an iterative hash function that operates on 32-bit words.
+ * The round function takes as input a 5-word chaining variable and a 16-word
+ * message block and maps this to a new chaining variable. All operations are
+ * defined on 32-bit words. Padding is identical to that of MD4.
+ *
+ *
+ * RIPEMD-160: definitions
+ *
+ *
+ *   nonlinear functions at bit level: exor, mux, -, mux, -
+ *
+ *   f(j, x, y, z) = x XOR y XOR z		  (0 <= j <= 15)
+ *   f(j, x, y, z) = (x AND y) OR (NOT(x) AND z)  (16 <= j <= 31)
+ *   f(j, x, y, z) = (x OR NOT(y)) XOR z	  (32 <= j <= 47)
+ *   f(j, x, y, z) = (x AND z) OR (y AND NOT(z))  (48 <= j <= 63)
+ *   f(j, x, y, z) = x XOR (y OR NOT(z))	  (64 <= j <= 79)
+ *
+ *
+ *   added constants (hexadecimal)
+ *
+ *   K(j) = 0x00000000	    (0 <= j <= 15)
+ *   K(j) = 0x5A827999	   (16 <= j <= 31)	int(2**30 x sqrt(2))
+ *   K(j) = 0x6ED9EBA1	   (32 <= j <= 47)	int(2**30 x sqrt(3))
+ *   K(j) = 0x8F1BBCDC	   (48 <= j <= 63)	int(2**30 x sqrt(5))
+ *   K(j) = 0xA953FD4E	   (64 <= j <= 79)	int(2**30 x sqrt(7))
+ *   K'(j) = 0x50A28BE6     (0 <= j <= 15)      int(2**30 x cbrt(2))
+ *   K'(j) = 0x5C4DD124    (16 <= j <= 31)      int(2**30 x cbrt(3))
+ *   K'(j) = 0x6D703EF3    (32 <= j <= 47)      int(2**30 x cbrt(5))
+ *   K'(j) = 0x7A6D76E9    (48 <= j <= 63)      int(2**30 x cbrt(7))
+ *   K'(j) = 0x00000000    (64 <= j <= 79)
+ *
+ *
+ *   selection of message word
+ *
+ *   r(j)      = j		      (0 <= j <= 15)
+ *   r(16..31) = 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8
+ *   r(32..47) = 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12
+ *   r(48..63) = 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2
+ *   r(64..79) = 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13
+ *   r0(0..15) = 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12
+ *   r0(16..31)= 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2
+ *   r0(32..47)= 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13
+ *   r0(48..63)= 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14
+ *   r0(64..79)= 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11
+ *
+ *
+ *   amount for rotate left (rol)
+ *
+ *   s(0..15)  = 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8
+ *   s(16..31) = 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12
+ *   s(32..47) = 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5
+ *   s(48..63) = 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12
+ *   s(64..79) = 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6
+ *   s'(0..15) = 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6
+ *   s'(16..31)= 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11
+ *   s'(32..47)= 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5
+ *   s'(48..63)= 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8
+ *   s'(64..79)= 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11
+ *
+ *
+ *   initial value (hexadecimal)
+ *
+ *   h0 = 0x67452301; h1 = 0xEFCDAB89; h2 = 0x98BADCFE; h3 = 0x10325476;
+ *							h4 = 0xC3D2E1F0;
+ *
+ *
+ * RIPEMD-160: pseudo-code
+ *
+ *   It is assumed that the message after padding consists of t 16-word blocks
+ *   that will be denoted with X[i][j], with 0 <= i <= t-1 and 0 <= j <= 15.
+ *   The symbol [+] denotes addition modulo 2**32 and rol_s denotes cyclic left
+ *   shift (rotate) over s positions.
+ *
+ *
+ *   for i := 0 to t-1 {
+ *	 A := h0; B := h1; C := h2; D = h3; E = h4;
+ *	 A' := h0; B' := h1; C' := h2; D' = h3; E' = h4;
+ *	 for j := 0 to 79 {
+ *	     T := rol_s(j)(A [+] f(j, B, C, D) [+] X[i][r(j)] [+] K(j)) [+] E;
+ *	     A := E; E := D; D := rol_10(C); C := B; B := T;
+ *	     T := rol_s'(j)(A' [+] f(79-j, B', C', D') [+] X[i][r'(j)]
+						       [+] K'(j)) [+] E';
+ *	     A' := E'; E' := D'; D' := rol_10(C'); C' := B'; B' := T;
+ *	 }
+ *	 T := h1 [+] C [+] D'; h1 := h2 [+] D [+] E'; h2 := h3 [+] E [+] A';
+ *	 h3 := h4 [+] A [+] B'; h4 := h0 [+] B [+] C'; h0 := T;
+ *   }
+ */
+
+/* Some examples:
+ * ""                    9c1185a5c5e9fc54612808977ee8f548b2258d31
+ * "a"                   0bdc9d2d256b3ee9daae347be6f4dc835a467ffe
+ * "abc"                 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc
+ * "message digest"      5d0689ef49d2fae572b881b123a85ffa21595f36
+ * "a...z"               f71c27109c692c1b56bbdceb5b9d2865b3708dbc
+ * "abcdbcde...nopq"     12a053384a9c0c88e405a06c27dcf49ada62eb2b
+ * "A...Za...z0...9"     b0e20b6e3116640286ed3a87a5713079b21f5189
+ * 8 times "1234567890"  9b752e45573d4b39f4dbd3323cab82bf63326bfb
+ * 1 million times "a"   52783243c1697bdbe16d37f97f68f08325dc1528
+ */
+
+
+static void
+rmd160_init( RMD160_CONTEXT *hd )
+{
+    hd->h0 = 0x67452301;
+    hd->h1 = 0xEFCDAB89;
+    hd->h2 = 0x98BADCFE;
+    hd->h3 = 0x10325476;
+    hd->h4 = 0xC3D2E1F0;
+    hd->nblocks = 0;
+    hd->count = 0;
+}
+
+
+
+/****************
+ * Transform the message X which consists of 16 32-bit-words
+ */
+static void
+transform( RMD160_CONTEXT *hd, byte *data )
+{
+    u32 a,b,c,d,e,aa,bb,cc,dd,ee,t;
+  #if BYTE_ORDER == BIG_ENDIAN
+    u32 x[16];
+    { int i;
+      byte *p2, *p1;
+      for(i=0, p1=data, p2=(byte*)x; i < 16; i++, p2 += 4 ) {
+	p2[3] = *p1++;
+	p2[2] = *p1++;
+	p2[1] = *p1++;
+	p2[0] = *p1++;
+      }
+    }
+  #else
+   #if 0
+    u32 *x =(u32*)data;
+   #else
+    /* this version is better because it is always aligned;
+     * The performance penalty on a 586-100 is about 6% which
+     * is acceptable - because the data is more local it might
+     * also be possible that this is faster on some machines.
+     * This function (when compiled with -02 on gcc 2.7.2)
+     * executes on a 586-100 (39.73 bogomips) at about 1900kb/sec;
+     * [measured with a 4MB data and "gpgm --print-md rmd160"] */
+    u32 x[16];
+    memcpy( x, data, 64 );
+   #endif
+  #endif
+
+
+#define K0  0x00000000
+#define K1  0x5A827999
+#define K2  0x6ED9EBA1
+#define K3  0x8F1BBCDC
+#define K4  0xA953FD4E
+#define KK0 0x50A28BE6
+#define KK1 0x5C4DD124
+#define KK2 0x6D703EF3
+#define KK3 0x7A6D76E9
+#define KK4 0x00000000
+#define F0(x,y,z)   ( (x) ^ (y) ^ (z) )
+#define F1(x,y,z)   ( ((x) & (y)) | (~(x) & (z)) )
+#define F2(x,y,z)   ( ((x) | ~(y)) ^ (z) )
+#define F3(x,y,z)   ( ((x) & (z)) | ((y) & ~(z)) )
+#define F4(x,y,z)   ( (x) ^ ((y) | ~(z)) )
+#define R(a,b,c,d,e,f,k,r,s) do { t = a + f(b,c,d) + k + x[r]; \
+				  a = rol(t,s) + e;	       \
+				  c = rol(c,10);	       \
+				} while(0)
+
+    /* left lane */
+    a = hd->h0;
+    b = hd->h1;
+    c = hd->h2;
+    d = hd->h3;
+    e = hd->h4;
+    R( a, b, c, d, e, F0, K0,  0, 11 );
+    R( e, a, b, c, d, F0, K0,  1, 14 );
+    R( d, e, a, b, c, F0, K0,  2, 15 );
+    R( c, d, e, a, b, F0, K0,  3, 12 );
+    R( b, c, d, e, a, F0, K0,  4,  5 );
+    R( a, b, c, d, e, F0, K0,  5,  8 );
+    R( e, a, b, c, d, F0, K0,  6,  7 );
+    R( d, e, a, b, c, F0, K0,  7,  9 );
+    R( c, d, e, a, b, F0, K0,  8, 11 );
+    R( b, c, d, e, a, F0, K0,  9, 13 );
+    R( a, b, c, d, e, F0, K0, 10, 14 );
+    R( e, a, b, c, d, F0, K0, 11, 15 );
+    R( d, e, a, b, c, F0, K0, 12,  6 );
+    R( c, d, e, a, b, F0, K0, 13,  7 );
+    R( b, c, d, e, a, F0, K0, 14,  9 );
+    R( a, b, c, d, e, F0, K0, 15,  8 );
+    R( e, a, b, c, d, F1, K1,  7,  7 );
+    R( d, e, a, b, c, F1, K1,  4,  6 );
+    R( c, d, e, a, b, F1, K1, 13,  8 );
+    R( b, c, d, e, a, F1, K1,  1, 13 );
+    R( a, b, c, d, e, F1, K1, 10, 11 );
+    R( e, a, b, c, d, F1, K1,  6,  9 );
+    R( d, e, a, b, c, F1, K1, 15,  7 );
+    R( c, d, e, a, b, F1, K1,  3, 15 );
+    R( b, c, d, e, a, F1, K1, 12,  7 );
+    R( a, b, c, d, e, F1, K1,  0, 12 );
+    R( e, a, b, c, d, F1, K1,  9, 15 );
+    R( d, e, a, b, c, F1, K1,  5,  9 );
+    R( c, d, e, a, b, F1, K1,  2, 11 );
+    R( b, c, d, e, a, F1, K1, 14,  7 );
+    R( a, b, c, d, e, F1, K1, 11, 13 );
+    R( e, a, b, c, d, F1, K1,  8, 12 );
+    R( d, e, a, b, c, F2, K2,  3, 11 );
+    R( c, d, e, a, b, F2, K2, 10, 13 );
+    R( b, c, d, e, a, F2, K2, 14,  6 );
+    R( a, b, c, d, e, F2, K2,  4,  7 );
+    R( e, a, b, c, d, F2, K2,  9, 14 );
+    R( d, e, a, b, c, F2, K2, 15,  9 );
+    R( c, d, e, a, b, F2, K2,  8, 13 );
+    R( b, c, d, e, a, F2, K2,  1, 15 );
+    R( a, b, c, d, e, F2, K2,  2, 14 );
+    R( e, a, b, c, d, F2, K2,  7,  8 );
+    R( d, e, a, b, c, F2, K2,  0, 13 );
+    R( c, d, e, a, b, F2, K2,  6,  6 );
+    R( b, c, d, e, a, F2, K2, 13,  5 );
+    R( a, b, c, d, e, F2, K2, 11, 12 );
+    R( e, a, b, c, d, F2, K2,  5,  7 );
+    R( d, e, a, b, c, F2, K2, 12,  5 );
+    R( c, d, e, a, b, F3, K3,  1, 11 );
+    R( b, c, d, e, a, F3, K3,  9, 12 );
+    R( a, b, c, d, e, F3, K3, 11, 14 );
+    R( e, a, b, c, d, F3, K3, 10, 15 );
+    R( d, e, a, b, c, F3, K3,  0, 14 );
+    R( c, d, e, a, b, F3, K3,  8, 15 );
+    R( b, c, d, e, a, F3, K3, 12,  9 );
+    R( a, b, c, d, e, F3, K3,  4,  8 );
+    R( e, a, b, c, d, F3, K3, 13,  9 );
+    R( d, e, a, b, c, F3, K3,  3, 14 );
+    R( c, d, e, a, b, F3, K3,  7,  5 );
+    R( b, c, d, e, a, F3, K3, 15,  6 );
+    R( a, b, c, d, e, F3, K3, 14,  8 );
+    R( e, a, b, c, d, F3, K3,  5,  6 );
+    R( d, e, a, b, c, F3, K3,  6,  5 );
+    R( c, d, e, a, b, F3, K3,  2, 12 );
+    R( b, c, d, e, a, F4, K4,  4,  9 );
+    R( a, b, c, d, e, F4, K4,  0, 15 );
+    R( e, a, b, c, d, F4, K4,  5,  5 );
+    R( d, e, a, b, c, F4, K4,  9, 11 );
+    R( c, d, e, a, b, F4, K4,  7,  6 );
+    R( b, c, d, e, a, F4, K4, 12,  8 );
+    R( a, b, c, d, e, F4, K4,  2, 13 );
+    R( e, a, b, c, d, F4, K4, 10, 12 );
+    R( d, e, a, b, c, F4, K4, 14,  5 );
+    R( c, d, e, a, b, F4, K4,  1, 12 );
+    R( b, c, d, e, a, F4, K4,  3, 13 );
+    R( a, b, c, d, e, F4, K4,  8, 14 );
+    R( e, a, b, c, d, F4, K4, 11, 11 );
+    R( d, e, a, b, c, F4, K4,  6,  8 );
+    R( c, d, e, a, b, F4, K4, 15,  5 );
+    R( b, c, d, e, a, F4, K4, 13,  6 );
+
+    aa = a; bb = b; cc = c; dd = d; ee = e;
+
+    /* right lane */
+    a = hd->h0;
+    b = hd->h1;
+    c = hd->h2;
+    d = hd->h3;
+    e = hd->h4;
+    R( a, b, c, d, e, F4, KK0,	5,  8);
+    R( e, a, b, c, d, F4, KK0, 14,  9);
+    R( d, e, a, b, c, F4, KK0,	7,  9);
+    R( c, d, e, a, b, F4, KK0,	0, 11);
+    R( b, c, d, e, a, F4, KK0,	9, 13);
+    R( a, b, c, d, e, F4, KK0,	2, 15);
+    R( e, a, b, c, d, F4, KK0, 11, 15);
+    R( d, e, a, b, c, F4, KK0,	4,  5);
+    R( c, d, e, a, b, F4, KK0, 13,  7);
+    R( b, c, d, e, a, F4, KK0,	6,  7);
+    R( a, b, c, d, e, F4, KK0, 15,  8);
+    R( e, a, b, c, d, F4, KK0,	8, 11);
+    R( d, e, a, b, c, F4, KK0,	1, 14);
+    R( c, d, e, a, b, F4, KK0, 10, 14);
+    R( b, c, d, e, a, F4, KK0,	3, 12);
+    R( a, b, c, d, e, F4, KK0, 12,  6);
+    R( e, a, b, c, d, F3, KK1,	6,  9);
+    R( d, e, a, b, c, F3, KK1, 11, 13);
+    R( c, d, e, a, b, F3, KK1,	3, 15);
+    R( b, c, d, e, a, F3, KK1,	7,  7);
+    R( a, b, c, d, e, F3, KK1,	0, 12);
+    R( e, a, b, c, d, F3, KK1, 13,  8);
+    R( d, e, a, b, c, F3, KK1,	5,  9);
+    R( c, d, e, a, b, F3, KK1, 10, 11);
+    R( b, c, d, e, a, F3, KK1, 14,  7);
+    R( a, b, c, d, e, F3, KK1, 15,  7);
+    R( e, a, b, c, d, F3, KK1,	8, 12);
+    R( d, e, a, b, c, F3, KK1, 12,  7);
+    R( c, d, e, a, b, F3, KK1,	4,  6);
+    R( b, c, d, e, a, F3, KK1,	9, 15);
+    R( a, b, c, d, e, F3, KK1,	1, 13);
+    R( e, a, b, c, d, F3, KK1,	2, 11);
+    R( d, e, a, b, c, F2, KK2, 15,  9);
+    R( c, d, e, a, b, F2, KK2,	5,  7);
+    R( b, c, d, e, a, F2, KK2,	1, 15);
+    R( a, b, c, d, e, F2, KK2,	3, 11);
+    R( e, a, b, c, d, F2, KK2,	7,  8);
+    R( d, e, a, b, c, F2, KK2, 14,  6);
+    R( c, d, e, a, b, F2, KK2,	6,  6);
+    R( b, c, d, e, a, F2, KK2,	9, 14);
+    R( a, b, c, d, e, F2, KK2, 11, 12);
+    R( e, a, b, c, d, F2, KK2,	8, 13);
+    R( d, e, a, b, c, F2, KK2, 12,  5);
+    R( c, d, e, a, b, F2, KK2,	2, 14);
+    R( b, c, d, e, a, F2, KK2, 10, 13);
+    R( a, b, c, d, e, F2, KK2,	0, 13);
+    R( e, a, b, c, d, F2, KK2,	4,  7);
+    R( d, e, a, b, c, F2, KK2, 13,  5);
+    R( c, d, e, a, b, F1, KK3,	8, 15);
+    R( b, c, d, e, a, F1, KK3,	6,  5);
+    R( a, b, c, d, e, F1, KK3,	4,  8);
+    R( e, a, b, c, d, F1, KK3,	1, 11);
+    R( d, e, a, b, c, F1, KK3,	3, 14);
+    R( c, d, e, a, b, F1, KK3, 11, 14);
+    R( b, c, d, e, a, F1, KK3, 15,  6);
+    R( a, b, c, d, e, F1, KK3,	0, 14);
+    R( e, a, b, c, d, F1, KK3,	5,  6);
+    R( d, e, a, b, c, F1, KK3, 12,  9);
+    R( c, d, e, a, b, F1, KK3,	2, 12);
+    R( b, c, d, e, a, F1, KK3, 13,  9);
+    R( a, b, c, d, e, F1, KK3,	9, 12);
+    R( e, a, b, c, d, F1, KK3,	7,  5);
+    R( d, e, a, b, c, F1, KK3, 10, 15);
+    R( c, d, e, a, b, F1, KK3, 14,  8);
+    R( b, c, d, e, a, F0, KK4, 12,  8);
+    R( a, b, c, d, e, F0, KK4, 15,  5);
+    R( e, a, b, c, d, F0, KK4, 10, 12);
+    R( d, e, a, b, c, F0, KK4,	4,  9);
+    R( c, d, e, a, b, F0, KK4,	1, 12);
+    R( b, c, d, e, a, F0, KK4,	5,  5);
+    R( a, b, c, d, e, F0, KK4,	8, 14);
+    R( e, a, b, c, d, F0, KK4,	7,  6);
+    R( d, e, a, b, c, F0, KK4,	6,  8);
+    R( c, d, e, a, b, F0, KK4,	2, 13);
+    R( b, c, d, e, a, F0, KK4, 13,  6);
+    R( a, b, c, d, e, F0, KK4, 14,  5);
+    R( e, a, b, c, d, F0, KK4,	0, 15);
+    R( d, e, a, b, c, F0, KK4,	3, 13);
+    R( c, d, e, a, b, F0, KK4,	9, 11);
+    R( b, c, d, e, a, F0, KK4, 11, 11);
+
+
+    t	   = hd->h1 + d + cc;
+    hd->h1 = hd->h2 + e + dd;
+    hd->h2 = hd->h3 + a + ee;
+    hd->h3 = hd->h4 + b + aa;
+    hd->h4 = hd->h0 + c + bb;
+    hd->h0 = t;
+}
+
+
+/* Update the message digest with the contents
+ * of INBUF with length INLEN.
+ */
+static void
+rmd160_write( RMD160_CONTEXT *hd, byte *inbuf, size_t inlen)
+{
+    if( hd->count == 64 ) { /* flush the buffer */
+	transform( hd, hd->buf );
+	hd->count = 0;
+	hd->nblocks++;
+    }
+    if( !inbuf )
+	return;
+    if( hd->count ) {
+	for( ; inlen && hd->count < 64; inlen-- )
+	    hd->buf[hd->count++] = *inbuf++;
+	rmd160_write( hd, NULL, 0 );
+	if( !inlen )
+	    return;
+    }
+
+    while( inlen >= 64 ) {
+	transform( hd, inbuf );
+	hd->count = 0;
+	hd->nblocks++;
+	inlen -= 64;
+	inbuf += 64;
+    }
+    for( ; inlen && hd->count < 64; inlen-- )
+	hd->buf[hd->count++] = *inbuf++;
+}
+
+/* The routine terminates the computation
+ */
+
+static void
+rmd160_final( RMD160_CONTEXT *hd )
+{
+    u32 t, msb, lsb;
+    byte *p;
+
+    rmd160_write(hd, NULL, 0); /* flush */;
+
+    msb = 0;
+    t = hd->nblocks;
+    if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */
+	msb++;
+    msb += t >> 26;
+    t = lsb;
+    if( (lsb = t + hd->count) < t ) /* add the count */
+	msb++;
+    t = lsb;
+    if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */
+	msb++;
+    msb += t >> 29;
+
+    if( hd->count < 56 ) { /* enough room */
+	hd->buf[hd->count++] = 0x80; /* pad */
+	while( hd->count < 56 )
+	    hd->buf[hd->count++] = 0;  /* pad */
+    }
+    else { /* need one extra block */
+	hd->buf[hd->count++] = 0x80; /* pad character */
+	while( hd->count < 64 )
+	    hd->buf[hd->count++] = 0;
+	rmd160_write(hd, NULL, 0);  /* flush */;
+	memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
+    }
+    /* append the 64 bit count */
+    hd->buf[56] = lsb	   ;
+    hd->buf[57] = lsb >>  8;
+    hd->buf[58] = lsb >> 16;
+    hd->buf[59] = lsb >> 24;
+    hd->buf[60] = msb	   ;
+    hd->buf[61] = msb >>  8;
+    hd->buf[62] = msb >> 16;
+    hd->buf[63] = msb >> 24;
+    transform( hd, hd->buf );
+
+    p = hd->buf;
+  #if BYTE_ORDER == BIG_ENDIAN
+    #define X(a) do { *p++ = hd->h##a	   ; *p++ = hd->h##a >> 8;	\
+		      *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0)
+  #else /* little endian */
+    #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0)
+  #endif
+    X(0);
+    X(1);
+    X(2);
+    X(3);
+    X(4);
+  #undef X
+}
+
+/****************
+ * Shortcut functions which puts the hash value of the supplied buffer
+ * into outbuf which must have a size of 20 bytes.
+ */
+void
+rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length )
+{
+    RMD160_CONTEXT hd;
+
+    rmd160_init( &hd );
+    rmd160_write( &hd, (byte*)buffer, length );
+    rmd160_final( &hd );
+    memcpy( outbuf, hd.buf, 20 );
+}
--- util-linux-2.19.1.orig/mount/lomount.h
+++ util-linux-2.19.1/mount/lomount.h
@@ -2,7 +2,7 @@
 #define UTIL_LINUX_LOMOUNT_H
 
 extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
-		    const char *, int, int *);
+		    const char *, int, int *, int, int);
 extern int del_loop(const char *);
 extern int is_loop_device(const char *);
 extern int is_loop_autoclear(const char *device);
--- util-linux-2.19.1.orig/mount/mount.c
+++ util-linux-2.19.1/mount/mount.c
@@ -61,6 +61,12 @@
 /* True for explicit readonly (-r).  */
 static int readonly = 0;
 
+/* Nonzero for chatty (-v).  */
+int verbose = 0;
+
+/* Do we hash the password or not */
+int hash_pass = 1;
+
 /* Nonzero for sloppy (-s).  */
 static int sloppy = 0;
 
@@ -96,6 +102,9 @@
 			const char *type, const char *opts, unsigned long flags);
 #endif
 
+/* Contains the preferred keysize in bits we want to use */
+static int keysz = 0;
+
 /* mount(2) options */
 struct mountargs {
        const char *spec;
@@ -210,6 +219,7 @@
 
 static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
         *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper;
+static const char *opt_keybits, *opt_nohashpass;
 
 static int is_readonly(const char *node);
 static int mounted (const char *spec0, const char *node0);
@@ -226,6 +236,8 @@
   { "offset=",	0, &opt_offset },
   { "sizelimit=",  0, &opt_sizelimit },
   { "encryption=", 0, &opt_encryption },
+  { "keybits=", 0, &opt_keybits },
+  { "nohashpass", 0, &opt_nohashpass },
   { "speed=", 0, &opt_speed },
   { "comment=", 1, &opt_comment },
   { "uhelper=", 0, &opt_uhelper },
@@ -664,7 +676,7 @@
 		mnt.mnt_freq = mnt.mnt_passno = 0;
 		free(extra_opts);
 
-		if (my_addmntent (mfp, &mnt) == 1) {
+		if (mnt.mnt_fsname && my_addmntent (mfp, &mnt) == 1) {
 			int errsv = errno;
 			die (EX_FILEIO, _("mount: error writing %s: %s"),
 			     _PATH_MOUNTED, strerror (errsv));
@@ -1220,7 +1232,7 @@
       *type = opt_vfstype;
   }
 
-  *loop = ((*flags & MS_LOOP) || *loopdev || opt_offset || opt_sizelimit || opt_encryption);
+  *loop = ((*flags & MS_LOOP) || *loopdev || opt_offset || opt_sizelimit || opt_encryption || opt_keybits);
   *loopfile = *spec;
 
   /* Automatically create a loop device from a regular file if a filesystem
@@ -1283,9 +1295,12 @@
 	  return EX_SYSERR;	/* no more loop devices */
 	if (verbose)
 	  printf(_("mount: going to use the loop device %s\n"), *loopdev);
-
+	if (!keysz && opt_keybits)
+	  keysz  = strtoul(opt_keybits, NULL, 0);
+	if (opt_nohashpass)
+	  hash_pass=0;
 	if ((res = set_loop(*loopdev, *loopfile, offset, sizelimit,
-			    opt_encryption, pfd, &loop_opts))) {
+			    opt_encryption, pfd, &loop_opts, keysz, hash_pass))) {
 	  if (res == 2) {
 	     /* loop dev has been grabbed by some other process,
 	        try again, if not given explicitly */
@@ -2230,6 +2245,7 @@
 	{ "options", 1, 0, 'o' },
 	{ "test-opts", 1, 0, 'O' },
 	{ "pass-fd", 1, 0, 'p' },
+	{ "keybits", 1, 0, 'k' },
 	{ "types", 1, 0, 't' },
 	{ "bind", 0, 0, 'B' },
 	{ "move", 0, 0, 'M' },
@@ -2393,6 +2409,7 @@
 	char *options = NULL, *test_opts = NULL, *node;
 	const char *spec = NULL;
 	char *label = NULL;
+	char *keysize = NULL;
 	char *uuid = NULL;
 	char *types = NULL;
 	char *p;
@@ -2423,7 +2440,7 @@
 	initproctitle(argc, argv);
 #endif
 
-	while ((c = getopt_long (argc, argv, "aBfFhilL:Mno:O:p:rRsU:vVwt:",
+	while ((c = getopt_long (argc, argv, "aBfFhik:lL:Mno:O:p:rRsU:vVwt:",
 				 longopts, NULL)) != -1) {
 		switch (c) {
 		case 'a':	       /* mount everything in fstab */
@@ -2444,6 +2461,9 @@
 		case 'i':
 			external_allowed = 0;
 			break;
+		case 'k':
+			keysize = optarg;
+			break;
 		case 'l':
 			list_with_volumelabel = 1;
 			break;
@@ -2592,6 +2612,9 @@
 		}
 	}
 
+	if (keysize && sscanf(keysize,"%d",&keysz) != 1)
+		die (EX_USAGE, _("mount: argument to --keybits or -k must be a number"));
+
 	atexit(unlock_mtab);
 
 	switch (argc+specseen) {
--- util-linux-2.19.1.orig/mount/lomount.c
+++ util-linux-2.19.1/mount/lomount.c
@@ -19,6 +19,7 @@
 #include "loop.h"
 #include "lomount.h"
 #include "strutils.h"
+#include "rmd160.h"
 #include "nls.h"
 #include "sundries.h"
 #include "xmalloc.h"
@@ -786,7 +787,8 @@
  */
 int
 set_loop(const char *device, const char *file, unsigned long long offset,
-	 unsigned long long sizelimit, const char *encryption, int pfd, int *options) {
+	 unsigned long long sizelimit, const char *encryption, int pfd, int *options,
+	 int keysz, int hash_pass) {
 	struct loop_info64 loopinfo64;
 	int fd, ffd, mode, i;
 	char *pass;
@@ -854,20 +856,87 @@
 	}
 #endif
 
+
+	if (keysz==0)
+		keysz=LO_KEY_SIZE*8;
 	switch (loopinfo64.lo_encrypt_type) {
 	case LO_CRYPT_NONE:
 		loopinfo64.lo_encrypt_key_size = 0;
 		break;
 	case LO_CRYPT_XOR:
 		pass = getpass(_("Password: "));
-		goto gotpass;
-	default:
-		pass = xgetpass(pfd, _("Password: "));
-	gotpass:
 		memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE);
 		xstrncpy((char *)loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
 		memset(pass, 0, strlen(pass));
 		loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE;
+		break;
+#define HASHLENGTH 20
+#if 0
+	case LO_CRYPT_FISH2:
+	case LO_CRYPT_BLOW:
+	case LO_CRYPT_IDEA:
+	case LO_CRYPT_CAST128:
+	case LO_CRYPT_SERPENT:
+	case LO_CRYPT_MARS:
+	case LO_CRYPT_RC6:
+	case LO_CRYPT_3DES:
+	case LO_CRYPT_DFC:
+	case LO_CRYPT_RIJNDAEL:
+	    {
+		char keybits[2*HASHLENGTH]; 
+		char *pass2;
+		int passwdlen;
+		int keylength;
+		int i;
+
+  		pass = xgetpass(pfd, _("Password: "));
+		passwdlen=strlen(pass);
+		pass2=malloc(passwdlen+2);
+		pass2[0]='A';
+		strcpy(pass2+1,pass);
+		rmd160_hash_buffer(keybits,pass,passwdlen);
+		rmd160_hash_buffer(keybits+HASHLENGTH,pass2,passwdlen+1);
+		memcpy((char*)loopinfo64.lo_encrypt_key,keybits,2*HASHLENGTH);
+		memset(pass, 0, passwdlen);
+		memset(pass2, 0, passwdlen+1);
+		free(pass2);
+		keylength=0;
+		for(i=0; crypt_type_tbl[i].id != -1; i++){
+		         if(loopinfo64.lo_encrypt_type == crypt_type_tbl[i].id){
+			         keylength = crypt_type_tbl[i].keylength;
+				 break;
+			 }
+		}
+		loopinfo64.lo_encrypt_key_size=keylength;
+		break;
+	    }
+#endif
+	default:
+		if (hash_pass) {
+		    char keybits[2*HASHLENGTH]; 
+		    char *pass2;
+		    int passwdlen;
+
+		    pass = xgetpass(pfd, _("Password: "));
+		    passwdlen=strlen(pass);
+		    pass2=malloc(passwdlen+2);
+		    pass2[0]='A';
+		    strcpy(pass2+1,pass);
+		    rmd160_hash_buffer(keybits,pass,passwdlen);
+		    rmd160_hash_buffer(keybits+HASHLENGTH,pass2,passwdlen+1);
+		    memset(pass, 0, passwdlen);
+		    memset(pass2, 0, passwdlen+1);
+		    free(pass2);
+
+		    memcpy((char*)loopinfo64.lo_encrypt_key,keybits,keysz/8);
+		    loopinfo64.lo_encrypt_key_size = keysz/8;
+		} else {
+		    pass = xgetpass(pfd, _("Password: "));
+		    memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE);
+		    xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
+		    memset(pass, 0, strlen(pass));
+		    loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE;
+		}
 	}
 
 	if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
@@ -974,8 +1043,8 @@
 
 int
 set_loop(const char *device, const char *file, unsigned long long offset,
-         unsigned long long sizelimit, const char *encryption, int pfd, int *loopro,
-         int keysz, int hash_pass) {
+	 unsigned long long sizelimit, const char *encryption, int pfd, int *options,
+	 int keysz, int hash_pass) {
 	mutter();
 	return 1;
 }
@@ -1028,6 +1097,12 @@
   " -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
   " -r | --read-only         setup read-only loop device\n"
   "      --show              print device name (with -f <file>)\n"
+  " -N | --nohashpass        Do not hash the given password (Debian hashes)\n"
+  " -k | --keybits <num>     specify number of bits in the hashed key given\n"
+  "                          to the cipher.  Some ciphers support several key\n"
+  "                          sizes and might be more efficient with a smaller\n"
+  "                          key size.  Key sizes < 128 are generally not\n"
+  "                          recommended\n"
   " -v | --verbose           verbose mode\n\n"));
 
 	exit(f == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -1036,12 +1111,15 @@
 int
 main(int argc, char **argv) {
 	char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
+	char *keysize;
 	int delete, find, c, all, capacity;
 	int res = 0;
 	int showdev = 0;
 	int ro = 0;
 	int pfd = -1;
 	uintmax_t off = 0, slimit = 0;
+	int keysz = 0;
+	int hash_pass = 1;
 	struct option longopts[] = {
 		{ "all", 0, 0, 'a' },
 		{ "set-capacity", 0, 0, 'c' },
@@ -1049,6 +1127,9 @@
 		{ "encryption", 1, 0, 'e' },
 		{ "find", 0, 0, 'f' },
 		{ "help", 0, 0, 'h' },
+		{ "keybits", 1, 0, 'k' },
+		{ "nopasshash", 0, 0, 'N' },
+		{ "nohashpass", 0, 0, 'N' },
 		{ "associated", 1, 0, 'j' },
 		{ "offset", 1, 0, 'o' },
 		{ "sizelimit", 1, 0, 128 },
@@ -1065,12 +1146,13 @@
 
 	capacity = delete = find = all = 0;
 	assoc = offset = sizelimit = encryption = passfd = NULL;
+	keysize = NULL;
 
 	progname = argv[0];
 	if ((p = strrchr(progname, '/')) != NULL)
 		progname = p+1;
 
-	while ((c = getopt_long(argc, argv, "acde:E:fhj:o:p:rsv",
+	while ((c = getopt_long(argc, argv, "acde:E:fhj:k:No:p:rsv",
 				longopts, NULL)) != -1) {
 		switch (c) {
 		case 'a':
@@ -1097,6 +1179,11 @@
 			break;
 		case 'j':
 			assoc = optarg;
+		case 'k':
+			keysize = optarg;
+			break;
+		case 'N':
+			hash_pass = 0;
 			break;
 		case 'o':
 			offset = optarg;
@@ -1121,7 +1208,7 @@
 	}
 
 	if (argc == 1) {
-		usage(stderr);
+	    usage(stderr);
 	} else if (delete) {
 		if (argc < optind+1 || encryption || offset || sizelimit ||
 		    capacity || find || all || showdev || assoc || ro)
@@ -1187,8 +1274,10 @@
 	else {
 		if (passfd && sscanf(passfd, "%d", &pfd) != 1)
 			usage(stderr);
+		if (keysize && sscanf(keysize,"%d",&keysz) != 1)
+			usage(stderr);
 		do {
-			res = set_loop(device, file, off, slimit, encryption, pfd, &ro);
+			res = set_loop(device, file, off, slimit, encryption, pfd, &ro, keysz, hash_pass);
 			if (res == 2 && find) {
 				if (verbose)
 					printf(_("stolen loop=%s...trying again\n"),
--- util-linux-2.19.1.orig/mount/mount.8
+++ util-linux-2.19.1/mount/mount.8
@@ -898,6 +898,16 @@
 (unless overridden by subsequent options, as in the option line
 .BR group,dev,suid ).
 .TP
+.B encryption
+Specifies an encryption algorithm to use.  Used in conjunction with the
+.BR loop " option."
+.TP
+.B keybits
+Specifies the key size to use for an encryption algorithm. Used in conjunction
+with the 
+.BR loop " and " encryption " options."
+.B nofail
+Do not report errors for this device if it does not exist.
 .B iversion
 Every time the inode is modified, the i_version field will be incremented.
 .TP
@@ -1101,7 +1111,7 @@
 .SH "Mount options for cifs"
 See the options section of the
 .BR mount.cifs (8)
-man page (cifs-utils package must be installed).
+man page (smbfs package must be installed).
 
 .SH "Mount options for coherent"
 None.
@@ -1406,8 +1416,8 @@
 .TP
 .BR journal_async_commit
 Commit block can be written to disk without waiting for descriptor blocks. If
-enabled older kernels cannot mount the device.
-This will enable 'journal_checksum' internally.
+enabled older kernels cannot mount the device. This will
+enable 'journal_checksum' internally.
 .TP
 .BR journal=update
 Update the ext4 filesystem's journal to the current format.
@@ -1931,7 +1941,7 @@
 .SH "Mount options for nfs and nfs4"
 See the options section of the
 .BR nfs (5)
-man page (nfs-utils package must be installed).
+man page (nfs-common package must be installed).
 
 The
 .IR nfs " and " nfs4
@@ -2678,6 +2688,10 @@
 .BR loop ", " offset ", " sizelimit " and " encryption ,
 that are really options to
 .BR \%losetup (8).
+If the mount requires a passphrase, you will be prompted for one unless
+you specify a file descriptor to read from instead with the
+.BR \-\-pass-fd
+option.
 (These options can be used in addition to those specific
 to the filesystem type.)
 
--- util-linux-2.19.1.orig/mount/rmd160.h
+++ util-linux-2.19.1/mount/rmd160.h
@@ -0,0 +1,9 @@
+#ifndef RMD160_H
+#define RMD160_H
+
+void
+rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length );
+
+#endif /*RMD160_H*/
+
+
--- util-linux-2.19.1.orig/mount/Makefile.in
+++ util-linux-2.19.1/mount/Makefile.in
@@ -86,7 +86,7 @@
 	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
 am__objects_1 = losetup-sundries.$(OBJEXT) losetup-xmalloc.$(OBJEXT) \
-	losetup-canonicalize.$(OBJEXT)
+	losetup-canonicalize.$(OBJEXT) losetup-rmd160.$(OBJEXT)
 am_losetup_OBJECTS = losetup-lomount.$(OBJEXT) $(am__objects_1) \
 	losetup-strutils.$(OBJEXT)
 losetup_OBJECTS = $(am_losetup_OBJECTS)
@@ -95,11 +95,12 @@
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 am__losetup_static_SOURCES_DIST = lomount.c sundries.c xmalloc.c \
-	$(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h loop.h \
-	lomount.h $(top_srcdir)/lib/strutils.c
+	$(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c \
+	loop.h lomount.h $(top_srcdir)/lib/strutils.c
 am__objects_2 = losetup_static-sundries.$(OBJEXT) \
 	losetup_static-xmalloc.$(OBJEXT) \
-	losetup_static-canonicalize.$(OBJEXT)
+	losetup_static-canonicalize.$(OBJEXT) \
+	losetup_static-rmd160.$(OBJEXT)
 am__objects_3 = losetup_static-lomount.$(OBJEXT) $(am__objects_2) \
 	losetup_static-strutils.$(OBJEXT)
 @HAVE_STATIC_LOSETUP_TRUE@am_losetup_static_OBJECTS =  \
@@ -111,7 +112,7 @@
 	$(AM_CFLAGS) $(CFLAGS) $(losetup_static_LDFLAGS) $(LDFLAGS) -o \
 	$@
 am__objects_4 = mount-sundries.$(OBJEXT) mount-xmalloc.$(OBJEXT) \
-	mount-canonicalize.$(OBJEXT)
+	mount-canonicalize.$(OBJEXT) mount-rmd160.$(OBJEXT)
 am__objects_5 =
 am__objects_6 = mount-fstab.$(OBJEXT) mount-mount_mntent.$(OBJEXT) \
 	mount-getusername.$(OBJEXT) mount-lomount.$(OBJEXT) \
@@ -134,14 +135,15 @@
 am__mount_static_SOURCES_DIST = mount.c fstab.c mount_mntent.c \
 	getusername.c lomount.c devname.c devname.h sundries.c \
 	xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h \
-	xmalloc.h fstab.h mount_mntent.h mount_constants.h lomount.h \
-	getusername.h loop.h $(top_srcdir)/lib/env.c \
+	xmalloc.h rmd160.c fstab.h mount_mntent.h mount_constants.h \
+	lomount.h getusername.h loop.h $(top_srcdir)/lib/env.c \
 	$(top_srcdir)/lib/linux_version.c $(top_srcdir)/lib/blkdev.c \
 	$(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/mangle.c \
 	$(top_srcdir)/lib/setproctitle.c $(top_srcdir)/lib/strutils.c
 am__objects_7 = mount_static-sundries.$(OBJEXT) \
 	mount_static-xmalloc.$(OBJEXT) \
-	mount_static-canonicalize.$(OBJEXT)
+	mount_static-canonicalize.$(OBJEXT) \
+	mount_static-rmd160.$(OBJEXT)
 am__objects_8 = mount_static-fstab.$(OBJEXT) \
 	mount_static-mount_mntent.$(OBJEXT) \
 	mount_static-getusername.$(OBJEXT) \
@@ -163,12 +165,13 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mount_static_CFLAGS) \
 	$(CFLAGS) $(mount_static_LDFLAGS) $(LDFLAGS) -o $@
 am__mtab_lock_test_SOURCES_DIST = fstab.c sundries.c xmalloc.c \
-	$(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h fstab.h \
-	mount_mntent.h mount_constants.h lomount.h getusername.h \
-	loop.h
+	$(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c \
+	fstab.h mount_mntent.h mount_constants.h lomount.h \
+	getusername.h loop.h
 am__objects_10 = mtab_lock_test-sundries.$(OBJEXT) \
 	mtab_lock_test-xmalloc.$(OBJEXT) \
-	mtab_lock_test-canonicalize.$(OBJEXT)
+	mtab_lock_test-canonicalize.$(OBJEXT) \
+	mtab_lock_test-rmd160.$(OBJEXT)
 @BUILD_LIBMOUNT_MOUNT_FALSE@am_mtab_lock_test_OBJECTS =  \
 @BUILD_LIBMOUNT_MOUNT_FALSE@	mtab_lock_test-fstab.$(OBJEXT) \
 @BUILD_LIBMOUNT_MOUNT_FALSE@	$(am__objects_10) $(am__objects_5)
@@ -184,7 +187,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(swapon_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am__objects_11 = umount-sundries.$(OBJEXT) umount-xmalloc.$(OBJEXT) \
-	umount-canonicalize.$(OBJEXT)
+	umount-canonicalize.$(OBJEXT) umount-rmd160.$(OBJEXT)
 am__objects_12 = umount-fstab.$(OBJEXT) umount-mount_mntent.$(OBJEXT) \
 	umount-getusername.$(OBJEXT) umount-lomount.$(OBJEXT) \
 	umount-devname.$(OBJEXT) $(am__objects_11) $(am__objects_5) \
@@ -201,14 +204,15 @@
 am__umount_static_SOURCES_DIST = umount.c fstab.c mount_mntent.c \
 	getusername.c lomount.c devname.c devname.h sundries.c \
 	xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h \
-	xmalloc.h fstab.h mount_mntent.h mount_constants.h lomount.h \
-	getusername.h loop.h $(top_srcdir)/lib/env.c \
+	xmalloc.h rmd160.c fstab.h mount_mntent.h mount_constants.h \
+	lomount.h getusername.h loop.h $(top_srcdir)/lib/env.c \
 	$(top_srcdir)/lib/linux_version.c $(top_srcdir)/lib/blkdev.c \
 	$(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/mangle.c \
 	$(top_srcdir)/lib/strutils.c
 am__objects_13 = umount_static-sundries.$(OBJEXT) \
 	umount_static-xmalloc.$(OBJEXT) \
-	umount_static-canonicalize.$(OBJEXT)
+	umount_static-canonicalize.$(OBJEXT) \
+	umount_static-rmd160.$(OBJEXT)
 am__objects_14 = umount_static-fstab.$(OBJEXT) \
 	umount_static-mount_mntent.$(OBJEXT) \
 	umount_static-getusername.$(OBJEXT) \
@@ -369,8 +373,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -425,6 +427,7 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -481,7 +484,7 @@
 dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
 
 # generic sources for all programs (mount, umount, losetup)
-srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h
+srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c
 
 # generic header for mount and umount
 hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
@@ -700,11 +703,13 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-canonicalize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-lomount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-sundries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-xmalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-canonicalize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-lomount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-sundries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup_static-xmalloc.Po@am__quote@
@@ -720,6 +725,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mount_mntent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-setproctitle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-sundries.Po@am__quote@
@@ -736,12 +742,14 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-mangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-mount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-mount_mntent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-setproctitle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-sundries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_static-xmalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtab_lock_test-canonicalize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtab_lock_test-fstab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtab_lock_test-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtab_lock_test-sundries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtab_lock_test-xmalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swapon-blkdev.Po@am__quote@
@@ -761,6 +769,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-lomount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-mangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-mount_mntent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-sundries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-umount.Po@am__quote@
@@ -776,6 +785,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-lomount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-mangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-mount_mntent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-rmd160.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-sundries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount_static-umount.Po@am__quote@
@@ -869,6 +879,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+losetup-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-rmd160.o -MD -MP -MF $(DEPDIR)/losetup-rmd160.Tpo -c -o losetup-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/losetup-rmd160.Tpo $(DEPDIR)/losetup-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='losetup-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+losetup-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-rmd160.obj -MD -MP -MF $(DEPDIR)/losetup-rmd160.Tpo -c -o losetup-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/losetup-rmd160.Tpo $(DEPDIR)/losetup-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='losetup-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 losetup-strutils.o: $(top_srcdir)/lib/strutils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-strutils.o -MD -MP -MF $(DEPDIR)/losetup-strutils.Tpo -c -o losetup-strutils.o `test -f '$(top_srcdir)/lib/strutils.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/strutils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/losetup-strutils.Tpo $(DEPDIR)/losetup-strutils.Po
@@ -949,6 +975,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+losetup_static-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-rmd160.o -MD -MP -MF $(DEPDIR)/losetup_static-rmd160.Tpo -c -o losetup_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/losetup_static-rmd160.Tpo $(DEPDIR)/losetup_static-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='losetup_static-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+losetup_static-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-rmd160.obj -MD -MP -MF $(DEPDIR)/losetup_static-rmd160.Tpo -c -o losetup_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/losetup_static-rmd160.Tpo $(DEPDIR)/losetup_static-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='losetup_static-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 losetup_static-strutils.o: $(top_srcdir)/lib/strutils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-strutils.o -MD -MP -MF $(DEPDIR)/losetup_static-strutils.Tpo -c -o losetup_static-strutils.o `test -f '$(top_srcdir)/lib/strutils.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/strutils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/losetup_static-strutils.Tpo $(DEPDIR)/losetup_static-strutils.Po
@@ -1109,6 +1151,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+mount-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-rmd160.o -MD -MP -MF $(DEPDIR)/mount-rmd160.Tpo -c -o mount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount-rmd160.Tpo $(DEPDIR)/mount-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='mount-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+mount-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-rmd160.obj -MD -MP -MF $(DEPDIR)/mount-rmd160.Tpo -c -o mount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount-rmd160.Tpo $(DEPDIR)/mount-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='mount-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 mount-env.o: $(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.o -MD -MP -MF $(DEPDIR)/mount-env.Tpo -c -o mount-env.o `test -f '$(top_srcdir)/lib/env.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
@@ -1365,6 +1423,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -c -o mount_static-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+mount_static-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-rmd160.o -MD -MP -MF $(DEPDIR)/mount_static-rmd160.Tpo -c -o mount_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount_static-rmd160.Tpo $(DEPDIR)/mount_static-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='mount_static-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -c -o mount_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+mount_static-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-rmd160.obj -MD -MP -MF $(DEPDIR)/mount_static-rmd160.Tpo -c -o mount_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount_static-rmd160.Tpo $(DEPDIR)/mount_static-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='mount_static-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -c -o mount_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 mount_static-env.o: $(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-env.o -MD -MP -MF $(DEPDIR)/mount_static-env.Tpo -c -o mount_static-env.o `test -f '$(top_srcdir)/lib/env.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount_static-env.Tpo $(DEPDIR)/mount_static-env.Po
@@ -1541,6 +1615,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+mtab_lock_test-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-rmd160.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-rmd160.Tpo -c -o mtab_lock_test-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mtab_lock_test-rmd160.Tpo $(DEPDIR)/mtab_lock_test-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='mtab_lock_test-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+mtab_lock_test-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-rmd160.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-rmd160.Tpo -c -o mtab_lock_test-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mtab_lock_test-rmd160.Tpo $(DEPDIR)/mtab_lock_test-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='mtab_lock_test-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mtab_lock_test-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 swapon-swapon.o: swapon.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-swapon.o -MD -MP -MF $(DEPDIR)/swapon-swapon.Tpo -c -o swapon-swapon.o `test -f 'swapon.c' || echo '$(srcdir)/'`swapon.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swapon-swapon.Tpo $(DEPDIR)/swapon-swapon.Po
@@ -1781,6 +1871,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+umount-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-rmd160.o -MD -MP -MF $(DEPDIR)/umount-rmd160.Tpo -c -o umount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umount-rmd160.Tpo $(DEPDIR)/umount-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='umount-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+umount-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-rmd160.obj -MD -MP -MF $(DEPDIR)/umount-rmd160.Tpo -c -o umount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umount-rmd160.Tpo $(DEPDIR)/umount-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='umount-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 umount-env.o: $(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.o -MD -MP -MF $(DEPDIR)/umount-env.Tpo -c -o umount-env.o `test -f '$(top_srcdir)/lib/env.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
@@ -2021,6 +2127,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -c -o umount_static-canonicalize.obj `if test -f '$(top_srcdir)/lib/canonicalize.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/canonicalize.c'; fi`
 
+umount_static-rmd160.o: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-rmd160.o -MD -MP -MF $(DEPDIR)/umount_static-rmd160.Tpo -c -o umount_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umount_static-rmd160.Tpo $(DEPDIR)/umount_static-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='umount_static-rmd160.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -c -o umount_static-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c
+
+umount_static-rmd160.obj: rmd160.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-rmd160.obj -MD -MP -MF $(DEPDIR)/umount_static-rmd160.Tpo -c -o umount_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umount_static-rmd160.Tpo $(DEPDIR)/umount_static-rmd160.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rmd160.c' object='umount_static-rmd160.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -c -o umount_static-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi`
+
 umount_static-env.o: $(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-env.o -MD -MP -MF $(DEPDIR)/umount_static-env.Tpo -c -o umount_static-env.o `test -f '$(top_srcdir)/lib/env.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/env.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umount_static-env.Tpo $(DEPDIR)/umount_static-env.Po
--- util-linux-2.19.1.orig/debian/mount.fstab
+++ util-linux-2.19.1/debian/mount.fstab
@@ -0,0 +1,39 @@
+# /etc/fstab: static file system information.
+#
+# The following is an example. Please see fstab(5) for further details.
+# Please refer to mount(1) for a complete description of mount options.
+#
+# Format:
+#  <file system>         <mount point>   <type>  <options>	<dump>	<pass>
+#
+# dump(8) uses the <dump> field to determine which file systems need
+# to be dumped. fsck(8) uses the <pass> column to determine which file
+# systems need to be checked--the root file system should have a 1 in
+# this field, other file systems a 2, and any file systems that should
+# not be checked (such as MS-DOS or NFS file systems) a 0.
+#
+# The `sw' option indicates that the swap partition is to be activated
+# with `swapon -a'.
+/dev/hda2	none		swap	sw				0 0
+
+# The `bsdgroups' option indicates that the file system is to be mounted
+# with BSD semantics (files inherit the group ownership of the directory
+# in which they live). `ro' can be used to mount a file system read-only.
+/dev/hda3	/		ext2	defaults			0 1
+/dev/hda5	/home		ext2	defaults			0 2
+/dev/hda6	/var		ext2	defaults			0 2
+/dev/hda7	/usr		ext2	defaults,ro			0 2
+/dev/hda8	/usr/local	ext2	defaults,bsdgroups		0 2
+
+# The `noauto' option indicates that the file system should not be mounted
+# with `mount -a'. `user' indicates that normal users are allowed to mount
+# the file system.
+/dev/cdrom	/cdrom		iso9660	defaults,noauto,ro,user		0 0
+/dev/fd0	/floppy		minix	defaults,noauto,user		0 0
+/dev/fd1	/floppy		minix	defaults,noauto,user		0 0
+
+# NFS file systems:
+server:/export/usr	/usr	nfs	defaults			0 0
+
+# proc file system:
+proc		/proc		proc	defaults			0 0
--- util-linux-2.19.1.orig/debian/libmount-dev.files
+++ util-linux-2.19.1/debian/libmount-dev.files
@@ -0,0 +1,4 @@
+usr/lib/libmount.so
+usr/lib/libmount.a
+usr/include/libmount
+usr/lib/pkgconfig/mount.pc
--- util-linux-2.19.1.orig/debian/fstab.example2
+++ util-linux-2.19.1/debian/fstab.example2
@@ -0,0 +1,39 @@
+# /etc/fstab: static file system information.
+#
+# The following is an example. Please see fstab(5) for further details.
+# Please refer to mount(1) for a complete description of mount options.
+#
+# Format:
+#  <file system>         <mount point>   <type>  <options>	<dump>	<pass>
+#
+# dump(8) uses the <dump> field to determine which file systems need
+# to be dumped. fsck(8) uses the <pass> column to determine which file
+# systems need to be checked--the root file system should have a 1 in
+# this field, other file systems a 2, and any file systems that should
+# not be checked (such as MS-DOS or NFS file systems) a 0.
+#
+# The `sw' option indicates that the swap partition is to be activated
+# with `swapon -a'.
+/dev/hda2	none		swap	sw				0 0
+
+# The `bsdgroups' option indicates that the file system is to be mounted
+# with BSD semantics (files inherit the group ownership of the directory
+# in which they live). `ro' can be used to mount a file system read-only.
+/dev/hda3	/		ext2	defaults			0 1
+/dev/hda5	/home		ext2	defaults			0 2
+/dev/hda6	/var		ext2	defaults			0 2
+/dev/hda7	/usr		ext2	defaults,ro			0 2
+/dev/hda8	/usr/local	ext2	defaults,bsdgroups		0 2
+
+# The `noauto' option indicates that the file system should not be mounted
+# with `mount -a'. `user' indicates that normal users are allowed to mount
+# the file system.
+/dev/cdrom	/cdrom		iso9660	defaults,noauto,ro,user		0 0
+/dev/fd0	/floppy		minix	defaults,noauto,user		0 0
+/dev/fd1	/floppy		minix	defaults,noauto,user		0 0
+
+# NFS file systems:
+server:/export/usr	/usr	nfs	defaults			0 0
+
+# proc file system:
+proc		/proc		proc	defaults			0 0
--- util-linux-2.19.1.orig/debian/util-linux-locales.postinst
+++ util-linux-2.19.1/debian/util-linux-locales.postinst
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+if [ -L /usr/doc/util-linux-locales ] ; then
+    rm -f /usr/doc/util-linux-locales
+fi
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/bsdutils.files
+++ util-linux-2.19.1/debian/bsdutils.files
@@ -0,0 +1,26 @@
+usr/bin/cal
+usr/bin/col
+usr/bin/colcrt
+usr/bin/colrm
+usr/bin/column
+usr/bin/hexdump
+usr/bin/logger
+usr/bin/look
+usr/bin/renice
+usr/bin/script
+usr/bin/scriptreplay
+usr/bin/ul
+usr/bin/wall
+usr/share/man/man1/cal.1
+usr/share/man/man1/col.1
+usr/share/man/man1/colcrt.1
+usr/share/man/man1/colrm.1
+usr/share/man/man1/column.1
+usr/share/man/man1/hexdump.1
+usr/share/man/man1/logger.1
+usr/share/man/man1/look.1
+usr/share/man/man1/renice.1
+usr/share/man/man1/script.1
+usr/share/man/man1/scriptreplay.1
+usr/share/man/man1/ul.1
+usr/share/man/man1/wall.1
--- util-linux-2.19.1.orig/debian/changelog.Debian-mount.old
+++ util-linux-2.19.1/debian/changelog.Debian-mount.old
@@ -0,0 +1,168 @@
+mount (2.8a-1.2) frozen unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update lineno when reading fstab
+  * Cope with systems that don't have a newline on the last line of
+    /etc/fstab (Fixes#29282)
+
+ -- Anthony Towns <ajt@debian.org>  Wed, 11 Nov 1998 23:53:24 +1000
+
+mount (2.8a-1.1) unstable; urgency=low
+
+  * Non-maintainer upload with permision by Vincent
+  * Fixed wrong while loop that caused too many lines to be ignored.  The
+    code for the whole condition is generated with all variables replaced
+    by their values as they were when the condition was entered.  This
+    means that if one uses variable assignments, the variable to which a
+    new value was assigned still contains the old value later in the same
+    condition.  Thanks to Peter Moulder <reiter@netspace.net.au (fixes:
+    Bug#27421)
+  * Applied patch by James Troup <james@nocrew.org> that prevents mount
+    from crashing when an empty argument list is used with `-t'.  (fixes:
+    Bug#27130)
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 14 Oct 1998 23:11:14 +0200
+
+mount (2.8a-1) unstable; urgency=low
+
+  * New upstream version (Bug #26686).
+
+ -- Vincent Renardias <vincent@waw.com>  Wed, 23 Sep 1998 18:05:44 +0200
+
+mount (2.7l-5) frozen unstable; urgency=low
+
+  * Applied Roman Hodek's patch so the package now builds with stock libc6-dev
+    (This patch seems badly needed by m68k folks)
+    Fix bugs #22037, #14767, #15341, #22037.
+
+ -- Vincent Renardias <vincent@waw.com>  Mon,  8 Jun 1998 17:08:52 +0200
+
+mount (2.7l-4) unstable; urgency=low
+
+  * Fix to allow compilation on sparc
+    (Bug #21510, patch from Eric Delaunay <delaunay@lix.polytechnique.fr>)
+
+ -- Vincent Renardias <vincent@waw.com>  Thu, 23 Apr 1998 20:26:49 +0200
+
+mount (2.7l-3) unstable; urgency=low
+
+  * updated swapon(8) manpage.
+
+ -- Vincent Renardias <vincent@waw.com>  Fri, 17 Apr 1998 01:56:43 +0200
+
+mount (2.7l-2) unstable; urgency=low
+
+  * Update to debian std 2.4.0.0.
+  * Corrected snafu with md5sums (Bugs #19369, #18682).
+
+ -- Vincent Renardias <vincent@waw.com>  Sat, 14 Mar 1998 18:33:02 +0100
+
+mount (2.7l-1) unstable; urgency=low
+
+  * New upstream release (Bug #17745, Said to fix #17523).
+  * Apply the usual patches to get it to compile under libc6 *sigh*.
+  * Removed dependency on libc6 (already Pre-Depends:): Bug #18245.
+  * Remove doubled example in example fstab (Bug #16889).
+
+ -- Vincent Renardias <vincent@waw.com>  Tue, 17 Feb 1998 20:10:55 +0100
+
+mount (2.7g-2) unstable; urgency=low
+
+  * Recompile with kernel 2.0.32 headers so the option noatime works
+    (Bug #15304).
+  * compress changelog.Debian (Bug #15430).
+
+ -- Vincent Renardias <vincent@waw.com>  Thu, 18 Dec 1997 04:39:22 +0100
+
+mount (2.7g-1) unstable; urgency=low
+
+  * New upstream version:
+    - 'mount -aF': This will do the mounts on different devices
+       or different NFS servers in parallel.  (Fix Bug #?????)
+  * mount.c: patch to get it compile with DO_PS_FIDDLING.
+  * patch to get 'swapon -s' error messages more explicit.
+  * improved debian/rules cleanup rule.
+
+ -- Vincent Renardias <vincent@waw.com>  Sat, 13 Dec 1997 17:53:46 +0100
+
+mount (2.7f-1) unstable; urgency=low
+
+  * New upstream version (Bug #14585).
+  * Corrected documentation buglet (Bugs #13050, #14015).
+
+ -- Vincent Renardias <vincent@waw.com>  Sun, 9 Nov 1997 03:50:27 +0100
+
+mount (2.6g-2) unstable; urgency=low
+
+  * Rebuilt with libc6.
+
+ -- Vincent Renardias <vincent@waw.com>  Sat, 21 Jun 1997 17:26:47 +0200
+
+mount (2.6g-1) unstable; urgency=low
+
+  * Upstream upgrade.
+
+ -- Vincent Renardias <vincent@waw.com>  Thu, 1 May 1997 13:50:09 +0200
+
+mount (2.6d-2) unstable; urgency=low
+
+  * Included Patch from M. Dorman for glibc support (Bug #8810).
+
+ -- Vincent Renardias <vincent@waw.com>  Fri, 18 Apr 1997 20:40:17 +0200
+
+mount (2.6d-1) unstable; urgency=low
+
+  * New upstream source
+    (includes the patch I made to fix Bug #4289)
+
+ -- Vincent Renardias <vincent@waw.com>  Sat, 8 Mar 1997 23:29:53 +0100
+
+mount (2.6c-0.1) unstable; urgency=low
+
+  * Patched swapon.c to fix bug #4289:
+    'swapon -s' now gives a summary of mounted partitions.
+
+ -- Vincent Renardias <vincent@waw.com>  Tue, 18 Feb 1997 04:05:31 +0100
+
+mount (2.6c-0) unstable; urgency=low
+
+  * Upstream upgrade requested to author to fix bug #5498.
+  * it also appears to fix bug #7428, cool...
+
+ -- Vincent Renardias <vincent@waw.com>  Tue, 18 Feb 1997 02:22:11 +0100
+
+mount (2.6b-0.1) unstable; urgency=low
+
+  * Added 'Essential: yes' into debian/control.
+
+ -- Vincent Renardias <vincent@waw.com>  Sun, 16 Feb 1997 07:53:36 +0100
+
+mount (2.6b-0) unstable; urgency=low
+
+  * Upstream upgrade.
+  * Now users can umount user mounts (Fixes bug #3993).
+
+ -- Vincent Renardias <vincent@waw.com>  Sun, 16 Feb 1997 00:26:22 +0100
+
+mount (2.5p-1.2) unstable; urgency=low
+
+  * Corrected source package (Can now be extracted with
+    'dpkg-source -x').
+  * Changed 'Depends' into 'Pre-depends' on libc5.
+
+ -- Vincent Renardias <vincent@waw.com>  Sat, 15 Feb 1997 22:31:29 +0100
+
+mount (2.5p-1.1) unstable; urgency=low
+
+  * Just an interim release, the real maintainer is
+    Robert Leslie <rob@mars.org>
+  * Converted to the new package format (Fixes bug #7114).
+  * Corrected bug #6315: compressed man pages,
+    added '/usr/doc/mount/copyright' file,
+    moved examples to '/usr/doc/mount/examples'.
+
+ -- Vincent Renardias <vincent@waw.com>  Sun, 9 Feb 1997 22:08:56 +0100
+
+Local variables:
+mode: debian-changelog
+End:
--- util-linux-2.19.1.orig/debian/util-linux-locales.prerm
+++ util-linux-2.19.1/debian/util-linux-locales.prerm
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+	remove)
+		if [ -L /usr/doc/util-linux-locales ] ; then
+        		rm -f /usr/doc/util-linux-locales
+		fi
+		;;
+	upgrade|failed-upgrade|deconfigure)
+		;;
+esac
+
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/mount.preinst
+++ util-linux-2.19.1/debian/mount.preinst
@@ -0,0 +1,52 @@
+#!/bin/sh -e
+
+# Debian mount preinst
+# LaMont Jones <lamont@debian.org>
+
+chrooted() {
+  if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
+      # the devicenumber/inode pair of / is the same as that of /sbin/init's
+      # root, so we're *not* in a chroot and hence return false.
+      return 1
+  fi
+  return 0
+}
+
+case "$1" in
+    install)
+	;;
+
+    upgrade)
+	version=$2
+	DISTRO=$(lsb_release -is 2>/dev/null || echo Debian);
+
+	if [ Debian = "$DISTRO" ]; then
+	  if [ -f /proc/mounts ] && ! chrooted; then
+	      NFS_IN_USE=$(sed -n '/^[^ ]* [^ ]* nfs /p' /proc/mounts)
+	  else
+	      NFS_IN_USE=""
+	  fi
+	  if [ -n "$NFS_IN_USE" ] && [ ! -x /sbin/mount.nfs ] ; then
+	      cat << EOF
+You have NFS mount points currently mounted, and this version of mount
+requires that nfs-common be upgraded before NFS mounts will work.
+
+Aborting install.
+EOF
+	      exit 1
+	  fi
+	fi
+
+	;;
+
+    abort-upgrade)
+	;;
+
+    *)
+	echo "preinst called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+esac
+
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/uuid-dev.files
+++ util-linux-2.19.1/debian/uuid-dev.files
@@ -0,0 +1,5 @@
+usr/lib/libuuid.so
+usr/lib/libuuid.a
+usr/include/uuid
+usr/share/man/man3/uuid*
+usr/lib/pkgconfig/uuid.pc
--- util-linux-2.19.1.orig/debian/rejected-upstream
+++ util-linux-2.19.1/debian/rejected-upstream
@@ -0,0 +1,76 @@
+Date: Sun, 1 Jul 2001 18:19:00 +0200 (CEST)
+From: Adrian Bunk <bunk@fs.tum.de>
+To: util-linux@math.uio.no
+Subject: [patch] setterm -{dump,append} don't work on current virtual console
+
+Hi Andries,
+
+Colin Watson <cjw44@cam.ac.uk> reported the following Problem:
+
+<--  snip  -->
+
+When 'setterm -dump' or 'setterm -append' is called without further
+arguments, it tries to dump the current virtual console, using
+/dev/vcsa0. Unfortunately, according to the Linux Device List, the
+current virtual console text/attribute contents are on /dev/vcsa.
+
+<--  snip  -->
+
+He sent the following patch:
+
+--- util-linux-2.11g.orig/misc-utils/setterm.c
++++ util-linux-2.11g/misc-utils/setterm.c
+@@ -1115,7 +1115,10 @@
+     int fd, i, j;
+     char *inbuf, *outbuf, *p, *q;
+
+-    sprintf(infile, "/dev/vcsa%d", vcnum);
++    if (vcnum > 0)
++       sprintf(infile, "/dev/vcsa%d", vcnum);
++    else
++       sprintf(infile, "/dev/vcsa");
+     fd = open(infile, 0);
+     if (fd < 0 || read(fd, header, 4) != 4)
+       goto try_ioctl;
+
+cu
+Adrian
+
+-- 
+A "No" uttered from deepest conviction is better and greater than a
+"Yes" merely uttered to please, or what is worse, to avoid trouble.
+                -- Mahatma Ghandi
+
+
+
+
+Date: Sun, 1 Jul 2001 20:31:21 +0200 (MET DST)
+From: Andries.Brouwer@cwi.nl
+To: bunk@fs.tum.de, util-linux@math.uio.no
+Cc: cjw44@cam.ac.uk, hpa@transmeta.com
+Subject: Re: [util-linux] [patch] setterm -{dump,
+    append} don't work on current virtual console
+
+    From: Adrian Bunk <bunk@fs.tum.de>
+
+    Colin Watson <cjw44@cam.ac.uk> reported the following Problem:
+
+    When 'setterm -dump' or 'setterm -append' is called without further
+    arguments, it tries to dump the current virtual console, using
+    /dev/vcsa0. Unfortunately, according to the Linux Device List, the
+    current virtual console text/attribute contents are on /dev/vcsa.
+
+I don't think I'll make this change.
+
+There are several machines here with /dev/vcsa0 and without /dev/vcsa.
+So making this change would certainly give slight problems.
+
+One could test both, but I prefer to leave the code as it is.
+I consider the Linux Device List broken in this respect -
+the vcs naming is exactly analogous to the tty naming, with tty0
+on the same major as tty1, and there was no need to change anything.
+
+Andries
+
+[Let me cc hpa]
+[A distribution should make both nodes, just to be on the safe side.]
--- util-linux-2.19.1.orig/debian/util-linux-locales.files
+++ util-linux-2.19.1/debian/util-linux-locales.files
@@ -0,0 +1,25 @@
+usr/share/locale/ca/LC_MESSAGES/util-linux.mo
+usr/share/locale/cs/LC_MESSAGES/util-linux.mo
+usr/share/locale/da/LC_MESSAGES/util-linux.mo
+usr/share/locale/de/LC_MESSAGES/util-linux.mo
+usr/share/locale/es/LC_MESSAGES/util-linux.mo
+usr/share/locale/et/LC_MESSAGES/util-linux.mo
+usr/share/locale/eu/LC_MESSAGES/util-linux.mo
+usr/share/locale/fi/LC_MESSAGES/util-linux.mo
+usr/share/locale/fr/LC_MESSAGES/util-linux.mo
+usr/share/locale/gl/LC_MESSAGES/util-linux.mo
+usr/share/locale/hu/LC_MESSAGES/util-linux.mo
+usr/share/locale/id/LC_MESSAGES/util-linux.mo
+usr/share/locale/it/LC_MESSAGES/util-linux.mo
+usr/share/locale/ja/LC_MESSAGES/util-linux.mo
+usr/share/locale/nl/LC_MESSAGES/util-linux.mo
+usr/share/locale/pl/LC_MESSAGES/util-linux.mo
+usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
+usr/share/locale/ru/LC_MESSAGES/util-linux.mo
+usr/share/locale/sl/LC_MESSAGES/util-linux.mo
+usr/share/locale/sv/LC_MESSAGES/util-linux.mo
+usr/share/locale/tr/LC_MESSAGES/util-linux.mo
+usr/share/locale/uk/LC_MESSAGES/util-linux.mo
+usr/share/locale/vi/LC_MESSAGES/util-linux.mo
+usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo
+usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo
--- util-linux-2.19.1.orig/debian/uuid-runtime.prerm
+++ util-linux-2.19.1/debian/uuid-runtime.prerm
@@ -0,0 +1,10 @@
+#! /bin/sh
+set -e
+if [ -x /usr/sbin/uuidd ]
+then
+	/usr/sbin/uuidd -k || true
+fi
+
+#DEBHELPER#
+
+exit 0
--- util-linux-2.19.1.orig/debian/README.Debian.hwclock
+++ util-linux-2.19.1/debian/README.Debian.hwclock
@@ -0,0 +1,68 @@
+hwclock and Debian:
+
+When udev is running, hwclock -systz will be called when the RTC clock
+device is created.  When udev is not running, hwclock --hctosys will be
+called during system startup.
+
+In both cases, hwclock --systohc will be called during system shutdown.
+
+To set the date/time of the system, just use the standard UNIX date facilities
+(such as date) or any of the advanced timekeeping utilities (ntp, ntpdate,
+chrony). Other methods of setting the clock (such as hwclock) are likely to 
+cause trouble, do not use them.
+
+Please note that because the shutdown scripts call hwclock --systohc, you
+cannot set the clock using hwclock only, as your adjustment will be lost on
+the next reboot. THIS MEANS YOU MUST *NOT* FOLLOW THE PROCEDURES IN THE
+hwclock(8) MAN PAGE TO SET THE CLOCK DATE/TIME USING A REBOOT UNLESS YOU
+EDIT THE SHUTDOWN SCRIPTS.
+
+
+The full story:
+
+A Linux system actually has two clocks:
+
+ - The System Clock, kept by the kernel. This is the clock that Linux uses for
+   day-to-day activities, and this is also the clock you set using date.
+
+ - The Hardware Clock, also called RTC, which is used as a backup to keep time 
+   while the computer is turned off, or in APM suspended state. This is the
+   clock you set using hwclock --set.
+
+(you can get more information about these two clocks in the hwclock(8) man
+page).
+
+hwclock is used to copy time between these two clocks. For the Debian
+standard install, the system clock is initialized with the value of the
+hardware clock during startup, and the value of the system clock is copied
+back to the hardware clock during system shutdown/reboot.
+
+So, in a Debian default install, you can keep the illusion that there's a
+single clock. Unless you use a program that modifies the hardware clock
+directly and does not set the system clock as well, that is.
+
+
+Issues with hwclock --adjust:
+
+hwclock has a facility to try to correct for systematic drift in the
+hardware clock, accessed by hwclock --adjust. This facility is *dangerous*
+because it has a severe drawback: it assumes that no program other than
+hwclock --systohc will ever be used to change the hardware clock.
+
+This assumption is often false, as many common utilities such as ntp,
+chrony, as well as your computer's System Setup BIOS program, and
+any other OS you have in your machine will change the clock.
+
+Also, if hwclock --adjust is used, one must make sure the drift file
+(/etc/adjtime) is deleted every time the system clock is set to a very
+different value (even if you're using hwclock itself to do it!), or the
+drift computation might become invalid and cause the hardware clock to be
+incorrectly set the next time hwclock --adjust is used.
+
+hwclock currently does not perform any sort of sanity checks in the values
+it uses to compute the drift file, and will corrupt your clock time by
+potentially very large amounts if anything goes wrong.
+
+Don't use the hwclock --adjust facility, refer to alternate (and much safer)
+programs such as ntp or chrony if you need precision timekeeping.
+
--- util-linux-2.19.1.orig/debian/uuid-runtime.lintian-overrides
+++ util-linux-2.19.1/debian/uuid-runtime.lintian-overrides
@@ -0,0 +1 @@
+uuid-runtime: command-with-path-in-maintainer-script prerm:5 /usr/sbin/uuidd
--- util-linux-2.19.1.orig/debian/watch
+++ util-linux-2.19.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v([\.\d]+)/util-linux-([\.\d]+)\.tar\.bz2
--- util-linux-2.19.1.orig/debian/util-linux.examples
+++ util-linux-2.19.1/debian/util-linux.examples
@@ -0,0 +1,2 @@
+fdisk/sfdisk.examples
+debian/fstab.example2
--- util-linux-2.19.1.orig/debian/bsdutils.postinst
+++ util-linux-2.19.1/debian/bsdutils.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ -L /usr/doc/bsdutils ] ; then
+    rm -f /usr/doc/bsdutils
+fi
+
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/libmount1.shlibs
+++ util-linux-2.19.1/debian/libmount1.shlibs
@@ -0,0 +1,2 @@
+libmount 1 libmount1 (>= 2.19.1)
+udeb: libmount 1 libmount1-udeb (>= 2.19.1)
--- util-linux-2.19.1.orig/debian/libuuid.copyright
+++ util-linux-2.19.1/debian/libuuid.copyright
@@ -0,0 +1,35 @@
+This is libuuid, previously part of e2fsprogs this is now part of
+util-linux-ng and has thus moved to the util-linux Debian source
+package.
+
+Upstream Author: Theodore Ts'o <tytso@mit.edu>
+
+Copyright:
+
+Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, and the entire permission notice in its entirety,
+   including the disclaimer of warranties.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
--- util-linux-2.19.1.orig/debian/copyright
+++ util-linux-2.19.1/debian/copyright
@@ -0,0 +1,41 @@
+This is the Debian GNU/Linux prepackaged version of util-linux.
+
+This package was put together by Guy Maor <maor@debian.org> and later
+maintained by Sean 'Shaleh' Perry <shaleh@debian.org>, and Adrian Bunk
+<bunk@stusta.de>.
+
+The current maintainer is LaMont Jones <lamont@debian.org>.
+See also: git://git.debian.org/~lamont/util-linux.git
+
+It was downloaded from:
+    ftp://ftp.us.kernel.org/pub/linux/utils/util-linux-ng/
+
+Upstream maintainers include:
+  Maintainer: Karel Zak <kzak@redhat.com>
+  Past Maintainer: Adrian Bunk <bunk@fs.tum.de>
+  Past Maintainer: Andries Brouwer <aeb@cwi.nl>
+  See also /usr/share/doc/util-linux/AUTHORS
+
+Copyright:
+
+  A variety of people and entities, as befits the nature of the package.
+  See the individual sources for exact copyright holder information.
+
+License:
+
+  The project doesn't use same license for all code. There is code with:
+
+     * GPLv2+ (GNU General Public License version 2, or any later version)
+
+     * GPLv2 (GNU General Public License version 2)
+
+     * BSD with advertising
+
+     * Public Domain
+
+  Please, check source code for more details. A license is usually at the start
+  of each source file.
+
+  Anything lacking an explicit license may be redistributed under the terms
+  of the GNU GPL Version 2 or later found on Debian systems in the file
+  /usr/share/common-licenses/GPL
--- util-linux-2.19.1.orig/debian/mount.docs
+++ util-linux-2.19.1/debian/mount.docs
@@ -0,0 +1 @@
+mount/README.mount
--- util-linux-2.19.1.orig/debian/hwclock.sh
+++ util-linux-2.19.1/debian/hwclock.sh
@@ -0,0 +1,171 @@
+#!/bin/sh
+# hwclock.sh	Set and adjust the CMOS clock, according to the UTC
+#		setting in /etc/default/rcS (see also rcS(5)).
+#
+# Version:	@(#)hwclock.sh  2.00  14-Dec-1998  miquels@cistron.nl
+#
+# Patches:
+#		2000-01-30 Henrique M. Holschuh <hmh@rcm.org.br>
+#		 - Minor cosmetic changes in an attempt to help new
+#		   users notice something IS changing their clocks
+#		   during startup/shutdown.
+#		 - Added comments to alert users of hwclock issues
+#		   and discourage tampering without proper doc reading.
+
+# WARNING:	Please read /usr/share/doc/util-linux/README.Debian.hwclock
+#		before changing this file. You risk serious clock
+#		misbehaviour otherwise.
+
+### BEGIN INIT INFO
+# Provides:          hwclock
+# Required-Start:    checkroot
+# Required-Stop:     $local_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+### END INIT INFO
+
+FIRST=no	# debian/rules sets this to 'yes' when creating hwclockfirst.sh
+
+# Set this to any options you might need to give to hwclock, such
+# as machine hardware clock type for Alphas.
+HWCLOCKPARS=
+
+# Set this to the hardware clock device you want to use, it should
+# probably match the CONFIG_RTC_HCTOSYS_DEVICE kernel config option.
+HCTOSYS_DEVICE=rtc0
+
+hwclocksh()
+{
+    [ ! -x /sbin/hwclock ] && return 0
+    [ ! -r /etc/default/rcS ] || . /etc/default/rcS
+
+    . /lib/lsb/init-functions
+    verbose_log_action_msg() { [ "$VERBOSE" = no ] || log_action_msg "$@"; }
+
+    [ "$GMT" = "-u" ] && UTC="yes"
+    case "$UTC" in
+       no|"")	GMT="--localtime"
+		UTC=""
+		if [ "X$FIRST" = "Xyes" ] && [ ! -r /etc/localtime ]; then
+		    if [ -z "$TZ" ]; then
+			log_action_msg "System clock was not updated at this time"
+			return 1
+		    fi
+		fi
+		;;
+       yes)	GMT="--utc"
+		UTC="--utc"
+		;;
+       *)	log_action_msg "Unknown UTC setting: \"$UTC\""; return 1 ;;
+    esac
+
+    case "$BADYEAR" in
+       no|"")	BADYEAR="" ;;
+       yes)	BADYEAR="--badyear" ;;
+       *)	log_action_msg "unknown BADYEAR setting: \"$BADYEAR\""; return 1 ;;
+    esac
+
+    case "$1" in
+	start)
+	    if [ -d /run/udev ] || [ -d /dev/.udev ]; then
+		return 0
+	    fi
+
+	    if [ -w /etc ] && [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then
+		echo "0.0 0 0.0" > /etc/adjtime
+	    fi
+
+	    if [ ! -w /etc/adjtime ]; then
+		NOADJ="--noadjfile"
+	    else
+	    	NOADJ=""
+	    fi
+
+	    if [ "$FIRST" != yes ]; then
+		# Uncomment the hwclock --adjust line below if you want
+		# hwclock to try to correct systematic drift errors in the
+		# Hardware Clock.
+		#
+		# WARNING: If you uncomment this option, you must either make
+		# sure *nothing* changes the Hardware Clock other than
+		# hwclock --systohc, or you must delete /etc/adjtime
+		# every time someone else modifies the Hardware Clock.
+		#
+		# Common "vilains" are: ntp, MS Windows, the BIOS Setup
+		# program.
+		#
+		# WARNING: You must remember to invalidate (delete)
+		# /etc/adjtime if you ever need to set the system clock
+		# to a very different value and hwclock --adjust is being
+		# used.
+		#
+		# Please read /usr/share/doc/util-linux/README.Debian.hwclock
+		# before enabling hwclock --adjust.
+
+		#/sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --adjust $GMT $BADYEAR
+		:
+	    fi
+
+	    if [ "$HWCLOCKACCESS" != no ]; then
+		log_action_msg "Setting the system clock"
+
+		# Copies Hardware Clock time to System Clock using the correct
+		# timezone for hardware clocks in local time, and sets kernel
+		# timezone. DO NOT REMOVE.
+		if /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --hctosys $GMT $HWCLOCKPARS $BADYEAR $NOADJ; then
+		    #	Announce the local time.
+		    verbose_log_action_msg "System Clock set to: `date $UTC`"
+		else
+		    log_warning_msg "Unable to set System Clock to: `date $UTC`"
+		fi
+	    else
+		verbose_log_action_msg "Not setting System Clock"
+	    fi
+	    ;;
+	stop|restart|reload|force-reload)
+	    #
+	    # Updates the Hardware Clock with the System Clock time.
+	    # This will *override* any changes made to the Hardware Clock.
+	    #
+	    # WARNING: If you disable this, any changes to the system
+	    #          clock will not be carried across reboots.
+	    #
+	    if [ ! -w /etc/adjtime ]; then
+		NOADJ="--noadjfile"
+	    else
+	    	NOADJ=""
+	    fi
+
+	    if [ "$HWCLOCKACCESS" != no ]; then
+		log_action_msg "Saving the system clock"
+		if [ "$GMT" = "-u" ]; then
+		    GMT="--utc"
+		fi
+		if /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --systohc $GMT $HWCLOCKPARS $BADYEAR $NOADJ; then
+		    verbose_log_action_msg "Hardware Clock updated to `date`"
+		fi
+	    else
+		verbose_log_action_msg "Not saving System Clock"
+	    fi
+	    ;;
+	show)
+	    if [ ! -w /etc/adjtime ]; then
+		NOADJ="--noadjfile"
+	    else
+	    	NOADJ=""
+	    fi
+
+	    if [ "$HWCLOCKACCESS" != no ]; then
+		/sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --show $GMT $HWCLOCKPARS $BADYEAR $NOADJ
+	    fi
+	    ;;
+	*)
+	    log_success_msg "Usage: hwclock.sh {start|stop|reload|force-reload|show}"
+	    log_success_msg "       start sets kernel (system) clock from hardware (RTC) clock"
+	    log_success_msg "       stop and reload set hardware (RTC) clock from kernel (system) clock"
+	    return 1
+	    ;;
+    esac
+}
+
+hwclocksh "$@"
--- util-linux-2.19.1.orig/debian/README.script
+++ util-linux-2.19.1/debian/README.script
@@ -0,0 +1,38 @@
+Security hole in `script'
+-------------------------
+
+The BSD `script' utility included in the `bsdutils' package is not
+installed setuid root, and was not written to be.  Sometimes the tty
+`script' allocates is already owned by the appropriate user, in which
+case there will be no problem.  In other cases, `script' will not be
+able to set the ownership or mode of the pty/tty pair it allocates,
+and so it cannot prevent other processes reading or writing to the tty.
+
+The result of this is a security hole: during such a `script' session,
+other users can read keystrokes from your tty, or write to your terminal,
+without any warning or explicit authorisation.  This means that any
+password(s) or other sensitive data you enter during such a `script'
+session are not secure against snooping, even if they are (properly)
+not echoed to the screen.
+
+To protect against this, `script' tries to detect whether the tty
+allocated for it by the C library's openpty() function is secure
+against snooping.  If it detects that there is a problem, `script'
+issues a warning.  If you see this warning, you should not enter any
+sensitive data during the script session, and you should not trust the
+output displayed, or that recorded in the `typescript' file, to be free
+from tampering.
+
+This bug is due to a long-standing design flaw in UNIX, and is to be cured
+shortly by the introduction of the UNIX98-style pty system supported
+by GLIBC 2.1 and Linux 2.2.  The UNIX98-style pty system makes use of
+kernel support to create slave devices on the fly, with the correct
+ownership and permissions already in place.  This allows unprivileged
+user programs to allocate pty/tty pairs securely, and eliminates the
+race conditions currently present in pty allocation.
+
+When `script' is used on a system with UNIX98-style pty support in
+the kernel and in libc, `script' will detect that its tty is secure,
+and will not display the warning.
+
+Charles Briscoe-Smith <cpbs@debian.org>  Wed,  9 Dec 1998 13:32:49 +0000
--- util-linux-2.19.1.orig/debian/util-linux.postrm
+++ util-linux-2.19.1/debian/util-linux.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+case "$1" in
+	remove)
+		;;
+        purge)
+                update-rc.d hwclock.sh remove >/dev/null || true
+		update-rc.d hwclockfirst.sh remove >/dev/null || true
+		rm -f /etc/adjtime
+                ;;
+	*)
+		;;
+esac
+
+if [ -x /usr/sbin/update-mime ]; then
+	update-mime
+fi
+
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/libuuid1.shlibs
+++ util-linux-2.19.1/debian/libuuid1.shlibs
@@ -0,0 +1,2 @@
+libuuid 1 libuuid1 (>= 2.16)
+udeb: libuuid 1 libuuid1-udeb (>= 2.16)
--- util-linux-2.19.1.orig/debian/libuuid1-udeb.dirs
+++ util-linux-2.19.1/debian/libuuid1-udeb.dirs
@@ -0,0 +1,2 @@
+lib
+sbin
--- util-linux-2.19.1.orig/debian/mount.files
+++ util-linux-2.19.1/debian/mount.files
@@ -0,0 +1,13 @@
+bin/findmnt
+bin/mount
+bin/umount
+sbin/losetup
+sbin/swapoff
+sbin/swapon
+usr/share/man/man5/fstab.5
+usr/share/man/man8/findmnt.8
+usr/share/man/man8/losetup.8
+usr/share/man/man8/mount.8
+usr/share/man/man8/swapoff.8
+usr/share/man/man8/swapon.8
+usr/share/man/man8/umount.8
--- util-linux-2.19.1.orig/debian/mime.util-linux
+++ util-linux-2.19.1/debian/mime.util-linux
@@ -0,0 +1,2 @@
+text/plain; more %s; needsterminal; priority=5
+text/*; more %s; needsterminal; priority=1
--- util-linux-2.19.1.orig/debian/uuid-dev.README.Debian
+++ util-linux-2.19.1/debian/uuid-dev.README.Debian
@@ -0,0 +1,23 @@
+
+In order to santize e2fsprogs to be DFSG free, the file
+draft-leach-uuids-guids-01.txt has been removed.  It can be obtained
+by downloading e2fsprogs from the upstream sources.  It may also be
+available from other sites on the network, if you do a quick web
+search for the string "draft-leach-uuids-guids-01".
+
+Note that debian/rules is set up to include the file on Ubuntu
+systems, so for people trying to build e2fsprogs on Ubuntu systems,
+they should start from the upstream sources, and not the
+Debian-expurgated sources found in the Debian repository.  (n.b., for
+WIP releases the command "./util/gen-tarball ubuntu" will help create
+tar file which is appropriately named to make life easier for
+dpkg-buildpackage.)  Since Ubuntu doesn't have the DFSG restrictions,
+the documentation which has been removed for Debian's DFSG license
+purity shouldn't be denied to Ubuntu users.
+
+					Theodore Ts'o
+					Ocotober 3, 2006
+
+
+
+
--- util-linux-2.19.1.orig/debian/libuuid1.postinst
+++ util-linux-2.19.1/debian/libuuid1.postinst
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+ADDUSERCONF='/etc/adduser.conf'
+
+if test -f $ADDUSERCONF; then
+    FIRST_SYSTEM_UID=$(sed -n "s/^[[:space:]]*FIRST_SYSTEM_UID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+    LAST_SYSTEM_UID=$(sed -n "s/^[[:space:]]*LAST_SYSTEM_UID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+    FIRST_SYSTEM_GID=$(sed -n "s/^[[:space:]]*FIRST_SYSTEM_GID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+    LAST_SYSTEM_GID=$(sed -n "s/^[[:space:]]*LAST_SYSTEM_GID[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" $ADDUSERCONF)
+fi
+
+if test -z "$FIRST_SYSTEM_UID"; then
+    FIRST_SYSTEM_UID=100
+fi
+if test -z "$LAST_SYSTEM_UID"; then
+    LAST_SYSTEM_UID=999
+fi
+if test -z "$FIRST_SYSTEM_GID"; then
+    FIRST_SYSTEM_GID=100
+fi
+if test -z "$LAST_SYSTEM_GID"; then
+    LAST_SYSTEM_GID=999
+fi
+
+if ! getent group | grep -q libuuid; then
+  groupadd -f -K GID_MIN=$FIRST_SYSTEM_GID -K GID_MAX=$LAST_SYSTEM_GID libuuid
+fi
+if ! getent passwd | grep -q libuuid; then
+   useradd -d /var/lib/libuuid -K UID_MIN=$FIRST_SYSTEM_UID -K UID_MAX=$LAST_SYSTEM_UID -g libuuid libuuid
+fi
+
+mkdir -p /var/lib/libuuid
+chown libuuid:libuuid /var/lib/libuuid
+chmod 2775 /var/lib/libuuid
+
+#DEBHELPER#
+
+exit 0
--- util-linux-2.19.1.orig/debian/libuuid1.files
+++ util-linux-2.19.1/debian/libuuid1.files
@@ -0,0 +1 @@
+lib/libuuid*.so.*
--- util-linux-2.19.1.orig/debian/libblkid1.symbols
+++ util-linux-2.19.1/debian/libblkid1.symbols
@@ -0,0 +1,100 @@
+libblkid.so.1 libblkid1 #MINVER#
+ BLKID_1.0@BLKID_1.0 2.16
+ BLKID_2.15@BLKID_2.15 2.16
+ BLKID_2.17@BLKID_2.17 2.17.2
+ BLKID_2.18@BLKID_2.18 2.19.1
+ blkid_dev_devname@BLKID_1.0 2.16
+ blkid_dev_has_tag@BLKID_1.0 2.16
+ blkid_dev_iterate_begin@BLKID_1.0 2.16
+ blkid_dev_iterate_end@BLKID_1.0 2.16
+ blkid_dev_next@BLKID_1.0 2.16
+ blkid_dev_set_search@BLKID_1.0 2.16
+ blkid_devno_to_devname@BLKID_1.0 2.16
+ blkid_devno_to_wholedisk@BLKID_2.17 2.17.2
+ blkid_do_fullprobe@BLKID_2.17 2.17.2
+ blkid_do_probe@BLKID_2.15 2.16
+ blkid_do_safeprobe@BLKID_2.15 2.16
+ blkid_encode_string@BLKID_2.15 2.16
+ blkid_evaluate_tag@BLKID_2.15 2.16
+ blkid_find_dev_with_tag@BLKID_1.0 2.16
+ blkid_free_probe@BLKID_2.15 2.16
+ blkid_gc_cache@BLKID_1.0 2.16
+ blkid_get_cache@BLKID_1.0 2.16
+ blkid_get_dev@BLKID_1.0 2.16
+ blkid_get_dev_size@BLKID_1.0 2.16
+ blkid_get_devname@BLKID_1.0 2.16
+ blkid_get_library_version@BLKID_1.0 2.16
+ blkid_get_tag_value@BLKID_1.0 2.16
+ blkid_known_fstype@BLKID_1.0 2.16
+ blkid_known_pttype@BLKID_2.17 2.17.2
+ blkid_new_probe@BLKID_2.15 2.16
+ blkid_new_probe_from_filename@BLKID_2.17 2.17.2
+ blkid_parse_tag_string@BLKID_1.0 2.16
+ blkid_parse_version_string@BLKID_1.0 2.16
+ blkid_partition_get_flags@BLKID_2.18 2.19.1
+ blkid_partition_get_name@BLKID_2.17 2.17.2
+ blkid_partition_get_partno@BLKID_2.17 2.17.2
+ blkid_partition_get_size@BLKID_2.17 2.17.2
+ blkid_partition_get_start@BLKID_2.17 2.17.2
+ blkid_partition_get_table@BLKID_2.17 2.17.2
+ blkid_partition_get_type@BLKID_2.17 2.17.2
+ blkid_partition_get_type_string@BLKID_2.17 2.17.2
+ blkid_partition_get_uuid@BLKID_2.17 2.17.2
+ blkid_partition_is_extended@BLKID_2.17 2.17.2
+ blkid_partition_is_logical@BLKID_2.17 2.17.2
+ blkid_partition_is_primary@BLKID_2.17 2.17.2
+ blkid_partlist_devno_to_partition@BLKID_2.18 2.19.1
+ blkid_partlist_get_partition@BLKID_2.17 2.17.2
+ blkid_partlist_get_table@BLKID_2.18 2.19.1
+ blkid_partlist_numof_partitions@BLKID_2.17 2.17.2
+ blkid_parttable_get_offset@BLKID_2.17 2.17.2
+ blkid_parttable_get_parent@BLKID_2.17 2.17.2
+ blkid_parttable_get_type@BLKID_2.17 2.17.2
+ blkid_probe_all@BLKID_1.0 2.16
+ blkid_probe_all_new@BLKID_1.0 2.16
+ blkid_probe_all_removable@BLKID_2.18 2.19.1
+ blkid_probe_enable_partitions@BLKID_2.17 2.17.2
+ blkid_probe_enable_superblocks@BLKID_2.17 2.17.2
+ blkid_probe_enable_topology@BLKID_2.17 2.17.2
+ blkid_probe_filter_partitions_type@BLKID_2.17 2.17.2
+ blkid_probe_filter_superblocks_type@BLKID_2.17 2.17.2
+ blkid_probe_filter_superblocks_usage@BLKID_2.17 2.17.2
+ blkid_probe_filter_types@BLKID_2.15 2.16
+ blkid_probe_filter_usage@BLKID_2.15 2.16
+ blkid_probe_get_devno@BLKID_2.17 2.17.2
+ blkid_probe_get_fd@BLKID_2.18 2.19.1
+ blkid_probe_get_offset@BLKID_2.18 2.19.1
+ blkid_probe_get_partitions@BLKID_2.17 2.17.2
+ blkid_probe_get_sectors@BLKID_2.17 2.19.1
+ blkid_probe_get_sectorsize@BLKID_2.17 2.17.2
+ blkid_probe_get_size@BLKID_2.17 2.17.2
+ blkid_probe_get_topology@BLKID_2.17 2.17.2
+ blkid_probe_get_value@BLKID_2.15 2.16
+ blkid_probe_get_wholedisk_devno@BLKID_2.18 2.19.1
+ blkid_probe_has_value@BLKID_2.15 2.16
+ blkid_probe_invert_filter@BLKID_2.15 2.16
+ blkid_probe_invert_partitions_filter@BLKID_2.17 2.17.2
+ blkid_probe_invert_superblocks_filter@BLKID_2.17 2.17.2
+ blkid_probe_is_wholedisk@BLKID_2.18 2.19.1
+ blkid_probe_lookup_value@BLKID_2.15 2.16
+ blkid_probe_numof_values@BLKID_2.15 2.16
+ blkid_probe_reset_filter@BLKID_2.15 2.16
+ blkid_probe_reset_partitions_filter@BLKID_2.17 2.17.2
+ blkid_probe_reset_superblocks_filter@BLKID_2.17 2.17.2
+ blkid_probe_set_device@BLKID_2.15 2.16
+ blkid_probe_set_partitions_flags@BLKID_2.17 2.17.2
+ blkid_probe_set_request@BLKID_2.15 2.16
+ blkid_probe_set_superblocks_flags@BLKID_2.17 2.17.2
+ blkid_put_cache@BLKID_1.0 2.16
+ blkid_reset_probe@BLKID_2.15 2.16
+ blkid_safe_string@BLKID_2.15 2.16
+ blkid_send_uevent@BLKID_2.15 2.16
+ blkid_tag_iterate_begin@BLKID_1.0 2.16
+ blkid_tag_iterate_end@BLKID_1.0 2.16
+ blkid_tag_next@BLKID_1.0 2.16
+ blkid_topology_get_alignment_offset@BLKID_2.17 2.17.2
+ blkid_topology_get_logical_sector_size@BLKID_2.17 2.17.2
+ blkid_topology_get_minimum_io_size@BLKID_2.17 2.17.2
+ blkid_topology_get_optimal_io_size@BLKID_2.17 2.17.2
+ blkid_topology_get_physical_sector_size@BLKID_2.17 2.17.2
+ blkid_verify@BLKID_1.0 2.16
--- util-linux-2.19.1.orig/debian/cfdisk-udeb.dirs
+++ util-linux-2.19.1/debian/cfdisk-udeb.dirs
@@ -0,0 +1,54 @@
+usr/
+usr/sbin/
+usr/share/
+usr/share/locale/
+usr/share/locale/ca/
+usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/cs/
+usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/da/
+usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/de/
+usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/es/
+usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/et/
+usr/share/locale/et/LC_MESSAGES/
+usr/share/locale/eu/
+usr/share/locale/eu/LC_MESSAGES/
+usr/share/locale/fi/
+usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fr/
+usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/gl/
+usr/share/locale/gl/LC_MESSAGES/
+usr/share/locale/hu/
+usr/share/locale/hu/LC_MESSAGES/
+usr/share/locale/id/
+usr/share/locale/id/LC_MESSAGES/
+usr/share/locale/it/
+usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/ja/
+usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/nl/
+usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/pl/
+usr/share/locale/pl/LC_MESSAGES/
+usr/share/locale/pt_BR/
+usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/sl/
+usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sv/
+usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/tr/
+usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/uk/
+usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/vi/
+usr/share/locale/vi/LC_MESSAGES/
+usr/share/locale/zh_CN/
+usr/share/locale/zh_CN/LC_MESSAGES/
+usr/share/locale/zh_TW/
+usr/share/locale/zh_TW/LC_MESSAGES/
--- util-linux-2.19.1.orig/debian/bsdutils.docs
+++ util-linux-2.19.1/debian/bsdutils.docs
@@ -0,0 +1 @@
+debian/README.script
--- util-linux-2.19.1.orig/debian/control
+++ util-linux-2.19.1/debian/control
@@ -0,0 +1,223 @@
+Source: util-linux
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [linux-any], debhelper (>=5), lsb-release, pkg-config, po-debconf
+Section: base
+Priority: required
+Uploaders: Scott James Remnant <scott@ubuntu.com>, Adam Conrad <adconrad@0c3.net>
+Standards-Version: 3.9.2
+Maintainer: LaMont Jones <lamont@debian.org>
+Vcs-Browser: http://git.debian.org/?p=users/lamont/util-linux.git
+Vcs-Git: git://git.debian.org/~lamont/util-linux.git
+Homepage: http://userweb.kernel.org/~kzak/util-linux/
+
+Package: util-linux
+Architecture: any
+Section: utils
+Priority: required
+Essential: yes
+Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2), initscripts, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Pre-Depends: ${shlibs:Depends}
+Suggests: util-linux-locales, kbd | console-tools, dosfstools
+Replaces: fstrim, schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, e2fsprogs, ${util-linux:Conflicts}
+Conflicts: fstrim, schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), linux32, ${util-linux:Conflicts}
+Provides: schedutils, linux32
+Description: Miscellaneous system utilities
+ This package contains a number of important utilities, most of which
+ are oriented towards maintenance of your system.  Some of the more
+ important utilities included in this package allow you to partition
+ your hard disk, view kernel messages, and create new filesystems.
+
+Package: util-linux-locales
+Architecture: all
+Section: utils
+Priority: optional
+Depends: util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0), ${misc:Depends}
+Replaces: util-linux (<< 2.11b)
+Description: Locales files for util-linux
+ This package contains the internationalization files of for the util-linux
+ package.
+ .
+ They are needed when you want the programs in util-linux to print their
+ messages in other languages than English.
+
+Package: mount
+Architecture: linux-any
+Essential: yes
+Section: admin
+Pre-Depends: ${shlibs:Depends}
+Suggests: nfs-common (>=1:1.1.0-13)
+Description: Tools for mounting and manipulating filesystems
+ This package provides the mount(8), umount(8), swapon(8),
+ swapoff(8), and losetup(8) commands.
+
+Package: bsdutils
+Architecture: any
+Essential: yes
+Section: utils
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: bsdmainutils
+Description: Basic utilities from 4.4BSD-Lite
+ This package contains the bare minimum number of BSD utilities needed
+ to boot a Debian system: logger, renice, script, scriptreplay, and wall.
+ The remaining standard BSD utilities are provided by bsdmainutils.
+
+Package: fdisk-udeb
+Architecture: linux-any
+Priority: extra
+Section: debian-installer
+Depends: ${shlibs:Depends}, ${misc:Depends}
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 99999
+Description: Manually partition a hard drive (fdisk)
+
+Package: cfdisk-udeb
+Architecture: linux-any
+Priority: extra
+Section: debian-installer
+Depends: ${shlibs:Depends}, ${misc:Depends}
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 99999
+Description: Manually partition a hard drive (cfdisk)
+
+Package: libblkid1
+Section: libs
+Priority: required
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Description: block device id library
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+
+Package: libblkid1-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Description: block device id library
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifiying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+ .
+ This is a minimal package for debian-installer.
+
+Package: libblkid-dev
+Section: libdevel
+Priority: extra
+Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev, ${misc:Depends}
+Architecture: any
+Description: block device id library - headers and static libraries
+ The blkid library which allows system programs like fsck and
+ mount to quickly and easily find block devices by filesystem UUID and
+ LABEL.  This allows system administrators to avoid specifiying
+ filesystems by hard-coded device names, but via a logical naming
+ system instead.
+ .
+ This package contains the development environment for the blkid library.
+
+Package: libmount1
+Section: libs
+Priority: required
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: linux-any
+Description: block device id library
+ The device mounting library, used by mount and mount helpers.
+
+Package: libmount1-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: linux-any
+Description: block device id library
+ The device mounting library, used by mount and mount helpers.
+ .
+ This is a minimal package for debian-installer.
+
+Package: libmount-dev
+Section: libdevel
+Priority: extra
+Depends: libc6-dev | libc-dev, libmount1 (= ${binary:Version}), uuid-dev, ${misc:Depends}
+Architecture: linux-any
+Description: block device id library - headers and static libraries
+ The device mounting library, used by mount and mount helpers.
+ .
+ This package contains the development environment for the mount library.
+
+Package: libuuid1
+Section: libs
+Depends: passwd, ${shlibs:Depends}, ${misc:Depends}
+Recommends: uuid-runtime
+Replaces: e2fsprogs (<< 1.34-1)
+Architecture: any
+Description: Universally Unique ID library
+ The libuuid library generates and parses 128-bit universally unique
+ ids (UUIDs).  A UUID is an identifier that is unique across both
+ space and time, with respect to the space of all UUIDs.  A UUID can
+ be used for multiple purposes, from tagging objects with an extremely
+ short lifetime, to reliably identifying very persistent objects
+ across a network.
+ .
+ See RFC 4122 for more information.
+
+Package: uuid-runtime
+Section: libs
+Priority: optional
+Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}, ${misc:Depends}
+Replaces: e2fsprogs (<= 1.40.3-1ubuntu1)
+Architecture: any
+Description: runtime components for the Universally Unique ID library
+ The libuuid library generates and parses 128-bit universally unique
+ ids (UUIDs).  A UUID is an identifier that is unique across both
+ space and time, with respect to the space of all UUIDs.  A UUID can
+ be used for multiple purposes, from tagging objects with an extremely
+ short lifetime, to reliably identifying very persistent objects
+ across a network.
+ .
+ See RFC 4122 for more information.
+ .
+ This package contains the uuidgen program and the uuidd daemon.
+ .
+ The uuidd daemon is used to generate UUIDs, especially time-based
+ UUIDâ€™s, in a secure and guaranteed-unique fashion, even in the face
+ of large numbers of threads trying to grab UUIDâ€™s running on
+ different CPUâ€™s. It is used by libuuid as well as the uuidgen
+ program.
+
+Package: libuuid1-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Description: stripped down universally unique id library, for debian-installer
+ libuuid generates and parses 128-bit universally unique ids (UUIDs).
+ See RFC 4122 for more information.
+ .
+ This is a minimal package for debian-installer.
+
+Package: uuid-dev
+Section: libdevel
+Priority: extra
+Depends: libc6-dev | libc-dev, libuuid1 (= ${binary:Version}), ${misc:Depends}
+Replaces: e2fslibs-dev (<< 1.15)
+Architecture: any
+Description: universally unique id library - headers and static libraries
+ libuuid generates and parses 128-bit universally unique ids (UUIDs).
+ See RFC 4122 for more information.
+ .
+ This package contains the development environment for the uuid library.
+
+Package: util-linux-udeb
+Architecture: any
+Priority: optional
+Section: debian-installer
+Depends: ${shlibs:Depends}, ${misc:Depends}
+XC-Package-Type: udeb
+Description: Miscellaneous system utilities
+ This is a minimal version of util-linux for debian-installer. It only
+ contains the blkid binary at the moment.
--- util-linux-2.19.1.orig/debian/libblkid1.files
+++ util-linux-2.19.1/debian/libblkid1.files
@@ -0,0 +1 @@
+lib/libblkid*.so.*
--- util-linux-2.19.1.orig/debian/util-linux.postinst
+++ util-linux-2.19.1/debian/util-linux.postinst
@@ -0,0 +1,54 @@
+#! /bin/sh
+
+umask 022
+set -e
+
+update-alternatives --install /usr/bin/pager pager /bin/more 50 \
+  --slave /usr/share/man/man1/pager.1.gz pager.1.gz /usr/share/man/man1/more.1.gz
+update-alternatives --install /usr/bin/pager pager /usr/bin/pg 10 \
+  --slave /usr/share/man/man1/pager.1.gz pager.1.gz /usr/share/man/man1/pg.1.gz
+
+#
+#	Check if links to hwclock.sh are present in runlevel "6".
+#	If not, remove the ones from runlevel "S" so that
+#	update-rc.d will do it's job.
+#
+if [ ! -f /etc/rc6.d/???hwclock.sh ] && [ ! -f /etc/rc0.d/???hwclock.sh ]
+then
+	rm -f /etc/rcS.d/???hwclock.sh
+fi
+
+# hwclock works on all Linux architectures, except s390 (and s390x, of course).
+if [ "$(uname -s)" = "Linux" ]; then
+    model=$(uname -m)
+    if [ ${model%x} != "s390" ]; then
+        update-rc.d -f hwclock.sh remove 2>/dev/null > /dev/null
+        update-rc.d hwclock.sh start 11 S . stop 25 0 6 . > /dev/null
+        update-rc.d -f hwclockfirst.sh remove 2>/dev/null > /dev/null
+	if [ -f /etc/init.d/hwclockfirst.sh ]; then
+	  update-rc.d hwclockfirst.sh start 8 S . > /dev/null
+	fi
+    fi
+fi
+
+if [ -x /usr/sbin/update-mime ]; then
+	update-mime
+fi
+
+if [ -L /usr/doc/util-linux ] ; then
+    rm -f /usr/doc/util-linux
+fi
+
+# warn about #566072, if applicable (when upgrading from versions prior to
+# 2.17, and there are fstab entries with noauto in the 4th column, and
+# non-zero in the 6th column (cases where the 6th column is ommited are OK)
+if test "x$2" != "x" && dpkg --compare-versions "$2" lt 2.17 && \
+   test -f /usr/share/debconf/confmodule && \
+   sed 's/\s\s*/ /g' /etc/fstab | cut -d' ' -f 1,4,6 | \
+       egrep -q '^[^#]\S+ \S*noauto\S* [^0]'; then
+    . /usr/share/debconf/confmodule
+    db_input critical util-linux/noauto-with-nonzero-passnum
+    db_go
+fi
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/mount.lintian-overrides
+++ util-linux-2.19.1/debian/mount.lintian-overrides
@@ -0,0 +1,2 @@
+mount: setuid-binary bin/mount 4755 root/root
+mount: setuid-binary bin/umount 4755 root/root
--- util-linux-2.19.1.orig/debian/libmount1.symbols
+++ util-linux-2.19.1/debian/libmount1.symbols
@@ -0,0 +1,191 @@
+libmount.so.1 libmount1 #MINVER#
+ MOUNT_2.19@MOUNT_2.19 2.19.1
+ mnt_cache_device_has_tag@MOUNT_2.19 2.19.1
+ mnt_cache_find_tag_value@MOUNT_2.19 2.19.1
+ mnt_cache_read_tags@MOUNT_2.19 2.19.1
+ mnt_context_append_options@MOUNT_2.19 2.19.1
+ mnt_context_apply_fstab@MOUNT_2.19 2.19.1
+ mnt_context_disable_canonicalize@MOUNT_2.19 2.19.1
+ mnt_context_disable_helpers@MOUNT_2.19 2.19.1
+ mnt_context_disable_mtab@MOUNT_2.19 2.19.1
+ mnt_context_do_mount@MOUNT_2.19 2.19.1
+ mnt_context_do_umount@MOUNT_2.19 2.19.1
+ mnt_context_enable_fake@MOUNT_2.19 2.19.1
+ mnt_context_enable_force@MOUNT_2.19 2.19.1
+ mnt_context_enable_lazy@MOUNT_2.19 2.19.1
+ mnt_context_enable_loopdel@MOUNT_2.19 2.19.1
+ mnt_context_enable_rdonly_umount@MOUNT_2.19 2.19.1
+ mnt_context_enable_sloppy@MOUNT_2.19 2.19.1
+ mnt_context_enable_verbose@MOUNT_2.19 2.19.1
+ mnt_context_finalize_mount@MOUNT_2.19 2.19.1
+ mnt_context_finalize_umount@MOUNT_2.19 2.19.1
+ mnt_context_get_cache@MOUNT_2.19 2.19.1
+ mnt_context_get_fs@MOUNT_2.19 2.19.1
+ mnt_context_get_fstab@MOUNT_2.19 2.19.1
+ mnt_context_get_fstype@MOUNT_2.19 2.19.1
+ mnt_context_get_lock@MOUNT_2.19 2.19.1
+ mnt_context_get_mflags@MOUNT_2.19 2.19.1
+ mnt_context_get_mtab@MOUNT_2.19 2.19.1
+ mnt_context_get_optsmode@MOUNT_2.19 2.19.1
+ mnt_context_get_source@MOUNT_2.19 2.19.1
+ mnt_context_get_status@MOUNT_2.19 2.19.1
+ mnt_context_get_target@MOUNT_2.19 2.19.1
+ mnt_context_get_user_mflags@MOUNT_2.19 2.19.1
+ mnt_context_helper_setopt@MOUNT_2.19 2.19.1
+ mnt_context_init_helper@MOUNT_2.19 2.19.1
+ mnt_context_is_fake@MOUNT_2.19 2.19.1
+ mnt_context_is_force@MOUNT_2.19 2.19.1
+ mnt_context_is_lazy@MOUNT_2.19 2.19.1
+ mnt_context_is_nomtab@MOUNT_2.19 2.19.1
+ mnt_context_is_rdonly_umount@MOUNT_2.19 2.19.1
+ mnt_context_is_restricted@MOUNT_2.19 2.19.1
+ mnt_context_is_sloppy@MOUNT_2.19 2.19.1
+ mnt_context_is_verbose@MOUNT_2.19 2.19.1
+ mnt_context_mount@MOUNT_2.19 2.19.1
+ mnt_context_prepare_mount@MOUNT_2.19 2.19.1
+ mnt_context_prepare_umount@MOUNT_2.19 2.19.1
+ mnt_context_set_cache@MOUNT_2.19 2.19.1
+ mnt_context_set_fs@MOUNT_2.19 2.19.1
+ mnt_context_set_fstab@MOUNT_2.19 2.19.1
+ mnt_context_set_fstype@MOUNT_2.19 2.19.1
+ mnt_context_set_fstype_pattern@MOUNT_2.19 2.19.1
+ mnt_context_set_mflags@MOUNT_2.19 2.19.1
+ mnt_context_set_mountdata@MOUNT_2.19 2.19.1
+ mnt_context_set_options@MOUNT_2.19 2.19.1
+ mnt_context_set_options_pattern@MOUNT_2.19 2.19.1
+ mnt_context_set_optsmode@MOUNT_2.19 2.19.1
+ mnt_context_set_source@MOUNT_2.19 2.19.1
+ mnt_context_set_syscall_status@MOUNT_2.19 2.19.1
+ mnt_context_set_target@MOUNT_2.19 2.19.1
+ mnt_context_set_user_mflags@MOUNT_2.19 2.19.1
+ mnt_context_strerror@MOUNT_2.19 2.19.1
+ mnt_context_umount@MOUNT_2.19 2.19.1
+ mnt_copy_fs@MOUNT_2.19 2.19.1
+ mnt_free_cache@MOUNT_2.19 2.19.1
+ mnt_free_context@MOUNT_2.19 2.19.1
+ mnt_free_fs@MOUNT_2.19 2.19.1
+ mnt_free_iter@MOUNT_2.19 2.19.1
+ mnt_free_lock@MOUNT_2.19 2.19.1
+ mnt_free_mntent@MOUNT_2.19 2.19.1
+ mnt_free_table@MOUNT_2.19 2.19.1
+ mnt_free_update@MOUNT_2.19 2.19.1
+ mnt_fs_append_attributes@MOUNT_2.19 2.19.1
+ mnt_fs_append_fs_options@MOUNT_2.19 2.19.1
+ mnt_fs_append_options@MOUNT_2.19 2.19.1
+ mnt_fs_append_user_options@MOUNT_2.19 2.19.1
+ mnt_fs_append_vfs_options@MOUNT_2.19 2.19.1
+ mnt_fs_get_attribute@MOUNT_2.19 2.19.1
+ mnt_fs_get_attributes@MOUNT_2.19 2.19.1
+ mnt_fs_get_bindsrc@MOUNT_2.19 2.19.1
+ mnt_fs_get_devno@MOUNT_2.19 2.19.1
+ mnt_fs_get_freq@MOUNT_2.19 2.19.1
+ mnt_fs_get_fs_options@MOUNT_2.19 2.19.1
+ mnt_fs_get_fstype@MOUNT_2.19 2.19.1
+ mnt_fs_get_id@MOUNT_2.19 2.19.1
+ mnt_fs_get_option@MOUNT_2.19 2.19.1
+ mnt_fs_get_parent_id@MOUNT_2.19 2.19.1
+ mnt_fs_get_passno@MOUNT_2.19 2.19.1
+ mnt_fs_get_root@MOUNT_2.19 2.19.1
+ mnt_fs_get_source@MOUNT_2.19 2.19.1
+ mnt_fs_get_srcpath@MOUNT_2.19 2.19.1
+ mnt_fs_get_tag@MOUNT_2.19 2.19.1
+ mnt_fs_get_target@MOUNT_2.19 2.19.1
+ mnt_fs_get_user_options@MOUNT_2.19 2.19.1
+ mnt_fs_get_userdata@MOUNT_2.19 2.19.1
+ mnt_fs_get_vfs_options@MOUNT_2.19 2.19.1
+ mnt_fs_is_kernel@MOUNT_2.19 2.19.1
+ mnt_fs_match_fstype@MOUNT_2.19 2.19.1
+ mnt_fs_match_options@MOUNT_2.19 2.19.1
+ mnt_fs_match_source@MOUNT_2.19 2.19.1
+ mnt_fs_match_target@MOUNT_2.19 2.19.1
+ mnt_fs_prepend_attributes@MOUNT_2.19 2.19.1
+ mnt_fs_prepend_fs_options@MOUNT_2.19 2.19.1
+ mnt_fs_prepend_options@MOUNT_2.19 2.19.1
+ mnt_fs_prepend_user_options@MOUNT_2.19 2.19.1
+ mnt_fs_prepend_vfs_options@MOUNT_2.19 2.19.1
+ mnt_fs_print_debug@MOUNT_2.19 2.19.1
+ mnt_fs_set_attributes@MOUNT_2.19 2.19.1
+ mnt_fs_set_bindsrc@MOUNT_2.19 2.19.1
+ mnt_fs_set_freq@MOUNT_2.19 2.19.1
+ mnt_fs_set_fs_options@MOUNT_2.19 2.19.1
+ mnt_fs_set_fstype@MOUNT_2.19 2.19.1
+ mnt_fs_set_options@MOUNT_2.19 2.19.1
+ mnt_fs_set_passno@MOUNT_2.19 2.19.1
+ mnt_fs_set_root@MOUNT_2.19 2.19.1
+ mnt_fs_set_source@MOUNT_2.19 2.19.1
+ mnt_fs_set_target@MOUNT_2.19 2.19.1
+ mnt_fs_set_user_options@MOUNT_2.19 2.19.1
+ mnt_fs_set_userdata@MOUNT_2.19 2.19.1
+ mnt_fs_set_vfs_options@MOUNT_2.19 2.19.1
+ mnt_fs_strdup_options@MOUNT_2.19 2.19.1
+ mnt_fs_to_mntent@MOUNT_2.19 2.19.1
+ mnt_fstype_is_netfs@MOUNT_2.19 2.19.1
+ mnt_fstype_is_pseudofs@MOUNT_2.19 2.19.1
+ mnt_get_builtin_optmap@MOUNT_2.19 2.19.1
+ mnt_get_fstab_path@MOUNT_2.19 2.19.1
+ mnt_get_fstype@MOUNT_2.19 2.19.1
+ mnt_get_library_version@MOUNT_2.19 2.19.1
+ mnt_get_mtab_path@MOUNT_2.19 2.19.1
+ mnt_has_regular_mtab@MOUNT_2.19 2.19.1
+ mnt_init_debug@MOUNT_2.19 2.19.1
+ mnt_iter_get_direction@MOUNT_2.19 2.19.1
+ mnt_lock_block_signals@MOUNT_2.19 2.19.1
+ mnt_lock_file@MOUNT_2.19 2.19.1
+ mnt_mangle@MOUNT_2.19 2.19.1
+ mnt_match_fstype@MOUNT_2.19 2.19.1
+ mnt_match_options@MOUNT_2.19 2.19.1
+ mnt_new_cache@MOUNT_2.19 2.19.1
+ mnt_new_context@MOUNT_2.19 2.19.1
+ mnt_new_fs@MOUNT_2.19 2.19.1
+ mnt_new_iter@MOUNT_2.19 2.19.1
+ mnt_new_lock@MOUNT_2.19 2.19.1
+ mnt_new_table@MOUNT_2.19 2.19.1
+ mnt_new_table_from_dir@MOUNT_2.19 2.19.1
+ mnt_new_table_from_file@MOUNT_2.19 2.19.1
+ mnt_new_update@MOUNT_2.19 2.19.1
+ mnt_optstr_append_option@MOUNT_2.19 2.19.1
+ mnt_optstr_apply_flags@MOUNT_2.19 2.19.1
+ mnt_optstr_get_flags@MOUNT_2.19 2.19.1
+ mnt_optstr_get_option@MOUNT_2.19 2.19.1
+ mnt_optstr_get_options@MOUNT_2.19 2.19.1
+ mnt_optstr_next_option@MOUNT_2.19 2.19.1
+ mnt_optstr_prepend_option@MOUNT_2.19 2.19.1
+ mnt_optstr_remove_option@MOUNT_2.19 2.19.1
+ mnt_optstr_set_option@MOUNT_2.19 2.19.1
+ mnt_parse_version_string@MOUNT_2.19 2.19.1
+ mnt_reset_context@MOUNT_2.19 2.19.1
+ mnt_reset_fs@MOUNT_2.19 2.19.1
+ mnt_reset_iter@MOUNT_2.19 2.19.1
+ mnt_resolve_path@MOUNT_2.19 2.19.1
+ mnt_resolve_spec@MOUNT_2.19 2.19.1
+ mnt_resolve_tag@MOUNT_2.19 2.19.1
+ mnt_split_optstr@MOUNT_2.19 2.19.1
+ mnt_table_add_fs@MOUNT_2.19 2.19.1
+ mnt_table_find_next_fs@MOUNT_2.19 2.19.1
+ mnt_table_find_pair@MOUNT_2.19 2.19.1
+ mnt_table_find_source@MOUNT_2.19 2.19.1
+ mnt_table_find_srcpath@MOUNT_2.19 2.19.1
+ mnt_table_find_tag@MOUNT_2.19 2.19.1
+ mnt_table_find_target@MOUNT_2.19 2.19.1
+ mnt_table_get_cache@MOUNT_2.19 2.19.1
+ mnt_table_get_nents@MOUNT_2.19 2.19.1
+ mnt_table_get_root_fs@MOUNT_2.19 2.19.1
+ mnt_table_next_child_fs@MOUNT_2.19 2.19.1
+ mnt_table_next_fs@MOUNT_2.19 2.19.1
+ mnt_table_parse_file@MOUNT_2.19 2.19.1
+ mnt_table_parse_fstab@MOUNT_2.19 2.19.1
+ mnt_table_parse_mtab@MOUNT_2.19 2.19.1
+ mnt_table_parse_stream@MOUNT_2.19 2.19.1
+ mnt_table_remove_fs@MOUNT_2.19 2.19.1
+ mnt_table_set_cache@MOUNT_2.19 2.19.1
+ mnt_table_set_iter@MOUNT_2.19 2.19.1
+ mnt_table_set_parser_errcb@MOUNT_2.19 2.19.1
+ mnt_unlock_file@MOUNT_2.19 2.19.1
+ mnt_unmangle@MOUNT_2.19 2.19.1
+ mnt_update_force_rdonly@MOUNT_2.19 2.19.1
+ mnt_update_get_filename@MOUNT_2.19 2.19.1
+ mnt_update_get_fs@MOUNT_2.19 2.19.1
+ mnt_update_get_mflags@MOUNT_2.19 2.19.1
+ mnt_update_is_ready@MOUNT_2.19 2.19.1
+ mnt_update_set_fs@MOUNT_2.19 2.19.1
+ mnt_update_table@MOUNT_2.19 2.19.1
--- util-linux-2.19.1.orig/debian/util-linux-locales.dirs
+++ util-linux-2.19.1/debian/util-linux-locales.dirs
@@ -0,0 +1,55 @@
+usr/
+usr/share/
+usr/share/doc/
+usr/share/doc/util-linux-locales/
+usr/share/locale/
+usr/share/locale/ca/
+usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/cs/
+usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/da/
+usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/de/
+usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/es/
+usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/et/
+usr/share/locale/et/LC_MESSAGES/
+usr/share/locale/eu/
+usr/share/locale/eu/LC_MESSAGES/
+usr/share/locale/fi/
+usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fr/
+usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/gl/
+usr/share/locale/gl/LC_MESSAGES/
+usr/share/locale/hu/
+usr/share/locale/hu/LC_MESSAGES/
+usr/share/locale/id/
+usr/share/locale/id/LC_MESSAGES/
+usr/share/locale/it/
+usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/ja/
+usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/nl/
+usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/pl/
+usr/share/locale/pl/LC_MESSAGES/
+usr/share/locale/pt_BR/
+usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/sl/
+usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sv/
+usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/tr/
+usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/uk/
+usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/vi/
+usr/share/locale/vi/LC_MESSAGES/
+usr/share/locale/zh_CN/
+usr/share/locale/zh_CN/LC_MESSAGES/
+usr/share/locale/zh_TW/
+usr/share/locale/zh_TW/LC_MESSAGES/
--- util-linux-2.19.1.orig/debian/libblkid1.shlibs
+++ util-linux-2.19.1/debian/libblkid1.shlibs
@@ -0,0 +1,2 @@
+libblkid 1 libblkid1 (>= 2.16)
+udeb: libblkid 1 libblkid1-udeb (>= 2.16)
--- util-linux-2.19.1.orig/debian/uuid-runtime.dirs
+++ util-linux-2.19.1/debian/uuid-runtime.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides/
--- util-linux-2.19.1.orig/debian/libblkid1-udeb.dirs
+++ util-linux-2.19.1/debian/libblkid1-udeb.dirs
@@ -0,0 +1 @@
+lib/
--- util-linux-2.19.1.orig/debian/mount.prerm
+++ util-linux-2.19.1/debian/mount.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ -L /usr/doc/mount ] ; then
+        rm -f /usr/doc/mount
+fi
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/util-linux-udeb.dirs
+++ util-linux-2.19.1/debian/util-linux-udeb.dirs
@@ -0,0 +1 @@
+sbin
--- util-linux-2.19.1.orig/debian/hwclock-set
+++ util-linux-2.19.1/debian/hwclock-set
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Reset the System Clock to UTC if the hardware clock from which it
+# was copied by the kernel was in localtime.
+
+dev=$1
+
+if [ -e /sys/fs/cgroup/systemd ] ; then
+    exit 0
+fi
+
+if [ -f /etc/default/rcS ] ; then
+    . /etc/default/rcS
+fi	
+
+if [ yes != "$UTC" ] ; then
+    if [ yes = "$BADYEAR" ] ; then
+	/sbin/hwclock --rtc=$dev --systz --localtime --noadjfile --badyear
+    else
+	/sbin/hwclock --rtc=$dev --systz --localtime --noadjfile
+    fi
+fi
--- util-linux-2.19.1.orig/debian/uuid-runtime.files
+++ util-linux-2.19.1/debian/uuid-runtime.files
@@ -0,0 +1,4 @@
+usr/bin/uuidgen
+usr/sbin/uuidd
+usr/share/man/man8/uuidd.*
+usr/share/man/man1/uuidgen.*
--- util-linux-2.19.1.orig/debian/libmount1-udeb.dirs
+++ util-linux-2.19.1/debian/libmount1-udeb.dirs
@@ -0,0 +1 @@
+lib/
--- util-linux-2.19.1.orig/debian/uuid-runtime.postinst
+++ util-linux-2.19.1/debian/uuid-runtime.postinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+if ! getent group | grep -q libuuid; then
+groupadd -f -K GID_MIN=1 -K GID_MAX=999 libuuid
+fi
+if ! getent passwd | grep -q libuuid; then
+   useradd -d /var/lib/libuuid -K UID_MIN=1 -K UID_MAX=499 -g libuuid libuuid
+fi
+chown libuuid:libuuid /usr/sbin/uuidd
+chmod 6755 /usr/sbin/uuidd
+
+#DEBHELPER#
+
+exit 0
--- util-linux-2.19.1.orig/debian/bsdutils.lintian-overrides
+++ util-linux-2.19.1/debian/bsdutils.lintian-overrides
@@ -0,0 +1 @@
+bsdutils: setgid-binary usr/bin/wall 2755 root/tty
--- util-linux-2.19.1.orig/debian/bsdutils.dirs
+++ util-linux-2.19.1/debian/bsdutils.dirs
@@ -0,0 +1,10 @@
+bin/
+usr/
+usr/bin/
+usr/share/
+usr/share/man/
+usr/share/man/man8/
+usr/share/man/man1/
+usr/share/doc/
+usr/share/doc/bsdutils/
+usr/share/lintian/overrides/
--- util-linux-2.19.1.orig/debian/compat
+++ util-linux-2.19.1/debian/compat
@@ -0,0 +1 @@
+5
--- util-linux-2.19.1.orig/debian/mount.dirs
+++ util-linux-2.19.1/debian/mount.dirs
@@ -0,0 +1,11 @@
+bin/
+sbin/
+usr/
+usr/share/
+usr/share/man/
+usr/share/man/man8/
+usr/share/man/man5/
+usr/share/doc/
+usr/share/doc/mount/
+usr/share/doc/mount/examples/
+usr/share/lintian/overrides/
--- util-linux-2.19.1.orig/debian/bsdutils.prerm
+++ util-linux-2.19.1/debian/bsdutils.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ -L /usr/doc/bsdutils ] ; then
+       rm -f /usr/doc/bsdutils
+fi
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/rules
+++ util-linux-2.19.1/debian/rules
@@ -0,0 +1,214 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DISTRO :=$(shell lsb_release -is 2>/dev/null || echo Debian)
+
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --cache-file=$(DEB_HOST_GNU_TYPE).cache
+else
+CROSS=
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+STRIP=y
+endif
+
+ifndef DEB_HOST_ARCH
+DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
+DEB_HOST_ARCH = $(DEB_BUILD_ARCH)
+endif
+
+ifndef DEB_HOST_ARCH_OS
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+endif
+
+export arch = $(DEB_HOST_ARCH)
+version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
+Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
+
+CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CONFOPTS += --with-selinux --enable-libmount-mount
+endif
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./configure $(CONFOPTS) $(CROSS)
+	$(MAKE) all CPU=$(arch) arch=$(arch)
+	touch build-stamp
+
+autofiles:
+	AM_OPTS=--copy LT_OPTS=--copy ./autogen.sh
+	rm -rf autom4te.cache
+
+newtemplate:
+	debconf-updatepo
+
+msgstats:
+	@cd debian/po && for i in *.po; do x=$$(msgfmt --statistics $$i 2>&1); echo $$i $$x; done; rm -f messages.mo *.po~
+
+msg-email:
+	@podebconf-report-po
+
+clean-preunpatch: 
+	dh_testdir
+	dh_testroot
+	dh_clean
+	test ! -d ${base} || rm -rf ${base}
+	-$(MAKE) distclean
+
+clean: clean-preunpatch
+	find . -name \*.o -exec rm {} \;
+	rm -f build-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=`pwd`/debian/util-linux INSTALL_STRIP_FLAG=""
+	dh_installdocs -i -s
+	install -m 644 login-utils/README.modems-with-agetty debian/util-linux/usr/share/doc/util-linux/README.modems-with-agetty
+	dh_installexamples -i -s
+	dh_installmenu -i -s
+	dh_installcron -i -s
+	dh_installinfo -i -s
+	dh_installchangelogs docs/v*-ReleaseNotes -i -s
+	dh_movefiles --sourcedir=debian/util-linux -i -s
+	rm -rf debian/util-linux/usr/share/locale
+	#
+	# XXX - push things to where debian has always(?) had them...
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin
+	mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin
+endif
+	mv debian/util-linux/usr/bin/tailf debian/util-linux/bin
+	mv debian/util-linux/usr/bin/isosize debian/util-linux/sbin
+	mv debian/util-linux/usr/share/man/man8/linux32.8 debian/util-linux/usr/share/man/man1/linux32.1
+	mv debian/util-linux/usr/share/man/man8/linux64.8 debian/util-linux/usr/share/man/man1/linux64.1
+	# the version in bsdmainutils seems newer.
+	rm -f debian/bsdutils/usr/bin/look debian/bsdutils/usr/share/man/man1/look.1
+	rm -f debian/bsdutils/usr/bin/hexdump debian/bsdutils/usr/share/man/man1/hexdump.1
+	# and it's less pain to just let bsmainutils deliver col for now.
+	rm -f debian/bsdutils/usr/bin/col* debian/bsdutils/usr/share/man/man1/col*.1
+	rm -f debian/bsdutils/usr/bin/ul debian/bsdutils/usr/share/man/man1/ul*.1
+	rm -f debian/bsdutils/usr/bin/cal debian/bsdutils/usr/share/man/man1/cal.1
+	# remove *.la files and empty directories which do not belong into util-linux
+	rm -f debian/util-linux/usr/lib/*.la
+	rm -rf debian/util-linux/usr/include
+	rm -rf debian/util-linux/usr/lib/pkgconfig
+	# perl gets to do rename, not us.
+	mv debian/util-linux/usr/bin/rename debian/util-linux/usr/bin/rename.ul
+	mv debian/util-linux/usr/share/man/man1/rename.1 debian/util-linux/usr/share/man/man1/rename.ul.1
+	rm -f debian/util-linux/usr/share/info/dir
+	#
+	#
+	mv debian/util-linux/usr/share/getopt/* debian/util-linux/usr/share/doc/util-linux/examples
+	rmdir  debian/util-linux/usr/share/getopt
+	for pkg in bsdutils mount uuid-runtime; do install -m 644 debian/$${pkg}.lintian-overrides debian/$${pkg}/usr/share/lintian/overrides/$${pkg}; done
+	install -m 644 debian/mime.util-linux debian/util-linux/usr/lib/mime/packages/util-linux
+	if [ -f debian/util-linux/sbin/hwclock ] ; then \
+	    install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclock.sh; \
+	    install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclockfirst.sh; \
+	    sed -i -e '/^FIRST=/s/no/yes/' -e '/Provides:/s/ck/ckfirst/' \
+		-e '/Required-Start:/s/checkroot/mountdevsubfs/' \
+		-e '/Required-Start:/a# Required-Stop:' -e '/Required-Stop:/d' \
+		-e '/Default-Start:/a# X-Start-Before:    checkroot' \
+		-e '/Default-Start:/a# Default-Stop:' -e '/Default-Stop:/d' \
+		debian/util-linux/etc/init.d/hwclockfirst.sh; \
+	fi
+	if [ -f debian/util-linux/sbin/hwclock ] ; then \
+	    install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \
+	    install -m 755 debian/hwclock-set debian/util-linux/lib/udev/hwclock-set; \
+	fi
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	# copy mount library and symlink into udeb
+	ln debian/libmount1/lib/libmount.so.1.* debian/libmount1-udeb/lib/
+	ln debian/libmount1/lib/libmount.so.1   debian/libmount1-udeb/lib/
+endif
+	# copy blkid library and symlink into udeb
+	ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/
+	ln debian/libblkid1/lib/libblkid.so.1   debian/libblkid1-udeb/lib/
+	ln debian/util-linux/sbin/blkid debian/util-linux-udeb/sbin/
+	# overwrite copyright
+	install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright
+	install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright
+	# copy uuid library and symlink into udeb
+	ln debian/libuuid1/lib/libuuid.so.1.* debian/libuuid1-udeb/lib/
+	ln debian/libuuid1/lib/libuuid.so.1   debian/libuuid1-udeb/lib/
+	# overwrite copyright
+	install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright
+	install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright
+	install -m 644 debian/libuuid.copyright debian/uuid-runtime/usr/share/doc/uuid-runtime/copyright
+	#
+	cd debian; if [ -f util-linux/sbin/fdisk ]; then \
+	    ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
+	    S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \
+	fi
+	if [ -d debian/cfdisk-udeb ]; then \
+		cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \
+	fi
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab
+ifeq ($(arch),$(findstring $(arch),powerpc ppc64))
+	mv -f debian/util-linux/sbin/fdisk debian/util-linux/sbin/ddisk
+	mv -f debian/util-linux/usr/share/man/man8/fdisk.8 debian/util-linux/usr/share/man/man8/ddisk.8
+else
+	cd debian/util-linux && if [ -f sbin/hwclock ] ; then ln -sf hwclock.8.gz usr/share/man/man8/clock.8.gz; fi
+endif
+endif
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
+	cd debian/util-linux/sbin ; ln agetty getty
+	cd debian/util-linux/usr/share/man/man8 ; ln agetty.8 getty.8
+endif
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+	cd debian/util-linux/sbin ; mv mkswap mkswap.linux
+	cd debian/util-linux/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8
+endif
+	dh_compress -i -s
+	dh_fixperms -i -s -Xusr/bin/wall -Xbin/mount -Xbin/umount
+	rm -rf debian/*-udeb/usr/share/doc
+	dh_link -i -s
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_lintian -i
+	dh_installdebconf -i
+	dh_installdeb -i
+	dh_gencontrol -i -- -VUpstream=$(Upstream)
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -s
+	dh_testroot -s
+	dh_lintian -s
+	dh_installinit -s -- defaults 15 85
+	[ -n "$(STRIP)" ] || dh_strip -s
+	dh_makeshlibs -s
+	dh_installdebconf -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	echo util-linux:Conflicts=getty >> debian/util-linux.substvars
+endif
+	dh_gencontrol -s -Xbsdutils
+	dh_gencontrol -pbsdutils -u-v1:$(version)
+	dh_md5sums -s
+	rm -f debian/*-udeb/DEBIAN/md5sums
+	dh_builddeb -s
+
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- util-linux-2.19.1.orig/debian/util-linux.docs
+++ util-linux-2.19.1/debian/util-linux.docs
@@ -0,0 +1,6 @@
+login-utils/README.getty
+login-utils/README.poeigl
+debian/README.Debian.hwclock
+fdisk/README.cfdisk
+fdisk/README.fdisk
+AUTHORS
--- util-linux-2.19.1.orig/debian/libblkid-dev.files
+++ util-linux-2.19.1/debian/libblkid-dev.files
@@ -0,0 +1,5 @@
+usr/lib/libblkid.so
+usr/lib/libblkid.a
+usr/include/blkid
+usr/share/man/man3/libblkid.3
+usr/lib/pkgconfig/blkid.pc
--- util-linux-2.19.1.orig/debian/util-linux.prerm
+++ util-linux-2.19.1/debian/util-linux.prerm
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+	remove)
+		update-alternatives --remove pager /bin/more
+		update-alternatives --remove pager /usr/bin/pg
+		;;
+	upgrade|failed-upgrade|deconfigure)
+		;;
+esac
+
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/util-linux.dirs
+++ util-linux-2.19.1/debian/util-linux.dirs
@@ -0,0 +1,23 @@
+bin/
+sbin/
+etc/
+etc/init.d/
+usr/
+usr/bin/
+usr/sbin/
+usr/lib/
+usr/lib/mime/
+usr/lib/mime/packages/
+usr/share/
+usr/share/man/
+usr/share/man/man1/
+usr/share/man/man8/
+usr/share/info/
+usr/share/doc/
+usr/share/doc/util-linux/
+usr/share/doc/util-linux/examples/
+usr/share/lintian/
+usr/share/lintian/overrides/
+lib/
+lib/udev/
+lib/udev/rules.d/
--- util-linux-2.19.1.orig/debian/fdisk-udeb.dirs
+++ util-linux-2.19.1/debian/fdisk-udeb.dirs
@@ -0,0 +1,2 @@
+usr/
+usr/sbin/
--- util-linux-2.19.1.orig/debian/uuid-runtime.postrm
+++ util-linux-2.19.1/debian/uuid-runtime.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+if [ "$1" = purge ]
+then
+	rm -rf /var/run/uuidd
+fi
+
+#DEBHELPER#
+
+exit 0
--- util-linux-2.19.1.orig/debian/mount.postinst
+++ util-linux-2.19.1/debian/mount.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ -L /usr/doc/mount ] ; then
+    rm -f /usr/doc/mount
+fi
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/libmount1.files
+++ util-linux-2.19.1/debian/libmount1.files
@@ -0,0 +1 @@
+lib/libmount*.so.*
--- util-linux-2.19.1.orig/debian/libuuid1.postrm
+++ util-linux-2.19.1/debian/libuuid1.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+if [ "$1" = purge ]
+then
+	rm -rf /var/lib/libuuid
+fi
+
+#DEBHELPER#
+
+exit 0
--- util-linux-2.19.1.orig/debian/libuuid1.symbols
+++ util-linux-2.19.1/debian/libuuid1.symbols
@@ -0,0 +1,18 @@
+libuuid.so.1 libuuid1 #MINVER#
+ UUID_1.0@UUID_1.0 2.16
+ uuid__generate_random@UUID_1.0 2.16
+ uuid__generate_time@UUID_1.0 2.16
+ uuid_clear@UUID_1.0 2.16
+ uuid_compare@UUID_1.0 2.16
+ uuid_copy@UUID_1.0 2.16
+ uuid_generate@UUID_1.0 2.16
+ uuid_generate_random@UUID_1.0 2.16
+ uuid_generate_time@UUID_1.0 2.16
+ uuid_is_null@UUID_1.0 2.16
+ uuid_parse@UUID_1.0 2.16
+ uuid_time@UUID_1.0 2.16
+ uuid_type@UUID_1.0 2.16
+ uuid_unparse@UUID_1.0 2.16
+ uuid_unparse_lower@UUID_1.0 2.16
+ uuid_unparse_upper@UUID_1.0 2.16
+ uuid_variant@UUID_1.0 2.16
--- util-linux-2.19.1.orig/debian/changelog
+++ util-linux-2.19.1/debian/changelog
@@ -0,0 +1,4133 @@
+util-linux (2.19.1-5) unstable; urgency=low
+
+  * Conflict/Replace fstrim to provide smooth upgrades (closes: #627579)
+  * Don't run hwclock-set when running under systemd (closes: #629811)
+  * Switch to using linux-any in place of lists (closes: #635530, #634722)
+
+ -- Adam Conrad <adconrad@0c3.net>  Wed, 03 Aug 2011 13:43:21 +0000
+
+util-linux (2.19.1-4) unstable; urgency=low
+
+  * Add missing patch from #631468 to fix agetty linkage on k*bsd
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 17 Jul 2011 03:55:11 -0600
+
+util-linux (2.19.1-3) unstable; urgency=low
+
+  * Apply two patches from Michael Biebl <biebl@debian.org>:
+    - disable libmount on !linux, fixing kfreebsd FTBFS (closes: #631468)
+    - remove empty /usr/share/locale/ from util-linux (closes: #633412)
+  * Apply patch from Roger Leigh <rleigh@debian.org> to make hwclock.sh
+    correctly support /run/udev in addition to /dev/.udev (closes: #629274)
+  * Build with arch:all to resurrect util-linux-locales (closes: #630859)
+  * Add myself to Uploaders, following a short conversation with LaMont.
+
+ -- Adam Conrad <adconrad@0c3.net>  Sun, 17 Jul 2011 06:41:42 +0000
+
+util-linux (2.19.1-2) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * deliver findmnt in mount, rather than util-linux
+
+  [Jeroen Schot]
+
+  * Dutch transations.  Closes: #624858
+
+  [Hideki Yamane]
+
+  * Japanese translation.  Closes: #626383
+
+  [Esko ArajÃ¤rvi]
+
+  * Finnish debconf templates.  Closes: #615472
+
+  [Roger Leigh]
+
+  * Update with current translations
+  * Enable libmount; new packages libmount1, libmount-udeb and libmount-dev
+    added; bump standards-version
+
+  [Arief S Fitrianto]
+
+  * update Indonesian translations.  Closes: #611319
+
+  [Innocent De Marchi]
+
+  * debconf po file for Catalan.  Closes: #628367
+
+  [Paul Menzel]
+
+  * Add Homepage: to control.  Closes: #590708
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 31 May 2011 14:12:57 -0600
+
+util-linux (2.19.1-1) experimental; urgency=low
+
+  * New upstream
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 11 May 2011 08:38:31 -0600
+
+util-linux (2.17.2-9.1) unstable; urgency=low
+
+  * NMU
+  * Bump to Standards-Version 3.9.1.
+  * Drop XS- prefixes on Vcs-Git and Vcs-Browser fields.
+  * Patch from Konstantinos Margaritis to add preliminary armhf
+    support.  closes: #596948.
+  * Add watch file.  closes: #543721.
+
+ -- Clint Adams <clint@debian.org>  Sun, 13 Feb 2011 10:38:14 -0500
+
+util-linux (2.17.2-9) unstable; urgency=low
+
+  * Ack NMU from Christian Perrier <bubulle@debian.org>
+    - Fix encoding for Danish and Slovak debconf translations
+
+  [Adriano Rafael Gomes]
+
+  * Brazilian Portuguese debconf templates translation.  Closes: #610489
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 25 Jan 2011 12:11:43 -0700
+
+util-linux (2.17.2-8) unstable; urgency=low
+
+  * fix mangled characters in debconf translations
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 18 Jan 2011 05:43:24 -0700
+
+util-linux (2.17.2-7) unstable; urgency=low
+
+  * dh_installdebconf is needed in binary-arch, not so much in -indep. 
+    Based on report from Adam D. Barratt <adam@adam-barratt.org.uk>.
+    Closes: #566072
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 15 Jan 2011 09:54:50 -0700
+
+util-linux (2.17.2-6) unstable; urgency=low
+
+  [BjÃ¸rn Steensrud]
+
+  * nb translations.  Closes: #608325
+
+  [AmÃ©rico Monteiro]
+
+  * Portuguese debconf translations. Closes: #608233
+
+  [Vincenzo Campanella]
+
+  * Italian translations.  Closes: #608307
+
+  [Yuri Kozlov]
+
+  * russian debconf translations.  Closes: #608302
+
+  [Martin Ã…gren]
+
+  * Swedish debconf translations.  Closes: #608483
+
+  [Joe Dalton]
+
+  * Danish translations.  Closes: #608330
+
+  [Christian Perrier]
+
+  * French debconf translations.  Closes: #608464
+
+  [Martin Eberhard Schauer]
+
+  * German debconf translations.  Closes: #608463
+
+  [CamaleÃ³n]
+
+  * Spanish debconf translations.  Closes: #608518
+
+  [Thorsten Glaser]
+
+  * hwclock: [m68k] unbreak FTBFS with recent (>= 2.4.18?) kernels. 
+    Closes: #578168
+
+  [Slavko]
+
+  * Slovak transtions.  Closes: #608305
+
+  [Michal Simunek]
+
+  * Czech debconf translations.  Closes: #608495
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 31 Dec 2010 18:21:19 -0700
+
+util-linux (2.17.2-5) unstable; urgency=low
+
+  * Merge in all those NMUs that were never pushed to me in bugs.
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Dec 2010 14:52:10 -0700
+
+util-linux (2.17.2-4) unstable; urgency=low
+
+  [Miklos Szeredi]
+
+  * mount: don't canonicalize "spec" with --no-canonicalize option. 
+    Closes: #593336
+
+  [Karel Zak]
+
+  * fdisk: fix freespace boundaries calculation on SGI disklabel. 
+    Closes: #510130
+
+  [LaMont Jones]
+
+  * Deliver agetty as both agetty and getty, preferring agetty. 
+    Closes: #117596
+  * Declare source format (1.0)
+  * use debconf (iff installed) to warn about noauto fileysstems with non-zero
+    pass numbers.  Closes: #566072
+  * update lintian-overrides, actually install them in the deb
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Dec 2010 14:06:47 -0700
+
+util-linux (2.17.2-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Report correct disk size on GNU/kFreeBSD.  Thanks Tuco.
+    (Closes: #592292)
+
+ -- Robert Millan <rmh@debian.org>  Wed, 29 Sep 2010 09:18:08 +0200
+
+util-linux (2.17.2-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Revert the switch from slang2 to ncurses5.  There is no udeb for ncurses,
+    so that change broke cfdisk-udeb (closes: #593374, reopens: #581631).
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 23 Sep 2010 21:12:33 +0200
+
+util-linux (2.17.2-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply trivial patch by Adam D. Barratt (thanks!): Only attempt to link
+    locale-specific files in to the cfdisk-udeb hierarchy if cfdisk-udeb
+    is actually being built.  Closes: #581725
+  * Set urgency to â€œhighâ€� since some packages are waiting for util-linux.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 20 Jun 2010 16:03:46 +0200
+
+util-linux (2.17.2-3) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * Switch from slang2 to ncurses5.  Closes: #581631
+  * Merge remote branch 'origin/stable/v2.17' into stable/v2.17
+  * Restore dropped dep on initscripts.  Closes: #581420
+
+  [Sebastian Andrzej Siewior]
+
+  * Add preliminary powerpcspe support.  Closes: #579844
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 08 Jun 2010 06:05:49 -0600
+
+util-linux (2.17.2-2) unstable; urgency=low
+
+  * should build Depend: dpkg or install-info.  Closes: #581579
+  * pretty up the removal of /usr/share/info/dir
+  * Fix fallocate configure check.  Closes: #581358
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 14 May 2010 04:49:37 -0600
+
+util-linux (2.17.2-1) unstable; urgency=low
+
+  [Pascal Terjan]
+
+  * libblkid: reset BLKID_TINY_DEV flag in blkid_probe_set_device
+
+  [Yoshihiro Takahashi]
+
+  * mount: posix option of vfat is obsolete
+
+  [Jan Kara]
+
+  * mount: update documentation about barrier mount options
+
+  [Karel Zak]
+
+  * sfdisk: confused about disk size
+  * mount: fix typo in mount.8
+  * fdisk: sleep-after-sync and fsync usage
+  * lscpu: add {32,64}-bit CPU modes detection
+  * tests: refresh lscpu tests
+  * docs: update AUTHORS file
+  * docs: update v2.17 ReleaseNotes
+  * build-sys: release++ (v2.17)
+  * fdisk: don't include scsi.h
+  * libblkid: restrict RAID/FS proving for small devices (1.4MiB)
+  * libblkid: read() optimization for small devices
+  * tests: fix RAIDs tests
+  * libblkid: call read() per FAT root dir entry
+  * libblkid: set minimal size for jfs, reiser, swap and zfs
+  * libblkid: read whole SB buffer (69kB) on large disks
+  * libblkid: don't call read() per FAT dir-entry on large disks
+  * libblkid: add minimal sizes for OCFS and GFS
+  * tests: update FS test images
+  * libblkid: rewrite blkid_probe_get_buffer()
+  * blkid: probe for PT, don't probe for FS on small whole-disks
+  * libblkid: add sanity checks for FAT to DOS PT parser
+  * libblkid: don't probe for GPT and Unixware PT on floppies
+  * login: don't link PAMed version with libcrypt
+  * libblkid: more robust minix probing
+  * blkid: add newline when only one value is printed
+  * login: check that after tty reopen we still work with a terminal
+  * fdisk: use optimal_io_size
+  * fdisk: use "optimal I/O size" in warnings
+  * wipefs: ignore devices with partition table
+  * libblkid: don't return error on empty files
+  * fdisk: don't check alignment_offset against geometry
+  * fdisk: fix check_alignment()
+  * fdisk: cleanup alignment, default to 1MiB offset
+  * fdisk: fix default first sector
+  * fdisk: cleanup warnings
+  * tests: add fdisk alignment tests
+  * tests: fix and update old fdisk tests
+  * mount: warn users that mtab is read-only
+  * cal: fix first day of the week calculation on BE systems
+  * build-sys: remove duplicate #includes
+  * blkid: fix #ifdef HAVE_TERMIO[S]_H
+  * build-sys: add missing tests for libuuid and libblkid
+  * mount: advise users to use "modprobe", not "insmod"
+  * include: add min/max macros
+  * fdisk: use more elegant way to count and check alignment
+  * tests: update fdisk tests
+  * fdisk: cleanup help, add -h option
+  * fdisk: fallback for topology values
+  * fdisk: fix ALIGN_UP
+  * fdisk: add -c option (switch off DOS mode)
+  * fdisk: use 1MiB offset and grain always when possible
+  * tests: update fdisk tests
+  * fdisk: don't use 1MiB grain on small devices
+  * blkid: report open() errors in low-level probing
+  * tests: update fdisk tests (add whitespaces)
+  * docs: update AUTHORS file
+  * docs: add v2.17.1 ReleaseNotes
+  * build-sys: release++ (v2.17.1-rc1)
+  * swapon: fix swapsize calculation
+  * fdisk: swap VTOC values for warning messages
+  * docs: update AUTHORS file
+  * docs: update v2.17.1 ReleaseNotes
+  * build-sys: release++ (v2.17.1)
+  * docs: fix small typo in v2.17.1-ReleaseNotes
+  * libblkid: support alignment_offset=-1
+  * libblkid: more robust minix probing
+  * libblkid: fix display of device size
+  * swapon: remove " (deleted)" from filenames from /proc/swaps
+  * libblkid: remove "0x" prefix from DRBD UUID
+  * wipefs: cleanup usage() and man page
+  * mount: more explicitly explain fstab usage in mount.8
+  * lib: add #ifndef around min() max() macros
+  * fdisk: fix -b <sectorsize>
+  * docs: update AUTHORS file
+  * docs: add v2.17.2 ReleaseNotes
+  * build-sys: release++ (v2.17.2)
+  * po: merge changes
+
+  [Vladimir Brednikov]
+
+  * namei: fix man page formatting
+
+  [Francesco Cosoleto]
+
+  * cfdisk: set '[Quit]' as default menu item on first run instead of
+    '[Bootable]'.
+  * cfdisk: set '[New]' as default item on menu for non allocated space
+    instead of '[Help]'.
+
+  [Andreas Dilger]
+
+  * libblkid: fix ZSF detection
+
+  [Bastian Friedrich]
+
+  * libblkid: DRBD support for blkid
+
+  [Matthias KÃ¶nig]
+
+  * libblkid: fix segfault in drdb
+
+  [Bryn M. Reeves]
+
+  * sfdisk: make sure writes make it to disk in write_partitions()
+
+  [Linus Torvalds]
+
+  * libblkid: disable read-ahead when probing device files
+
+  [Pierre Hauweele]
+
+  * ionice: fix typo
+
+  [Mike Frysinger]
+
+  * pg: command enters infinite loop
+  * mount: properly ignore comments in /etc/filesystems
+
+  [LaMont Jones]
+
+  * new upstream
+  * lintian cleanup
+  * updated symbols file for libblkid1
+  * drop use of install-info in postinst, uses triggers now
+  * adjust mount.8 manpage to avoid man error
+
+  [Henne Vogelsang]
+
+  * lscpu: fix cpuid opcode detection
+
+  [Yann Droneaud]
+
+  * login: use fd instead of pathname for update tty's owner and permissions
+
+  [Colin Watson]
+
+  * libblkid: fix infinite loop when probe chain bails out early
+
+  [localization folks]
+
+  * po: update id.po (from translationproject.org) (Arif E. Nugroho)
+  * po: update ja.po (from translationproject.org) (Makoto Kato)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: update eu.po (from translationproject.org) (Mikel Olasagasti Uranga)
+  * po: update eu.po (from translationproject.org) (Mikel Olasagasti)
+  * po: update zh_CN.po (from translationproject.org) (Ray Wang)
+  * po: update pl.po (from translationproject.org) (Jakub Bogusz)
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update fi.po (from translationproject.org) (Lauri Nurmi)
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 08 May 2010 13:34:05 +0200
+
+util-linux (2.17~rc3-1) experimental; urgency=low
+
+  [Mike Frysinger]
+
+  * flock: fix hang when parent ignores SIGCHLD
+
+  [Karel Zak]
+
+  * docs: update TODO list
+  * docs: update AUTHORS file
+  * docs: update v2.17 ReleaseNotes
+  * build-sys: release++ (v2.17-rc2)
+  * lib: bug (typo) in function MD5Final()
+  * docs: add ngettext() into TODO file
+  * docs: update v2.17 ReleaseNotes
+  * build-sys: release++ (v2.17-rc3)
+  * docs: add LGPLv2+ to list of licenses
+  * libblkid: fix Adaptec RAID detection
+  * libblkid: fix highpoint37x detection
+  * libblkid: rename highpoint RAIDs to hpt{37,45}x_raid_member
+  * tests: add adaptec RAID test
+  * tests: add hpt37x RAID test
+  * tests: add hpt45x RAID test
+  * tests: add isw RAID test
+  * tests: add jmicron RAID test
+  * tests: add lsi RAID test
+  * tests: add nvidia RAID test
+  * tests: add promise RAID test
+  * tests: add silicon RAID test
+  * mount: disable --no-canonicalize for non-root users
+  * umount: add --no-canonicalize
+  * po: merge changes
+  * po: fix msgid bugs
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update pl.po (from translationproject.org) (Jakub Bogusz)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: update eu.po (from translationproject.org) (Mikel Olasagasti Uranga)
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 22 Dec 2009 10:11:47 -0700
+
+util-linux (2.17~rc1-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 06 Dec 2009 18:56:21 -0700
+
+util-linux (2.16-3) unstable; urgency=low
+
+  [Kel Modderman]
+
+  * hwclockfirst.sh: initscript LSB header in conflict with update-rc.d
+    options.  Closes: #487196
+
+  [LaMont Jones]
+
+  * hwclock*.sh: one more round of header tweaks.  Closes: #520607
+  * Acknowledge Aurelien Jarno NMU
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 13 Aug 2009 06:28:34 -0600
+
+util-linux (2.16-2.1) unstable; urgency=low
+
+  [ Aurelien Jarno ]
+  * Non-maintainer upload.
+  * Upload to unstable.
+  * Don't ship *.la files.
+  * Add avr32 to debian/control (closes: bug#528518).
+  
+  [ Michael Biebl ]
+  * Remove the outdated debian/shlibs.local file.
+  * Remove the auto-update of symbols files from debian/rules.
+  * Remove symbols from the debian/libuuid1.symbols files which were never
+    part of the public ABI, like uuid_pack/uuid_unpack and were falsely
+    copied over from e2fsprogs.
+  * Strip the Debian revision in the symbols files.
+  * Create a shlibs file for libblkid1 and libuuid1 and bump it to >= 2.16 to
+    ensure correct udeb shlibs dependencies.
+    (closes: bug#539100, bug#538940).
+  * Remove *.la files and empty /usr/include and /usr/lib/pkgconfig
+    directories from the util-linux package.
+
+  [ Cyril Brulebois ]
+  * Only check for ENOMEDIUM when ENOMEDIUM is defined. Fixes build on
+    GNU/kFreeBSD. (closes: bug#539054).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 05 Aug 2009 21:20:07 +0000
+
+util-linux (2.16-2) experimental; urgency=low
+
+  [John Keeping]
+
+  * hwclock: fix mismatched popen/fclose.
+
+  [Jakob Unterwurzacher]
+
+  * ionice: Allow setting the none class
+
+  [Karel Zak]
+
+  * build-sys: fix "make -C" bug
+  * build-sys: fix blkid.h include for old e2fsprogs
+  * blkid: make libuuid optional
+  * build-sys: rename /libs to /shlibs
+  * build-sys: complete /libs to /shlibs rename
+  * blkid: fix "hangs forever with partition type mdraid"
+  * blkid: blkid_do_safeprobe() has to be tolerant to RAIDs
+  * blkid: cleanup debug messages and return codes in blkid_do_probe()
+  * tests: add functions for work withdisk images
+  * mount: fix undefined reference to `security_get_initial_context'.  gentoo:
+    #270168
+  * libuuid: import UUID library from e2fsprogs
+  * libuuid: add --disable-libuuid and LIBUUID_VERSION
+  * libuuid: add info about u-l-ng to man pages
+  * libblkid: update man page
+  * build-sys: add UTIL_{SET,RESTORE}_FLAGS
+  * build-sys: fix headers in mkswap and libblkid
+  * build-sys: cleanup libuuid stuff
+  * mount: (and fsck) remove libvolume_id support
+  * build-sys: add --disable-libblkid, remove volume_id support
+  * build-sys: enable fsck by default
+  * build-sys: add --disable-tls
+  * uuidgen: new command (from e2fsprogs)
+  * libuuid: add .gitignore
+  * uuidd: new command (UUID daemon from e2fsprogs)
+  * build-sys: add --disable-uuidd
+  * tests: fix 'delete extended partition' checksum
+  * libblkid: fix reiserfs name
+  * tests: add mdraid libblkid test
+  * tests: fix reiserfs test
+  * tests: don't run some mount tests for non-root users
+  * tests: remove broken Xen dumps for lscpu
+  * tests: move lscpu /proc and /sys dumps to tarballs
+  * tests: fix script that creates lscpu dumps
+  * docs: add missing commands/projects to AUTHORS file
+  * mount: use TAG parsing function from libblkid
+  * losetup: add --set-capacity
+  * mount: cleanup notes about -l option in mount.8
+  * mount: add ext4 to mount.8
+  * mount: add ext4 to the list of filesystems in mount.8
+  * mount: use "none" fstype for MS_PROPAGATION mounts
+  * mount: move MS_{PROPAGATION,BIND,MOVE} detection
+  * libblkid: don't require udev symlinks verification for non-root users
+  * switch_root: new command
+  * build-sys: add --disable-switch_root
+  * switch_root: fix coding style
+  * switch_root: rewrite to use fstatat() and unlinkat()
+  * build-sys: check for openat() and linux for switch_root
+  * switch_root: use err.h, clean up return codes
+  * switch_root: clean up argv[] usage, add -h and -V
+  * switch_root: use snprintf() rather tan str{cpy,cat}()
+  * switch_root: add man page
+  * docs: refresh TODO list
+  * docs: remove obsolete information from fstab example.  Closes: #507700
+  * umount: clean up help output.  Closes: #320500
+  * mount: add info about obsolete vfat options to mount.8.  Closes: #329856
+  * losetup: suggest to use modprobe rather than insmod in losetup.8.
+    Closes: #334796
+  * mount: a little clean up info about loopdevs in man page.  Closes: #478600
+  * build-sys: fix libuuid Makefile.am
+  * docs: update AUTHORS file
+  * build-sys: fix --disable-uuidd
+  * docs: add v2.16 ReleaseNotes
+  * docs: update v2.16-ReleaseNotes
+  * build-sys: release++ (v2.16-rc1)
+  * uuidd: move uuidd files from /var/lib/libuuid to /var/run/uuidd
+  * libuuid: move clock state file from /var/lib to /var/run
+  * losetup: fix return codes of functions arounf is_associated()
+  * include: clean up _PATH_DEV_* macros
+  * Revert "libuuid: move clock state file from /var/lib to /var/run"
+  * libblkid: fix #ifdefs readability
+  * libuuid: add install-hook for libuuid.[a,so] devel files
+  * libblkid: add install-hook for libuuid.[a,so] devel files
+  * buildsys: move $usr{bin,sbin,lib}execdir definition to ./configure
+  * libblkid: fix $libdir in blkid.pc
+  * libuuid: fix $libdir in uuid.pc
+  * docs: remove example.files/rc[.local]
+  * uuidd: move uuidd.rc to misc-utils directory
+  * uuidd: fix $PIDFILE in uuidd.rc
+  * uuidd: init /var/run/uuidd, add option for on-demand mode to .rc file
+  * include: fix _PATH_DEV
+  * raw: undeprecate raw
+  * blkid: move to misc-utils/ directory
+  * docs: update AUTHORS file
+  * docs: update v2.16 ReleaseNotes
+  * build-sys: release++ (v2.16-rc2)
+  * build-sys: fix exec/data install hooks
+  * build-sys: improve symlinks creation in shlibs/
+  * build-sys: rename to _execdir
+  * libuuid: fix parallel building
+  * build-sys: improve $libdirname definition
+  * libblkid: add stdarg.h to blkidP.h
+  * build-sys: fix libuuid and libblkid version-info
+  * docs: update AUTHORS file
+  * libuuid: generate uuid_generate_{random,time}.3 man page links
+  * docs: update v2.16 ReleaseNotes
+  * build-sys: release++ (v2.16)
+  * po: refresh POTFILES.in
+  * po: merge changes
+
+  [Jeff Mahoney]
+
+  * raw: Use the RAW_SETBIND ioctl without stat'ing the raw# file
+
+  [Peter Jones]
+
+  * switch_root: use file descriptor instead of path for recursiveRemove()
+  * switch_root: fork before cleaning up the filesystem.
+  * switch_root: do recursiveRemove after our root is moved to avoid races.
+
+  [Kay Sievers]
+
+  * mount: allow loop suid umount.  suse: #461732
+  * build-sys: reverse shlibs installation
+
+  [Daniel Drake]
+
+  * switch_root: add subroot support
+
+  [Chris Webb]
+
+  * fdisk: (and cfdisk) fix to be consistent about maximum heads
+
+  [Zdenek Behan]
+
+  * fdisk: add simple test for doslabel stuff
+
+  [Milan Broz]
+
+  * blkid: fix LVM1 probe
+  * blkid: add device-mapper snapshot cow device probe
+
+  [Valerie Aurora]
+
+  * mount: when a remount to rw fails, quit and return an error
+
+  [Robert FÃ¶rster]
+
+  * build-sys: fix typo from 30688dde55f637c9b984809c685b61378b82805f
+
+  [Tom Prince]
+
+  * cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.
+
+  [Tilman Schmidt]
+
+  * ldattach: add N_PPS support
+
+  [Mike Frysinger]
+
+  * lscpu: fix cpuid code on x86/PIC
+  * losetup: handle symlinks in /dev/loop/
+
+  [Scott James Remnant]
+
+  * build libblkid binary packages
+  * build libuuid binary packages
+
+  [Theodore Ts'o]
+
+  * libuuid: Make sure fd's 0, 1, and 2 are valid before exec'ing uuidd
+  * uuidd: Avoid closing the server socket when calling create_daemon()
+  * libuuid, uuidd: Avoid infinite loop while reading from the socket fd
+  * libuuid: Don't run uuidd if it would fail due to permission problems
+
+  [localization folks]
+
+  * po: fix typo in French translation.  mandriva: #42783 (Olivier Blin)
+  * po: update fi.po (from translationproject.org) (Lauri Nurmi)
+  * po: update fr.po (from translationproject.org) (Nicolas Provost)
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 21 Jul 2009 15:58:40 -0600
+
+util-linux (2.15.1-1) unstable; urgency=low
+
+  [Aurelien Jarno]
+
+  * chrt: don't assume SCHED_BATCH and SCHED_IDLE exist
+  * remaining kFreeBSD hackery for building.  Closes: #527384
+  * metafile changes for kFreeBSD buildability hackery.  Closes: #527384
+
+  [Mike Frysinger]
+
+  * lscpu: fix cpuid code on x86/PIC
+  * losetup: handle symlinks in /dev/loop/
+
+  [LaMont Jones]
+
+  * Add keybuk as uploader.
+  * meta: cleanup rules targets
+
+  [Scott James Remnant]
+
+  * hwclock: only call --systz from the udev rule
+  * hwclock: make start a no-op when udev is running
+  * rules: Install udev rules into /lib/udev/rules.d
+
+  [Chris Webb]
+
+  * fdisk: (and cfdisk) fix to be consistent about maximum heads
+
+  [Rajeev V. Pillai]
+
+  * cal: Highlight today even when month or year specified
+
+  [Tom Prince]
+
+  * cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.
+
+  [Karel Zak]
+
+  * build-sys: fix "make -C" bug
+  * build-sys: fix blkid.h include for old e2fsprogs
+  * blkid: make libuuid optional
+  * blkid: fix "hangs forever with partition type mdraid"
+  * blkid: blkid_do_safeprobe() has to be tolerant to RAIDs
+  * blkid: cleanup debug messages and return codes in blkid_do_probe()
+  * mount: fix undefined reference to `security_get_initial_context'.  gentoo:
+    #270168
+  * libblkid: update man page
+  * libblkid: fix reiserfs name
+  * build-sys: add UTIL_{SET,RESTORE}_FLAGS
+  * build-sys: fix blkid detection in configure.ac
+  * tests: add mdraid libblkid test
+  * tests: fix reiserfs test
+  * tests: don't run some mount tests for non-root users
+  * tests: remove broken Xen dumps for lscpu
+  * tests: move lscpu /proc and /sys dumps to tarballs
+  * tests: fix script that creates lscpu dumps
+  * docs: update AUTHORS file
+  * docs: add v2.15.1 ReleaseNotes
+  * docs: add missing commands/projects to AUTHORS file
+  * build-sys: release++ (v2.15.1-rc1)
+  * mount: use "none" fstype for MS_PROPAGATION mounts
+  * mount: move MS_{PROPAGATION,BIND,MOVE} detection
+  * docs: update v2.15.1 ReleaseNotes
+  * build-sys: release++ (v2.15.1)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 14 Jul 2009 18:00:01 +0100
+
+util-linux (2.15.1~rc1-1) unstable; urgency=low
+
+  [Aurelien Jarno]
+
+  * chrt: don't assume SCHED_BATCH and SCHED_IDLE exist
+  * kFreeBSD hackery for building.  Closes: #527384
+
+  [Mike Frysinger]
+
+  * lscpu: fix cpuid code on x86/PIC
+  * losetup: handle symlinks in /dev/loop/
+
+  [LaMont Jones]
+
+  * Add keybuk as uploader.
+
+  [Chris Webb]
+
+  * fdisk: (and cfdisk) fix to be consistent about maximum heads
+
+  [Rajeev V. Pillai]
+
+  * cal: Highlight today even when month or year specified
+
+  [Tom Prince]
+
+  * cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.
+
+  [Karel Zak]
+
+  * build-sys: fix "make -C" bug
+  * build-sys: fix blkid.h include for old e2fsprogs
+  * blkid: make libuuid optional
+  * blkid: fix "hangs forever with partition type mdraid"
+  * blkid: blkid_do_safeprobe() has to be tolerant to RAIDs
+  * blkid: cleanup debug messages and return codes in blkid_do_probe()
+  * mount: fix undefined reference to `security_get_initial_context'.  gentoo:
+    #270168
+  * libblkid: update man page
+  * libblkid: fix reiserfs name
+  * build-sys: add UTIL_{SET,RESTORE}_FLAGS
+  * build-sys: fix blkid detection in configure.ac
+  * tests: add mdraid libblkid test
+  * tests: fix reiserfs test
+  * tests: don't run some mount tests for non-root users
+  * tests: remove broken Xen dumps for lscpu
+  * tests: move lscpu /proc and /sys dumps to tarballs
+  * tests: fix script that creates lscpu dumps
+  * docs: update AUTHORS file
+  * docs: add v2.15.1 ReleaseNotes
+  * docs: add missing commands/projects to AUTHORS file
+  * build-sys: release++ (v2.15.1-rc1)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 29 May 2009 04:19:25 -0600
+
+util-linux (2.15-1) unstable; urgency=low
+
+  [Aurelien Jarno]
+
+  * chrt: add a comment about non POSIX 1003.1b attributes in chrt.1
+  * agetty: IUCLC and OLCUC are Linux extensions
+
+  [Eric Sandeen]
+
+  * blkid: remove whole-disk entries from cache when partitions are found
+
+  [Karel Zak]
+
+  * docs: add a note about /proc/sys/kernel/random/uuid
+  * ionice: change Jens Axboe's email
+  * losetup: mount endless loop hang.  novell: #449646
+  * cfdisk: fix "cannot seek on disk drive" bug.  Closes: #511161
+  * blkid: split SONAME and LIBBLKID_VERSION
+  * blockdev: fix possible buffer overflow
+  * fdisk: fix max. ptname
+  * sfdisk: fix possible buffer overflow
+  * docs: add entry about /proc/partitions parsing
+  * blkid: rename blkid_evaluate_spec to blkid_evaluate_tag
+  * tests: fix -regex in run.sh
+  * blkid: linux_raid - fix logic for volumes with size == 0
+  * blkid: use /dev/mapper/<name> rather than /dev/dm-<N>.  red: #497259
+  * blkid: use /sys/block/dm-<N>/dm/name
+  * docs: update AUTHORS file
+  * docs: update v2.15 ReleaseNotes
+  * build-sys: release++ (v2.15)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update fr.po (from translationproject.org) (Nicolas Provost)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: update id.po (from translationproject.org) (Arif E. Nugroho)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 07 May 2009 12:36:41 +0100
+
+util-linux (2.15~rc2-1) experimental; urgency=low
+
+  [Aurelien Jarno]
+
+  * lib: do not include <linux/fd.h> in ismounted.c
+
+  [LaMont Jones]
+  
+  * Package
+
+  [Matthew Garrett]
+
+  * mount: Add strictatime support
+
+  [Andreas Dilger]
+
+  * blkid: add ZSF support
+
+  [Scott James Remnant]
+
+  * blkid: fix exit codes in blkid(8)
+  * hwclock: pass --noadjfile if /etc/adjtime not writable
+  * hwclock: always pass --rtc to hwclock calls
+
+  [Karel Zak]
+
+  * blkid: check idinfo[] index
+  * blkid: add ZSF test
+  * blkid: update TODO
+  * blkid: add TODO note about blkid_evaluate_spec_to_buffer()
+  * blkid: add new requirements to TODO list
+  * login: use open(2) rather then access(2) for $HOME/.hushlogin
+  * docs: update AUTHORS file
+  * blkid: add tst_types.c to Makefile.am
+  * docs: update v2.15 ReleaseNotes
+  * build-sys: release++ (v2.15-rc2)
+  * blkid: rename blkid_debug_init to blkid_init_debug
+  * po: merge changes
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 04 May 2009 18:20:35 -0600
+
+util-linux (2.15~rc1-1) experimental; urgency=low
+
+  [Vincent Deffontaines]
+
+  * fdisk: suggest partprobe(8) and kpartx(8) when BLKRRPART failed
+
+  [Roy Peled]
+
+  * mkfs.cramfs: lower memory requirements for layouts with duplicate files
+
+  [Matthias Koenig]
+
+  * hwclock: omit warning about drift if --noadjfile given
+  * mount: retry on ENOMEDIUM
+  * lscpu: return EXIT_SUCCESS at the end
+  * fdisk: add some missing includes
+  * mkfs.minix: fix size detection
+  * cfdisk: accept yes/no as fallback
+  * losetup: try to set up loop readonly if EACCES
+  * include: move swapheader.h to include
+  * swapon: add swap format detection and pagesize check
+
+  [Tim Gardner]
+
+  * Disable the fallback clause in hwclock when /dev/rtc cannot be opened. 
+    LP: #274402
+
+  [Kalev Soikonen]
+
+  * hwclock: unshadow a diagnostic printf
+  * hwclock: delay loop in set_hardware_clock_exact
+
+  [maximilian attems]
+
+  * mount: sundries.h add klibc support
+  * mount: s/MOUNTED/_PATH_MOUNTED/
+  * disk-utils: s/MOUNTED/_PATH_MOUNTED/
+  * dmesg: nuke old glibc 5 support
+  * misc-utils: write include signal.h directly
+  * whereis: include dirent.h instead sys/dir.h
+  * disk-utils: include fcntl.h directly (mkfs.cramfs, raw)
+  * fdisk: exit(3) needs stdlib.h include
+  * remove CVS keywords
+  * mount: add shortoptions for bind, move and rbind
+  * use getpagesize()
+  * partx: don't redeclare daddr_t
+
+  [CAI Qian]
+
+  * sfdisk: fix Compilation Error
+
+  [Marco d'Itri]
+
+  * rtcwake: support not suspending
+
+  [Jakob Unterwurzacher]
+
+  * ionice: Extend the man page to explain the "none" class and cpu-nice
+    inheritance
+
+  [Alon Bar-Lev]
+
+  * build-sys: add --disable-mount
+
+  [Adam Jackson]
+
+  * dmesg: Add -r (raw) option.
+
+  [David Brownell]
+
+  * hwclock: remove x86_64-specific bogon
+
+  [Karel Zak]
+
+  * mount: add norealtime to mount.8
+  * hwclock: always reads hardware clock.  Closes: #478663
+  * mount: warn on "file_t" selinux context.  red: #390691
+  * selinux: is_selinux_enabled() returns 0, 1 and -1
+  * umount: improve "-d" option for autoclear loops
+  * losetup: clean up code around LO_FLAGS_AUTOCLEAR
+  * write: doesn't check for tty group.  red: #454252
+  * build-sys: cleanup sys-utils/Makefile.am
+  * mount: make file_t SELinux warning optional and shorter
+  * mount: add info about tz=UTC option for FAT to mount.8
+  * losetup: looplist_* refactoring, remove scandir()
+  * rtcwake: cleanup return codes
+  * hwclock: cleanup help output and man page
+  * mount: add docs about utf8=0 for vfat.  red: #454354
+  * hwclock: use carefully synchronize_to_clock_tick() return codes
+  * hwclock: use time limit for synchronization busy wait
+  * hwclock: read_hardware_clock_rtc() need to return error codes
+  * scriptreplay: new implementation is out-of-sync
+  * ionice: cleanup man page
+  * ionice: cleanup error messages, add NLS support
+  * docs: TODO update
+  * tests: detect libvolume_id when mount(8) is compiled
+  * fdisk: remove obsolete information from man page
+  * hwclock: don't open /dev/rtc repeatedly
+  * swapon: -a has to complain, fix leaks
+  * fdisk: warn users about 2.2TB dos partition limit
+  * fdisk: don't check for GPT when asked for disk size only
+  * fdisk: round reported sizes rather than truncate
+  * losetup: remove dependence on minor numbers
+  * login: fix warning "dereferencing type-punned pointer will break
+    strict-aliasing rules"
+  * ionice: add strtol() checks, cleanup usage text and man page
+  * ipcmk: fix error codes and error messages
+  * ipcmk: add NLS support
+  * build-sys: add -luuid to BLKID_LIBS
+  * chrt: add NLS support, clean error messages and return codes
+  * mount: fix typo
+  * mount: add info about /proc/mounts to mount.1
+  * fsck.cramfs: fix compiler warning
+  * login: fix compiler warning (int32 time() arg)
+  * losetup: missing EBUSY error hint message
+  * mount: mtab created multiple times with -a option
+  * mount: remove link to namesys.com
+  * mount: sync FAT info in mount.8 with Documentation/filesystems/vfat.txt
+  * mount: sync tmpfs info in mount.8 with
+    Documentation/filesystems/tmpfs.txt.  red: #465761
+  * ipcs: fix exit codes, remove tailing white-spaces.  red: #465911
+  * hwclock: remove "cli" and "sti" from i386 CMOS code
+  * docs: update TODO list
+  * lscpu: add Hypervisor detection
+  * tests: add mk-lscpu-input.sh
+  * tests: add lscpu(1) test for paravirt. Xen i386
+  * tests: add lscpu(1) test for fullvirt. Xen x86_64
+  * tests: refresh Makefile.am (add missing lscpu tests)
+  * fdisk: cannot create partition with starting beyond 1 TB
+  * fdisk: read /proc/partitions in more robust way
+  * fdisk: support +cylinder notation
+  * namei: new re-written version
+  * namei: add --owners and --long options
+  * losetup: add warning about read-only mode
+  * build-sys: move pivot_root(8) to sys-utils
+  * pivot_root: clean up
+  * tests: update namei reg.test
+  * fdisk: fix man page typo
+  * tools: add checkincludes.pl (from linux kernel)
+  * tools: rename codecheck-config to checkconfig.sh
+  * tools: add checkconfig to top-level Makefile
+  * fdisk: rename ENABLE_CMDTAGQ macro
+  * getopt: remove unnecessary ifdefs
+  * hwclock: clock.h is included more than once
+  * agetty: sys/types.h and time.h are included more than once
+  * login: cleanup includes
+  * rdev: cleanup includes
+  * tailf: unistd.h is included more than once
+  * mount: add i_version support
+  * mount: reorder list of options in mount.8
+  * mount: create separate section for fs-independent options in mount.8
+  * mount: use subsections in mount.8 DESCRIPTION
+  * docs: add feature-requests from RH bugzilla to TODO list
+  * setterm: fix -blank man page
+  * build-sys: add missing AC_C_BIGENDIAN
+  * mkfs.minix: (and fsck) rename bitops.h
+  * include: swapheader.h is missing in Makefile.am
+  * tests: add swabN() regression test
+  * tests: add MD5 regression test
+  * lib: add __BYTE_ORDER to md5.c
+  * include: use __BYTE_ORDER rather than AC specific WORDS_BIGENDIAN
+  * tests: add md5 regression test
+  * mount: fix mount_static_LDADD
+  * Revert "login-utils: several strings without gettext calls"
+  * TODO: add request to use nl_langinfo()
+  * chfn: several strings without gettext calls
+  * simpleinit: cleanup gettext calls, use snprintf()
+  * refresh gitignore
+  * pg: add gettext call for the help string
+  * fdisk: remove unnecessary gettext call
+  * mount: clean up SPEC canonicalization
+  * mount: add rootcontext= SELinux mount option
+  * raw: default to /dev/raw/rawctl
+  * namei: fix buffer overflow
+  * mount: add info about semantics of read-only mount to mount.8
+  * mount: suggest to use blockdev --setro rather than losetup
+  * mount: finalize support of quoted LABELs/UUIDs
+  * umount: cleanup gefs_by_specdir()
+  * ionice: a little cleanup of "none" description
+  * namei: don't duplicate '/' directory
+  * rtcwake: explain supported modes in rtcwake.8
+  * namei: add --vertical option
+  * namei: add missing options to namei.1
+  * rtcwake: add mising .RE to the man page
+  * mount: fix typo in volume_id code
+  * ionice: fix typo in manpage
+  * chrt: output buglet when reporting scheduling class
+  * fdisk: add 0xaf HFS / HFS partition type
+  * mount: non-setuid (POSIX file capabilities) support
+  * tests: check also for /dev/loop/X
+  * fsck.cramfs: segfault with INCLUDE_FS_TESTS and no -x option
+  * docs: add suggestion about TZ=UTC to TODO file
+  * mkfs.minix: add regression test
+  * fsck.minix: add regression test
+  * mkfs.minix: remove local implementation of {set,clr}bit
+  * agetty: check for termios.c_line struct member by autoconf
+  * fdisk: cleanup _PATH_DEV_* macros
+  * blkid: create basic directories
+  * build-sys: define libdir
+  * blkid: add basic configure.ac stuff and blkid.pc
+  * blkid: merge libblkid code from e2fsprogs/lib/blkid
+  * blkid: minor changes to library build system
+  * blkid: add low level probing API
+  * blkid: add adaptec raid
+  * blkid: optimize for string UUIDs
+  * blkid: add DDF raid
+  * blkid: add ISW raid
+  * blkid: add JMicron RAID
+  * blkid: LSI MegaRAID
+  * blkid: NVIDIA raid
+  * blkid: Promise raid
+  * blkid: add Silicon Image Medlay RAID
+  * blkid: add VIA RAID
+  * blkid: update gitignore
+  * blkid: add Linux RAID
+  * blkid: blkdev size fallback
+  * blkid: correctly initialize magics[] arrays
+  * blkid: add ext{2,3,4,4devel} support
+  * blkid: add jfs
+  * blkid: add blkid_probe_get_sb() macro
+  * blkid: add xfs
+  * blkid: fix ext2 SEC_TYPE
+  * blkid: fix xfs label
+  * blkid: add GFS and GFS2
+  * blkid: add romfs
+  * blkid: add ocfs and oracleasm
+  * blkid: add __attribute__ ((format))
+  * blkid: fix blkid_probe_sprintf_version() usage
+  * add reiser and reiser4
+  * blkid: add HFS and HFS+
+  * blkid: add GFS2 UUID support
+  * blkid: add HTFS
+  * blkid: add missing hfs.c
+  * blkid: add iso9600
+  * blkid: add LVM2 support and a fix _sprintf_uuid() bug
+  * blkid: add UDF support
+  * blkid: add VFAT support
+  * blkid: re-order list of filesystems
+  * blkid: add LUKS support
+  * blkid: support detection of multiple signatures
+  * blkid: add version and probe FSInfo
+  * blkid: add highpoint{37x,45x} RAIDs
+  * blkid: add lvm1
+  * blkid: add vxfs
+  * blkid: add minix
+  * blkid: add UFS
+  * blkid: remove unused stuff from Makefile
+  * blkid: add proper copying info
+  * blkid: add TODO file
+  * blkid: add HPFS
+  * blkid: cleanup starts of probing files
+  * blkid: fix highpoint37x offset
+  * blkid: use posix uint32_t in ocfs superblock
+  * blkid: use posix uintXX_t in lvm code
+  * blkid: fix hedeader in ntfs.c
+  * blkid: remove blkid_types.h
+  * blkid: add squashfs
+  * blkid: add netware (NSS)
+  * blkid: add sysv and xenix
+  * build-sys: remove use of devmapper library
+  * blkid: use Requires.private and fix the include directory
+  * blkid: fix file descriptor leak when checking for a module
+  * blkid: remove unnecessary ifdef __cplusplus
+  * blkid: add btrfs support
+  * blkid: add DEBUG_LOWPROBE, cleanup a little debug stuff
+  * blkid: add -p and low-probe mode to blkid binary
+  * blkid: add udev string encoding routines
+  * blkid: add udev ID_FS_* output to blkid binary
+  * blkid: refresh TODO file
+  * blkid: use sizeof() for hfs uuid
+  * blkid: refresh TODO file
+  * tests: create subdirs for test scripts
+  * tests: remove input directory
+  * tests: create expected/$(component)/$(testname)
+  * tests: add support for subdirs to basic test functions
+  * tests: add ./run.sh <component>
+  * tests: fix TS_* paths
+  * tests: cleanup ts/cal scripts
+  * tests: cleanup ts/col scripts
+  * tests: cleanup ts/hwclock
+  * tests: cleanup ts/ipcs
+  * tests: cleanup ts/login
+  * tests: cleanup ts/look
+  * tests: cleanup ts/namei
+  * tests: cleanup ts/paths
+  * tests: cleanup ts/script
+  * tests: cleanup ts/swapon
+  * tests: cleanup ts/mount
+  * tests: fix output string
+  * tests: add "byte-order" to helpers/test_sysinfo
+  * tests: move some generic stuff from ts_init() to a new ts_init_env()
+  * tests: add support for subtests
+  * tests: fix the final message for subtests
+  * tests: add libblkid regression tests (images from e2fsprogs)
+  * blkid: add a note to TODO list
+  * blkid: fix blkid_safe_string()
+  * tests: remove unexpected exit from *_subtest functions
+  * blkid: fix udev output
+  * blkid: add hpfs regression test
+  * blkid: netware SB has to be packed
+  * blkid: add netware regression test
+  * blkid: set size for non-blkdevs, add blkid_probe_strcpy_uuid()
+  * blkid: improve ddf detection
+  * blkid: use blkid_probe_strcpy_uuid() for luks
+  * blkid: remove unnecessary debug message
+  * blkid: fix blkid_do_probe()
+  * blkid: add ddf raid regression test
+  * blkid: fix ..._strncpy_uuid
+  * blkid: add ocfs2 version
+  * blkid: add  to reiser
+  * blkid: add vol_id call to blkid regression test
+  * blkid: add reg.tests for HFS and HFS+
+  * blkid: add uuid and version support to gfs2
+  * blkid: add GFS2 reg. test
+  * blkid: add version support to LVM2
+  * blkid: add lvm2 reg.test
+  * blkid: add blkid_do_safeprobe()
+  * blkid: cleanup _LOGPROBE debug messages
+  * tests: fix typo in low-probe test
+  * blkid: refresh TODO file
+  * blkid: add new options to blkid.8 and help output
+  * blkid: add support for /etc/blkid.conf file
+  * blkid: compile TEST_PROGRAMs
+  * blkid: fix typo (syntax error)
+  * mount: move realpath.c code to lib/
+  * blkid: add blkid_evaluate_spec()
+  * blkid: clean up man pages
+  * blkid: refresh TODO file
+  * blkid: add findfs(8)
+  * build-sys: add --with=fsprobe=builtin
+  * blkid: start to use ABI versioning
+  * build-sys: libtoolize by libtool-2
+  * build-sys: libtoolize mount/Makefile.am
+  * build-sys: add temporary libtool *.m4 stuff
+  * blkid: refresh TODO file
+  * blkid: add Christoph's note about libdisk to TODO
+  * mount: generic blkid/volume_id wrapper, use blkid_evaluate_*
+  * build-sys: use pkg-config for blkid and volume_id
+  * blkid: add TODO hint about DM devnames in sysfs
+  * blkid: check calloc() return value
+  * blkid: add cmdline interface for blkid_probe_filter_usage()
+  * blkid: add TODO hint about blkid_parse_tag_string()
+  * blkid: fix low-probe mode return codes
+  * fsck: move fsck from e2fsprogs to util-linux-ng
+  * lib: make open_device() optional in fsprobe.c
+  * fsck: link with generic fsprobe wrapper
+  * fsck: cosmetic changes (NLS, paths, ...)
+  * lib: add test_ismounted for regression test
+  * tests: add fsck:ismounted reg.test
+  * tests: cleanup ts/bitops
+  * tests: cleanup ts/cramfs/fsck-endianness
+  * tests: cleanup ts/cramfs/mkfs-endianness
+  * tests: cleanup lscpu reg.tests
+  * build-sys: add fsck binary to .gitignore
+  * tests: cleanup ts/minix
+  * tests: cleanup ts/md5
+  * tests: chmod -x ts/lscpu/mk-input.sh
+  * tests: we needn't blkid.sh
+  * tests: refresh cal(1) expected outputs
+  * tests: refresh ipcs expected outputs
+  * blkid: blkid_evaluate_spec() shouldn't ignore $BLKID_FILE
+  * mount: inform about UID and eUID when verbose > 2
+  * tests: disable suid mount test
+  * tests: refresh expected mount(8) outputs
+  * losetup: detach more devices by "-d <loop> [<loop> ..]"
+  * losetup: cleanup man page
+  * tests: remove obsolete stuff from Makefile.am
+  * fsck: remove \007 from warning message
+  * build-sys: add missing files to include/Makefile.am
+  * blkid: fix a syntax nit
+  * fsck: remove useless if-before-free tests
+  * getopt: remove useless if-before-free tests
+  * mount: remove useless if-before-free tests
+  * fdisk: use real sector size in verify() and warn_cylinders()
+  * blockdev: add note that the StartSec is in 512-byte sectors
+  * addpart: 512-byte sectors in code, bytes in man-page
+  * partx: convert hard sector size to 512-byte sectors
+  * partx: don't duplicate lib/blkdev.c code
+  * fdisk: (and partx) remove BLKGETLASTSECT
+  * partx: use ioctls from lib/blkdev.c
+  * docs: add a note about kpartx to TODO
+  * swapon: do_swapon() refactoring (move stat() checks)
+  * swapon: add generic swap_get_header()
+  * swapon: simplify spec to devname conversion
+  * swapon: use err.h stuff
+  * swapon: do_swapon() refactoring (split into two functions)
+  * swapon: rewrite SWSUSPEND signature rather than exec mkswap
+  * swapon: cleanup man page
+  * swapon: add -f/--fixpgsz option
+  * simmpleinit: fix gcc warning (buffer size in read())
+  * mount: fix gcc warning (variable used uninitialized)
+  * blkid: use "char **" rather than "unsigned char **"
+  * blkid: fix gcc warning in blkid_get_cache_filename()
+  * lib: gcc warning in fix fsprobe
+  * lib: fix fsprobe wrapper (const char * is nonsense)
+  * swapon: fix wording in man page
+  * swapon: fix typo s/warn/warnx/
+  * swapon: add error messages for lseek and write
+  * login: remove "switching users" nonsense from man page
+  * fdisk: support "-b 4096" option
+  * blkid: blkid.static make target
+  * build-sys: cleanup --with-fsprobe help string
+  * renice: add -n option for compatibility with POSIX
+  * cal: remove gcc-ism from nl_langinfo() call
+  * flockc: segfaults when file name is not given.  red: #489672
+  * flock: fix printf format error in usage()
+  * flock: add NLS support, remove tailing white-spaces
+  * lib: add is_whole_disk() from fdisk code
+  * mkswap: remove v0 swap space support
+  * lib: add pttype.c for PT types detection
+  * include: add missing files to Makefile.am
+  * lib: pttype: add BSD subpartitions support
+  * lib: pttype: fix DOS detection
+  * lib: pttype - extend the API to work with file descriptors
+  * lib: wholedisk - extend API, add test program
+  * libs: pttype - fix typo
+  * mkswap: zap bootbits
+  * mkswap: clean up man page
+  * blkid: fix non-udev low-probe mode output
+  * lib: fsprobe - fix gcc warning
+  * tests: disable blkid tests when blkid(8) is not compiled
+  * blkid: add missing blkidP.h to Makefile.am
+  * build-sys: refresh generated libtool-2 stuff
+  * include: bitops - explicitly include endian.h
+  * build-sys: add $usrlibexecdir and fix paths for [/usr]/lib64
+  * blkid: fix ocfs2 detection
+  * login: use "remote" as a PAM service name for "login -h"
+  * tests: fix file name is too long (max 99) - gtar
+  * tests: fix typo in lscpu test
+  * docs: update AUTHORS file
+  * docs: update v2.15 ReleaseNotes
+  * build-sys: fix bugs detected by "make distcheck"
+  * build-sys: release++ (v2.15-rc1)
+  * docs: fix typo, cal(8) --> cal(1)
+  * po: update list of .c files
+  * po: merge changes
+  * po: update POTFILES.in
+  * po: rewrite update-potfiles script
+
+  [Pedro Ribeiro]
+
+  * elvtune: add NLS support
+  * fsck.cramfs: add NLS support
+  * mkfs.cramfs: several strings without gettext calls
+  * raw: add NLS support
+  * fdisk: several strings without gettext calls
+  * hwclock: several strings without gettext calls
+  * login-utils: several strings without gettext calls
+  * logger: several strings without gettext calls
+  * losetup: several strings without gettext strings
+  * readprofile: several strings without gettext calls
+  * pg: several strings without gettext calls
+
+  [James Youngman]
+
+  * more: minor fixes to magic()
+
+  [Sukadev Bhattiprolu]
+
+  * mount: document newinstance and ptmxmode options to devpts
+
+  [Scott James Remnant]
+
+  * hwclock: add --systz option to set system clock from itself
+  * debian/control: Add build-dependency on pkg-config
+
+  [Guan Xin]
+
+  * umount: check for overlaid mounts
+  * mount: fix typo
+
+  [Hayden James]
+
+  * ipcmk: new command
+
+  [Alexey Gladkov]
+
+  * Fix dmesg.1 installation
+  * flock: Allow lock directory
+
+  [Eric Sandeen]
+
+  * blkis: fix detection of ext4dev as ext4
+  * blkid: recognize ext3 with test_fs set as ext3
+  * fdisk: doesn't handle large (4KiB) sectors properly
+  * blkid: recognize ext4(dev) without journal
+
+  [Kay Sievers]
+
+  * blkid: vfat - fix declaration
+  * blkid: hfs - use proper native UUID format
+  * blkid: hfs - do not set UUID for emtpy finder info
+
+  [Cai Qian]
+
+  * lscpu: new command
+  * lscpu: --sysroot option and stable cache output
+  * lscpu: regression tests
+
+  [Stephan Maka]
+
+  * ionice: let -p handle multiple PIDs
+
+  [Jim Meyering]
+
+  * blkid: don't dereference NULL upon slashless module dependency line
+  * blkid: remove useless if-before-free tests
+
+  [Sam Varshavchik]
+
+  * mount: cleans up mount(8) troff markup
+
+  [AmÃ©rico Wang]
+
+  * tests: clean up the testing scripts
+  * tests: remove useless return value checks in testing scripts
+
+  [Sven Jost]
+
+  * blkid: support via raid version 2
+
+  [Signed-off-by: Roy Peled]
+
+  * mkfs.cramfs: add endianness support to cramfs tools
+
+  [Martin Steigerwald]
+
+  * chrt: support CFS SCHED_IDLE priority and document it
+
+  [Samuel Thibault]
+
+  * mkswap: non-linux support
+  * fdisk: don't use get_linux_version() for non-linux
+  * lib: blkdev.c clean up, non-linux support
+  * fdisk: non-linux support (BLK* and HDIO_*)
+  * disk-utils: clean up code, use blkdev_* functions
+  * ldattach: don't compile for non-linux systems
+
+  [Benno Schulenberg]
+
+  * ipcs: ungettextize the spacing of the table headers
+  * ipcs: adjust some field positions and widths for correct alignment
+  * po: update nl.po (from translationproject.org)
+
+  [Denis ChengRq]
+
+  * sfdisk: print version should end with a newline
+
+  [Arkadiusz Miskiewicz]
+
+  * build-sys: tgets is not in ncurses but in tinfo
+
+  [Gabriel Burt]
+
+  * rtcwake: prefer RTC_WKALM_SET over RTC_ALM_SET
+
+  [Mike Frysinger]
+
+  * more: dont use a.out.h
+  * mount: remove spurious newline from mount.8
+
+  [LaMont Jones]
+
+
+  [Lubomir Kundrak]
+
+  * ionice: add -t option.  red: #443842
+
+  [Theodore Ts'o]
+
+  * blkid: Optimize devicemapper support
+  * blkid: Unexport the private symbol blkid_devdirs
+  * blkid: Give a priority bonus to "leaf" devicemapper devices
+  * blkid: Refuse to create a device structure for a non-existent device. 
+    Closes: #502541
+  * blkid: add fallback to ext4 for 2.6.29+ kernels if ext2 is not present
+
+  [Signed-off-by: Guan Xin]
+
+  * umount: no checking mount point removal
+
+  [Hugh Dickins]
+
+  * mkswap: handle 2^32 pages
+
+  [Andrew McGill]
+
+  * script: don't flush input when starting script
+
+  [root]
+
+  * tests: refresh and cleanup cramfs/mkfs
+  * blkid: add -L -U options (evaluation API)
+
+  [PÃ¡draig Brady]
+
+  * cal: determine the first day of week from the locale
+
+  [localization folks]
+
+  * po: update id.po (from translationproject.org) (Arif E. Nugroho)
+  * po: update ja.po (from translationproject.org) (Makoto Kato)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: add zh_CN.po (from translationproject.org) (Ray Wang)
+  * po: update fr.po (from translationproject.org) (Nicolas Provost)
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update fi.po (from translationproject.org) (Lauri Nurmi)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 23 Mar 2009 18:07:01 +0000
+
+util-linux (2.14.2-1) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * mount: segfault when creating mtab and cannot determine fsname. 
+    Closes: #488312
+
+  [Kel Modderman]
+
+  * hwclockfirst.sh: use correct LSB header info.  Closes: #487196
+
+  [Karel Zak]
+
+  * chrt: output buglet when reporting scheduling class
+  * mount: fix typo in volume_id code
+  * docs: update AUTHORS file
+  * docs: update v2.14.2 ReleaseNotes
+  * build-sys: release++ (v2.14.2)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: update ja.po (from translationproject.org) (Makoto Kato)
+  * po: update nl.po (from translationproject.org) (Benno Schulenberg)
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 13 Feb 2009 12:25:27 -0700
+
+util-linux (2.14.2~rc2-1) unstable; urgency=low
+
+  [Matthias Koenig]
+
+  * hwclock: omit warning about drift if --noadjfile given
+  * cfdisk: accept yes/no as fallback
+  * fdisk: add some missing includes
+  * losetup: try to set up loop readonly if EACCES
+  * mkfs.minix: fix size detection
+  * mount: retry on ENOMEDIUM
+
+  [Kalev Soikonen]
+
+  * hwclock: unshadow a diagnostic printf
+
+  [maximilian attems]
+
+  * mount: sundries.h add klibc support
+  * use getpagesize()
+
+  [Jakob Unterwurzacher]
+
+  * ionice: Extend the man page to explain the "none" class and cpu-nice
+    inheritance
+
+  [David Brownell]
+
+  * hwclock: remove x86_64-specific bogon
+
+  [Karel Zak]
+
+  * mount: add norealtime to mount.8
+  * selinux: is_selinux_enabled() returns 0, 1 and -1
+  * umount: improve "-d" option for autoclear loops
+  * write: doesn't check for tty group
+  * rtcwake: cleanup return codes
+  * mount: add info about tz=UTC option for FAT to mount.8
+  * build-sys: cleanup sys-utils/Makefile.am
+  * build-sys: fix dmesg.1 installation
+  * mount: add fallback for versionsort()
+  * mount: add docs about utf8=0 for vfat
+  * scriptreplay: new implementation is out-of-sync
+  * docs: update AUTHORS file
+  * docs: update v2.14.1 ReleaseNotes
+  * build-sys: release++ (v2.14.1-rc1)
+  * losetup: remove unnecessary minor number check
+  * fdisk: don't check for GPT when asked for disk size only
+  * docs: update AUTHORS file
+  * docs: update v2.14.1 ReleaseNotes
+  * build-sys: release++ (v2.14.1-rc2)
+  * docs: update v2.14.1 ReleaseNotes
+  * build-sys: release++ (v2.14.1)
+  * mount: mtab created multiple times with -a option
+  * build-sys: add -luuid to BLKID_LIBS
+  * lib: add __BYTE_ORDER to md5.c
+  * include: use __BYTE_ORDER rather than AC specific WORDS_BIGENDIAN
+  * fdisk: cannot create partition with starting beyond 1 TB
+  * fdisk: remove obsolete information from man page
+  * fdisk: fix man page typo
+  * fdisk: support +cylinder notation
+  * hwclock: remove "cli" and "sti" from i386 CMOS code
+  * login: fix warning "dereferencing type-punned pointer will break
+    strict-aliasing rules"
+  * login: fix compiler warning (int32 time() arg)
+  * losetup: add warning about read-only mode
+  * losetup: missing EBUSY error hint message
+  * mount: add info about /proc/mounts to mount.1
+  * mount: add i_version support
+  * mount: reorder list of options in mount.8
+  * mount: sync FAT info in mount.8 with Documentation/filesystems/vfat.txt
+  * mount: sync tmpfs info in mount.8 with Documentation/filesystems/tmpfs.txt
+  * mount: remove link to namesys.com
+  * mount: create separate section for fs-independent options in mount.8
+  * mount: fix typo
+  * mount: use subsections in mount.8 DESCRIPTION
+  * mount: warn on "file_t" selinux context
+  * mount: make file_t SELinux warning optional and shorter
+  * setterm: fix -blank man page
+  * mount: fix mount_static_LDADD
+  * fdisk: remove unnecessary gettext call
+  * refresh gitignore
+  * docs: update AUTHORS file
+  * mount: clean up SPEC canonicalization
+  * mount: add rootcontext= SELinux mount option
+  * docs: update v2.14.2 ReleaseNotes
+  * build-sys: release++ (v2.14.2-rc1)
+  * mount: add info about semantics of read-only mount to mount.8
+  * mount: suggest to use blockdev --setro rather than losetup
+  * mount: finalize support of quoted LABELs/UUIDs
+  * ionice: a little cleanup of "none" description
+  * docs: update AUTHORS file
+  * docs: update v2.14.2 ReleaseNotes
+  * build-sys: release++ (v2.14.2-rc2)
+  * po: merge changes
+
+  [Pedro Ribeiro]
+
+  * fdisk: several strings without gettext calls
+  * logger: several strings without gettext calls
+  * losetup: several strings without gettext strings
+  * mkfs.cramfs: several strings without gettext calls
+  * readprofile: several strings without gettext calls
+
+  [Sam Varshavchik]
+
+  * mount: cleans up mount(8) troff markup
+
+  [Guan Xin]
+
+  * mount: fix typo
+
+  [Arkadiusz Miskiewicz]
+
+  * build-sys: tgets is not in ncurses but in tinfo
+
+  [Gabriel Burt]
+
+  * rtcwake: prefer RTC_WKALM_SET over RTC_ALM_SET
+
+  [Martin Steigerwald]
+
+  * chrt: support CFS SCHED_IDLE priority and document it
+
+  [Samuel Thibault]
+
+  * ldattach: don't compile for non-linux systems
+
+  [Benno Schulenberg]
+
+  * ipcs: ungettextize the spacing of the table headers
+  * po: update nl.po (from translationproject.org)
+
+  [Denis ChengRq]
+
+  * sfdisk: print version should end with a newline
+
+  [Mike Frysinger]
+
+  * more: dont use a.out.h
+  * mount: remove spurious newline from mount.8
+
+  [James Youngman]
+
+  * more: minor fixes to magic()
+
+  [localization folks]
+
+  * po: update id.po (from translationproject.org) (Arif E. Nugroho)
+  * po: update pt_BR.po (from translationproject.org) (Rodrigo Stulzer Lopes)
+  * po: update zh_CN.po (from translationproject.org) (Ray Wang)
+  * po: add zh_CN.po (from translationproject.org) (Ray Wang)
+  * po: update sv.po (from translationproject.org) (Daniel Nylander)
+  * po: update fr.po (from translationproject.org) (Nicolas Provost)
+  * po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * po: update cs.po (from translationproject.org) (Petr Pisar)
+  * po: update fi.po (from translationproject.org) (Lauri Nurmi)
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 30 Jan 2009 08:14:49 -0700
+
+util-linux (2.14-1) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * rules: drop separate configure target.  Closes: #487497
+
+  [Volker Schatz]
+
+  * ddate: 11th, 12th and 13th of month
+
+  [Paulius Zaleckas]
+
+  * rtcwake: fix the default mode to "standby"
+
+  [Christophe Blaess]
+
+  * mount: fix a small typo in mount.8
+
+  [Frans Pop]
+
+  * Update menu-item number for Debian Installer components.  Closes: #484407
+
+  [Karel Zak]
+
+  * docs: update AUTHORS file
+  * docs: update v2.14 ReleaseNotes
+  * build-sys: release++ (v2.14)
+  * po: merge changes
+
+  [localization folks]
+
+  * po: update hu.po (from translationproject.org) (Gabor Kelemen)
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 22 Jun 2008 08:17:41 -0600
+
+util-linux (2.14~rc3-1) experimental; urgency=low
+
+  [LaMont Jones]
+
+  * lomount: initialize sizelimit (lost in merge).  LP: #230974
+  * meta: fix description of bsdutils.  Closes: #482098
+
+  [Nobuhiro Iwamatsu]
+
+  * control: add support for sh4.  Closes: #479509
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 27 May 2008 22:45:49 -0600
+
+util-linux (2.14~rc3-0) experimental; urgency=low
+
+  [James Youngman]
+
+  * docs: we already rewrote the scriptreplay script; remove that TODO entry
+
+  [Karel Zak]
+
+  * setarch: add fallback for linux/personality
+  * fdisk: doesn't recognize the VMware ESX partitions
+  * build-sys: add support ionice for Super-H architecture
+  * mount: remount doesn't care about loop=
+  * po: merge changes
+    - po: update cs.po (from translationproject.org) (Petr Pisar)
+    - po: update nl.po (from translationproject.org) (Benno Schulenberg)
+    - po: update it.po (from translationproject.org) (Marco Colombo)
+    - po: update vi.po (from translationproject.org) (Clytie Siddall)
+  * docs: update 2.14 ReleaseNotes
+  * build-sys: release++
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 19 May 2008 06:31:20 -0600
+
+util-linux (2.14~rc2-0) experimental; urgency=low
+
+  [Steve Grubb]
+
+  * login: audit log injection attack via login
+
+  [Karel Zak]
+
+  * po: merge changes
+   - po: update it.po (from translationproject.org) (Marco Colombo)
+   - po: update nl.po (from translationproject.org) (Benno Schulenberg)
+  * ionice: update man page to reflect IDLE class change in  2.6.25
+  * scriptreplay: gettextize a forgotten messages
+  * docs: update v2.14 ReleaseNotes
+  * build-sys: release++
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 28 Apr 2008 19:51:41 -0600
+
+util-linux (2.14~rc1-1) experimental; urgency=low
+
+  * New upstream version
+  * control: drop -1 version from libslang2-dev build-dep
+  * control: standards-version 3.7.3.0
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 17 Apr 2008 18:19:27 -0600
+
+util-linux (2.13.1.1-1) unstable; urgency=low
+
+  [Steve Grubb]
+
+  * login: audit log injection attack via login
+
+  [Karel Zak]
+
+  * po: merge changes
+   - po: update it.po (from translationproject.org) (Marco Colombo)
+   - po: update nl.po (from translationproject.org) (Benno Schulenberg)
+  * docs: add v2.13.1.1 ReleaseNotes
+  * build-sys: release++ (2.13.1.1)
+
+  [LaMont Jones]
+
+  * control: drop -1 version from libslang2-dev build-dep
+  * control: standards-version 3.7.3.0
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 28 Apr 2008 19:47:33 -0600
+
+util-linux (2.13.1-5) unstable; urgency=low
+
+  * Switch to upstream's more-correct fix for LP#206113
+  * mkswap: when writing the signature page, handle EINTR returns.  LP: #206113
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 14 Apr 2008 18:18:30 -0600
+
+util-linux (2.13.1-4) unstable; urgency=low
+
+  * meta: Drop bashism in preinst.  Closes: #472248
+  * mkswap: when writing the signature page, handle EINTR returns.  LP: #206113
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 11 Apr 2008 21:01:29 -0600
+
+util-linux (2.13.1-3) unstable; urgency=low
+
+  [Kees Cook]
+
+  * swapon: Reinitialize software suspend areas to avoid future corruption.
+    LP: #66637
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 21 Mar 2008 10:11:57 -0600
+
+util-linux (2.13.1-2) unstable; urgency=low
+
+  [Frans Pop]
+
+  * Add menu item numbers for *fdisk udebs.  Closes: #466831
+
+  [Hamish Coleman]
+
+  * agetty: make username-in-uppercase feature optional (off by default.).  Closes: #156242
+
+  [Neil Williams]
+
+  * debian/rules: allow cross-building.  Closes: #465123
+
+  [glandux]
+
+  * hwclock.sh: fix typo.  LP: #103680
+
+  [LaMont Jones]
+
+  * mkswap: Set UUID for swap space.  Closes: #462662  LP: #66637
+  * mkswap: -U UUID cleanup
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 06 Mar 2008 20:33:38 -0700
+
+util-linux (2.13.1-1) unstable; urgency=low
+
+  * New Upstream Release [Karel Zak]
+    - docs: update AUTHORS file
+    - docs: update ReleseNotes
+    - build-sys: release++ (2.13.1)
+    - po: merge files
+      - po: update uk.po (from translationproject.org) (Maxim V. Dziumanenko)
+      - po: update it.po (from translationproject.org) (Marco Colombo)
+      - po: update sl.po (from translationproject.org) (Simon Mihevc)
+      - po: update ru.po (from translationproject.org) (Pavel Maryanov)
+      - po: update cs.po (from translationproject.org) (Petr Pisar)
+      - po: update pt_BR.po (from translationproject.org) (Rodrigo Stulzer Lopes)
+      - po: update id.po (from translationproject.org) (Arif E. Nugroho)
+      - po: update es.po (from translationproject.org) (Santiago Vila Doncel)
+      - po: update hu.po (from translationproject.org) (Gabor Kelemen)
+      - po: update eu.po (from translationproject.org) (Mikel Olasagasti)
+      - po: update ca.po (from translationproject.org) (Josep Puigdemont)
+      - po: update sv.po (from translationproject.org) (Daniel Nylander)
+      - po: update fr.po (from translationproject.org) (Michel Robitaille)
+      - po: update tr.po (from translationproject.org) (NilgÃ¼n Belma BugÃ¼ner)
+      - po: update ja.po (from translationproject.org) (Daisuke Yamashita)
+      - po: update nl.po (from translationproject.org) (Benno Schulenberg)
+      - po: update pl.po (from translationproject.org) (Andrzej Krzysztofowicz)
+      - po: update da.po (from translationproject.org) (Claus Hindsgaul)
+      - po: update vi.po (from translationproject.org) (Clytie Siddall)
+      - po: update et.po (from translationproject.org) (Meelis Roos)
+      - po: update de.po (from translationproject.org) (Michael Piefel)
+      - po: update fi.po (from translationproject.org) (Lauri Nurmi)
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 19 Jan 2008 08:48:31 -0700
+
+util-linux (2.13.1~rc2-2) unstable; urgency=low
+
+  * hwclockfirst.sh: yet more tweaks for LSB init.  Closes: #459760
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 11 Jan 2008 22:32:15 -0700
+
+util-linux (2.13.1~rc2-1) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * meta: mount should pre-depend on its libs
+  * hwclock.sh: add full path to comment.  Closes: #418107
+  * renice: correctly detect errors in arguments.  Closes: #385245
+
+  [Karel Zak]
+
+  * docs: update AUTHORS file, add all translators
+  * docs: update ReleaseNotes
+  * po: update po files
+    - po: update uk.po [Maxim V. Dziumanenko]
+    - po: update id.po [Arif E. Nugroho]
+    - po: update es.po [Santiago Vila Doncel]
+    - po: update hu.po [Gabor Kelemen]
+    - po: update it.po [Marco Colombo]
+    - po: update sl.po [Simon Mihevc]
+    - po: update ru.po [Pavel Maryanov]
+    - po: update cs.po [Petr Pisar]
+    - po: update pt_BR.po [Rodrigo Stulzer Lopes]
+    - po: add eu.po [Mikel Olasagasti]
+    - po: update ca.po [Josep Puigdemont]
+    - po: update sv.po [Daniel Nylander]
+    - po: update fr.po [Michel Robitaille]
+    - po: update tr.po [NilgÃ¼n Belma BugÃ¼ner]
+    - po: update ja.po [Daisuke Yamashita]
+    - po: update nl.po [Benno Schulenberg]
+    - po: add pl.po [Andrzej Krzysztofowicz]
+    - po: update da.po [Claus Hindsgaul]
+    - po: update vi.po [Clytie Siddall]
+    - po: update et.po [Meelis Roos]
+    - po: update de.po [Michael Piefel]
+    - po: update fi.po [Lauri Nurmi]
+  * build-sys: release++ (-rc2)
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 06 Jan 2008 20:20:48 -0700
+
+util-linux (2.13-14) unstable; urgency=low
+
+  [Karel Zak]
+
+  * mount: hint about helper program if device doesn't exist.  Closes: #452330
+
+  [LaMont Jones]
+
+  * rules: correct LSB init data for hwclockfirst.sh.  Closes: #458346
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 06 Jan 2008 12:50:08 -0700
+
+util-linux (2.13-13) unstable; urgency=low
+
+  [David Woodhouse]
+
+  * hwclock: check for ENODEV
+
+  [Matthias Koenig]
+
+  * mount: fix fd leak
+
+  [LaMont Jones]
+
+  * sys-utils: Drop duplicate install of setarch manpage links.
+  * agetty: drop useless and unused diff from upstream
+  * hwclock.sh: drop redundant file pointer.  Closes: #453333
+
+  [FrÃ©dÃ©ric Bothamy]
+
+  * sys-utils: correct setarch.8 manpage link creation.  Closes: #453245
+
+  [Karel Zak]
+
+  * build-sys: remove hardcoded _GNU_SOURCE
+  * mount: don't call canonicalize(SPEC) for cifs, smbfs and nfs.
+    Closes: #446175
+  * blockdev: add --getsz to blockdev.8
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 05 Dec 2007 21:34:36 -0700
+
+util-linux (2.13-12) unstable; urgency=low
+
+  * meta: drop Conflicts: bsdmainutils too
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 19 Nov 2007 19:30:23 -0700
+
+util-linux (2.13-11) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * cal comes from bsdmainutils as well.  Drops Replaces: completely.
+
+  [Pascal Terjan]
+
+  * docs: fix ChangeLog URL
+
+  [Gabor Kelemen]
+
+  * po: update hu.po (from translationproject.org)
+
+  [Karel Zak]
+
+  * losetup: fix errno usage
+  * po: update po files
+
+  [Lauri Nurmi]
+
+  * po: update fi.po (from translationproject.org)
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 14 Nov 2007 22:24:36 -0700
+
+util-linux (2.13-10) unstable; urgency=low
+
+  [KaiGai Kohei]
+
+  * mkswap: possible to crash with SELinux relabeling support
+
+  [Karel Zak]
+
+  * docs: add info about .bugfix releases and branches
+
+  [LaMont Jones]
+
+  * build: don't deliver col* and ul as part of bsdutils for now.  Closes: #446939
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 29 Oct 2007 14:29:49 -0600
+
+util-linux (2.13-9) unstable; urgency=low
+
+  [LaMont Jones]
+
+  * deliver hwclockfirst.sh on ubuntu as well.  LP: #63175
+  * build: don't deliver (emtpy) /usr/share/util-linux.  Closes: #445908
+  * mount.8:  Make package references be the actual binary package name
+    in the distro.  LP: #154399
+
+  [Michael Piefel]
+
+  * po: update de.po (from translationproject.org)
+
+  [Yu Zhiguo]
+
+  * chsh: should use pam_end function to terminate the PAM transaction
+
+  [Benno Schulenberg]
+
+  * po: update nl.po (from translationproject.org)
+
+  [Rajeev V. Pillai]
+
+  * pg: fix segfault on search
+
+  [Karel Zak]
+
+  * mount: -L|-U segfault when label or uuid doesn't exist
+  * tests: fix blkid cache usage
+  * script: dies on SIGWINCH.  Closes: #445956
+  * chfn: add pam_end() call and cleanup PAM code
+  * ionice: add a note about permissions to ionice.1
+  * script: dies on SIGWINCH
+  * po: fix typo in de.po
+  * po: update po files
+  * setarch: generate groff links in a better way
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 20 Oct 2007 20:59:12 -0600
+
+util-linux (2.13-8) unstable; urgency=low
+
+  * Upstream git:
+    - po: update sv.po (from translationproject.org)
+    - mount: doesn't drop privileges properly when calling helpers
+      CVE-2007-5191
+    - hwclock: fix --rtc option.  Closes: #444924
+    - setarch: fix compiler warning
+    - login: login segfaults on EOF (rh#298461)
+    - build-sys: nls/locale handling in util-linux-ng general
+    - blockdev: add missing description about option --report in manpage
+  * fix messages in "hwclock.sh start".  Closes: #436873
+  * Honor DEB_BUILD_OPTIONS=nostrip.  Closes: #443853
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 01 Oct 2007 21:57:41 -0600
+
+util-linux (2.13-7) unstable; urgency=low
+
+  * cfdisk.8: mention slang next to curses.  Closes: #295487
+  * util-linux.postrm: remove /etc/adjtime on purge.  Closes: #245236
+  * hwclock: Reintroduce hwclockfirst.sh on Debian machines.  Closes: #443487
+  * mount.preinst: chroot-check was broken.  Closes: #443466
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 21 Sep 2007 22:10:20 -0600
+
+util-linux (2.13-6) unstable; urgency=low
+
+  * sparc-utils 'sparc64' binary sets ADDR_LIMIT_32BIT.  Closes: LP#141524
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 21 Sep 2007 10:36:39 -0600
+
+util-linux (2.13-5) unstable; urgency=low
+
+  * build: cfdisk doesn't exist on some architectures.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 12 Sep 2007 10:33:06 -0600
+
+util-linux (2.13-4) unstable; urgency=low
+
+  * build: look for fdisk in the right place.  Closes: LP#138040
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 12 Sep 2007 06:30:18 -0600
+
+util-linux (2.13-3) unstable; urgency=low
+
+  * flock.1: typo in man page.  Closes: #440011
+  * mount: chain of symlinks to fstab causes use of pointer after free
+    Closes: #440562
+  * Replaces: sparc-utils (for sparc{32,64}.  Closes: #440966
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 29 Aug 2007 07:09:06 -0600
+
+util-linux (2.13-2) unstable; urgency=low
+
+  * Don't make rename.ul an alternative for rename.  Closes: #439935.
+  * Don't deliver hexdump (bsdmainutils is newer).  Closes: #439905
+  * Update bsdutils description.  Closes: #439907
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 28 Aug 2007 17:12:29 -0600
+
+util-linux (2.13-1) unstable; urgency=low
+
+  * Changes from upstream:
+    - docs: update AUTHORS file
+    - Revert "mount: improve error message when helper program not present"
+      for translation freeze (reopens LP #131367)  Will be fixed in 2.13.1
+      and 2.14.
+    - taskset: check for existence of sched_getaffinity
+    - setarch: add parisc/parisc64 support
+    - mount: free loop device on failure
+    - mount: avoid duplicates for root fs in mtab
+    - build-sys: release++
+    - docs: update ReleaseNotes, update and sort AUTHORS file
+    - po: update po/ stuff
+    - ionice: clean up error handling
+    - cytune: make the oneliner more specific the cyclades hw in question
+    - docs: update TODO
+    - setarch: add --3gb option for compatibility with Debian linux{32,64} command
+  * Revert "umount: only call update_mtab if mtab_is_writable().", since the
+    fix is already present in a different way.
+  * Have debian/rules deal with architectures that don't get packages.
+    Closes: #439830
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 27 Aug 2007 21:59:00 -0600
+
+util-linux (2.13~rc3-9) unstable; urgency=low
+
+  * debian/rules: cleanup and support nostrip option
+  * build: fdisk (and therefore the udebs) do not get built on m68k.
+  * build: /usr/bin/rename needs to be an alternative.
+    Closes: #439647, #439712
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 27 Aug 2007 02:36:50 -0600
+
+util-linux (2.13~rc3-8) unstable; urgency=low
+
+  * taskset: Don't deliver taskset on m68k.
+  * umount: only call update_mtab if mtab_is_writable().  Closes: #338803
+  * build: switch back to libblkid-dev for Debian.  Closes: #439617
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 25 Aug 2007 21:38:17 -0600
+
+util-linux (2.13~rc3-7) unstable; urgency=low
+
+  * Document git repository location
+  * cytune.8: make the oneliner more specific the cyclades hw in question
+    Closes: #375150
+  * control: Extend package descriptions.  Closes: #384072
+  * Switch to debhelper, clean up delivery of binaries.
+  * bsdutils: deliver more stuff that we build.  Now partly
+    Replaces: bsdmainutils and completely Replaces: linux32.
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Aug 2007 23:27:19 -0600
+
+util-linux (2.13~rc3-6) unstable; urgency=low
+
+  * more upstream changes
+    - docs: add DEPRECATED to EXTRA_DIST
+    - docs: update AUTHORS file
+    - docs: add note about http://translationproject.org
+    - man-pages: cleanup of chrt.1 and taskset.1
+    - mount: improve error message when helper program not present
+    - setarch: cleanup licensing note
+    - setarch: add sparc32bash alias to keep compatibility with sparc32
+    - setarch: add __alpha__ support
+    - po: update de.po, vi.po, nl.po (from translationproject.org)
+  * drop arch.1 man page.  Closes: #438668
+  * deliver the right file for scriptreplay.  Closes: #438771
+  * sfdisk: Allow drives over 2^31 sectors in size.  Closes: #314413
+  * Deliver flock and flock.1.  Closes: #435272
+  * hwclock.sh: Correct message. Closes: #424682
+  * cfdisk: switch back to slang2
+  * setarch: add parisc/parisc64 support
+  * deliver setarch
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 21 Aug 2007 11:10:51 -0600
+
+util-linux (2.13~rc3-5) unstable; urgency=low
+
+  * Fix distro check in debian/rules
+  * Use Breaks: on distros that support that in the previous release.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 15 Aug 2007 00:32:12 -0600
+
+util-linux (2.13~rc3-4) unstable; urgency=low
+
+  * Changes from upstream:
+    - po: gettextizing some overlooked messages.
+    - build-sys: add --disable-makeinstall-chown
+    - docs: add README.licensing
+    - tests: fix ULONG_MAX usage on 32bit machines
+    - chsh: don't use empty shell field in /etc/passwd
+    - more: fix underlining for multibyte chars
+    - login: replace /usr/spool/mail with /var/spool/main in man page
+  * mount: make the error message a little more clear when a helper
+    program is missing.  (LP #131367)
+  * manpages: cleanup of chrt.1 and taskset.1.  Closes: #427267, #265479
+  * hwclock.sh: only report hwclock updated if we did that.  Closes: #436873
+  * update copyright to reflect README.licensing
+  * Merge ubuntu changes, do the right thing at build time.
+  * Go back to Depends: for the various packages, since the switch to libc5 is
+    long, long over.
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 14 Aug 2007 14:01:11 -0600
+
+util-linux (2.13~rc3-3) unstable; urgency=low
+
+  * Merge lpia support from ubuntu.
+
+ -- LaMont Jones <lamont@debian.org>  Thu,  9 Aug 2007 08:50:42 -0600
+
+util-linux (2.13~rc3-2ubuntu2) gutsy; urgency=low
+
+  * Add lpia support back in.  sorry.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu,  9 Aug 2007 08:48:21 -0600
+
+util-linux (2.13~rc3-2ubuntu1) gutsy; urgency=low
+
+  * New debian version.  Remaining ubuntu changes:
+    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
+      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
+      + debian/rules: Install those.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Wed,  8 Aug 2007 13:22:04 -0600
+
+util-linux (2.13~rc3-2) unstable; urgency=low
+
+  * mount should Suggest nfs-common, not Recommend it.
+  * Fix build-depends for hurd-i386.  Closes: #333147
+
+ -- LaMont Jones <lamont@debian.org>  Wed,  8 Aug 2007 13:34:42 -0600
+
+util-linux (2.13~rc3-1ubuntu1) gutsy; urgency=low
+
+  * Merge ubuntu changes into a new Debian version.  Remaining:
+    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
+      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
+      + debian/rules: Install those.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Wed,  8 Aug 2007 11:57:03 -0600
+
+util-linux (2.13~rc3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- LaMont Jones <lamont@debian.org>  Wed,  8 Aug 2007 11:51:16 -0600
+
+util-linux (2.13~rc2-7) unstable; urgency=low
+
+  * If nfs-common is not installed, skip nfs check
+  * More fixes from upstream:
+    - swapon: cleanup fsprobe_*() usage
+    - swapoff: correctly handle UUID= and LABEL= identifiers
+    - mount: fix incorrect behavior when more than one fs type is
+    - tests: add script(1) race condition test
+    - script: fix race conditions
+    - mkfs: remove nonsense from man page
+    - blockdev: use LU and LLU for BLKGETSIZE and BLKGETSIZE64
+    - blockdev: fix "blockdev --getsz" for large devices
+
+ -- LaMont Jones <lamont@debian.org>  Tue,  7 Aug 2007 10:42:56 -0600
+
+util-linux (2.13~rc2-6ubuntu1) gutsy; urgency=low
+
+  * Merge ubuntu fixes into new Debian version.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sat,  4 Aug 2007 12:33:57 -0600
+
+util-linux (2.13~rc2-6) unstable; urgency=low
+
+  * More fixes from upstream
+  * mount.preinst: deal with no /proc/mounts.  Closes: #436003
+  * swapoff: handle UUID= and LABEL=.  Closes: #435555
+
+ -- LaMont Jones <lamont@debian.org>  Sat,  4 Aug 2007 18:22:19 -0600
+
+util-linux (2.13~rc2-5) unstable; urgency=low
+
+  * mount.preinst:
+    - check the right directory for mount.nfs.
+      Closes: #435307, #435414, #435223
+    - look for ' nfs ' mounts.  Closes: #435305
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 31 Jul 2007 22:34:08 -0600
+
+util-linux (2.13~rc2-4) unstable; urgency=low
+
+  * switch to using libvolume-id-dev
+  * Recommend: nfs-common so that portmap doesn't become defacto-Required.
+    NFS mounts will not work unless nfs-common is upgraded to at least the
+    Recommended version, so now mount.preinst will fail if there are NFS
+    mounts and no /usr/sbin/mount.nfs.  Closes: #435204, #435223, #435125
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 30 Jul 2007 08:07:37 -0600
+
+util-linux (2.13~rc2-3ubuntu1) gutsy; urgency=low
+
+  * Merge ubuntu changes:
+    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
+      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
+      + debian/rules: Install those.
+    - use libvolume-id instead of blkid.  This will be true for debian once a
+      current enough udev is available.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sun, 29 Jul 2007 11:31:21 -0600
+
+util-linux (2.13~rc2-3) unstable; urgency=low
+
+  * add option for 8-bit chars in agetty.  Closes: #221290
+  * Merge upstream fixes (rc2+git)
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 28 Jul 2007 22:34:53 -0600
+
+util-linux (2.13~rc2-2) experimental; urgency=low
+
+  * arch is dealt with upstream now.
+  * Mention hfsplus in mount.8.  Closes: #345106
+  * Add m32r.  Closes: #413074
+  * use snprintf in logger.c.  Closes: #118784
+  * Various typos in cfdisk.8.  Closes: #360896
+  * cleanup copyright.  Closes: #290077
+  * manpage typos.  Closes: #360279, #395442
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 17 Jul 2007 23:28:54 -0600
+
+util-linux (2.13~rc2-1) experimental; urgency=low
+
+  * New upstream version
+  * drop libselinux-dev build-dep on kfreebsd-amd64
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 17 Jul 2007 16:41:11 -0600
+
+util-linux (2.13~rc1-2) experimental; urgency=low
+
+  * A little more kfreebsd cleanup
+  * Fix nfs-common dependency
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 13 Jul 2007 08:22:01 -0600
+
+util-linux (2.13~rc1-1) experimental; urgency=low
+
+  * fix ionice build errors on several architectures.  Closes: #432603
+  * no libselinux on kfreebsd-i386
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 10 Jul 2007 22:30:59 -0600
+
+util-linux (2.13~rc1-0) experimental; urgency=low
+
+  * New upstream (util-linux-ng).  Closes: #431817, #355536
+    - several patches were not ported forward from 2.12-19
+      - no kerneli support in crypto loop, since it is not in 2.6 kernels.
+      - 20guesshelper: filesystem detection has been dropped.  Mount is built
+        with filesystem probing
+      - 20xgethostname: does anyone care?
+      - 30nfs*: NFS support has moved to nfs-utils, and removed from
+        util-linux.  Add Depends: nfs-common until Lenny ships.
+        Closes: #417996
+    - umounting usb sticks as a user no longer segfaults. Closes: #410031
+  * Add LSB formatted dependency info in hwclock.sh.  Closes: #330227
+  * Reflect Debian locations in getopt manpage.  Closes: #352221
+  * Conflict/Replaces/Provides: schedutils.  Closes: #322883, #384045
+  * README.Debian.hwclock needs a .gz in hwclock.sh.  Closes: #393539
+  * Deliver tailf.  Closes: #327906
+  * Deliver partx.  Closes: #296615
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 10 Jul 2007 00:05:29 -0600
+
+util-linux (2.12r-20) unstable-UNRELEASED; urgency=low
+
+  * USB unmounting dereferenced a null pointer.  Closes: #410031
+    - Files: 70fstab.dpatch
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 17 Jun 2007 06:01:46 -0600
+
+util-linux (2.12r-19ubuntu2) gutsy; urgency=low
+  
+  * Fix sparc disk label generation. This is required for LDOM
+    and parallel installations with Solaris 10.
+    Add patch: 80sparc-new-label
+
+    Many thanks to David S. Miller for the patch.
+
+    NOTE: users upgrading from older versions should re-run fdisk to
+          update the disk label.
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Mon, 02 Jul 2007 07:55:46 +0200
+
+util-linux (2.12r-19ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Use volumeid instead of blkid to be able to access (mount/umount/swapon)
+      volumes by UUID and/or label:
+      + debian/control: libblkid-dev -> libvolume-id-dev build dependency
+      + debian/patches/70libvolume_id-support.dpatch: SuSE patch for using
+        libvolume-id.
+    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
+      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
+      + debian/rules: Install those.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 14 May 2007 21:48:06 +0200
+
+util-linux (2.12r-19) unstable; urgency=low
+
+  * mips/mipsel buildds use sudo.  Fix install target so that mount.deb
+    builds.  Closes: #411893
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 21 Feb 2007 10:39:26 -0700
+
+util-linux (2.12r-18) unstable; urgency=low
+
+  * Stop printing erroneous "rpc.idmapd appears to not be running" message.
+    Files: 30nfs4.dpatch. Closes: #385879
+
+ -- LaMont Jones <lamont@debian.org>  Mon,  5 Feb 2007 13:47:10 -0700
+
+util-linux (2.12r-17ubuntu2) feisty; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 12 Mar 2007 14:58:14 +0000
+
+util-linux (2.12r-17ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - libvolume_id support patch from SuSE
+    - single ubuntuized hwclock script
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri,  2 Feb 2007 11:14:19 -0700
+
+util-linux (2.12r-17) unstable; urgency=low
+
+  * Userspace software suspend fix.  Closes: #409365
+  * armel support.  Closes: #408816
+
+ -- LaMont Jones <lamont@debian.org>  Fri,  2 Feb 2007 11:08:04 -0700
+
+util-linux (2.12r-16) unstable; urgency=low
+
+  * actually apply 30swsusp-resume.  And support userspace sw susp too.
+    Closes: #406204
+  * Fix off-by-one issue in agetty -I.  Closes: #392445
+  * Drop extraneous "again" from hwclock.sh and remove references to
+    hwclockfirst.sh.  Closes: #396755
+  * Drop PAGE_SIZE usage completely, use sysconf(_SC_PAGESIZE).
+  * Make intr the default for NFS v2 & v3 mounts in addition to being the
+    default for NFS v4.  Thanks to Tollef Fog Heen for the idea.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 17 Jan 2007 11:57:35 -0700
+
+util-linux (2.12r-15) unstable; urgency=low
+
+  * New amd64 rdev patch.  Closes: #396842
+
+ -- LaMont Jones <lamont@debian.org>  Fri,  3 Nov 2006 20:44:05 -0700
+
+util-linux (2.12r-14) unstable; urgency=low
+
+  * Make that 11 for hwclock.sh, since we need / to be writable for the
+    adjfile.
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 31 Oct 2006 15:01:01 -0700
+
+util-linux (2.12r-13) unstable; urgency=low
+
+  * NFS seems to not like 127.0.0.1 as a client ID for everyone.
+    Closes: #394941
+    - 30nfs4-setclientid.dpatch by Steinar H. Gunderson <sesse@debian.org>
+  * Move hwclock.sh to 8 since localtime is now a file, not a symlink.
+    Adds Depends: tzdata (>=2006c-2)
+    Closes: #342887
+  * ship rdev on amd64.  Closes: #297789
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 31 Oct 2006 13:51:50 -0700
+
+util-linux (2.12r-12) unstable; urgency=low
+
+  * drop hwclockfirst.sh, and put hwclock.sh back at 50.  See #50572 and
+    Closes: #342887
+  * Deal with _syscall5 going away.  Patch imported from Ubuntu.
+    Closes: #392236
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 19 Oct 2006 19:01:33 -0600
+
+util-linux (2.12r-11) unstable; urgency=low
+
+  * typos in NFSv4 (GSSDLCK didn't have .pid, and the latest
+    nfs-common no longer creates the file at all.) Closes: #376931
+    - modified 30nfs4-fix.dpatch
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 19 Sep 2006 09:33:31 -0600
+
+util-linux (2.12r-10) unstable; urgency=low
+
+  * NFSv4 patch fixes for cfs.  Closes: #367049
+    Thanks to Trond Myklebust for the quick fix.
+    - modified 30nfs4-fix.dpatch
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 15 May 2006 18:12:24 -0600
+
+util-linux (2.12r-9) unstable; urgency=low
+
+  * Release NFSv4 support. Closes: #302420, #239031, #290873
+  * Deliver isosize. Closes: #354960
+  * Fix udeb dependencies.  Closes: #360352
+
+ -- LaMont Jones <lamont@debian.org>  Sat,  6 May 2006 21:53:12 -0600
+
+util-linux (2.12r-8.2nfs4) experimental; urgency=low
+
+  * Turn on fixed nfsv4 patch.  Closes: #302420, #239031
+    Thanks to Steinar H. Gunderson <sgunderson@bigfoot.com>
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 28 Apr 2006 11:04:39 -0600
+
+util-linux (2.12r-8) unstable; urgency=high
+
+  * Drop NFS v4 patch, since it breaks mounting things exported by
+    nfs-user-server.  It will be happily reapplied once someone fixes
+    the patch.  Closes: #354075.  Reopens: #302420, #239031
+    - fix compiler warnings in said patch.
+    - Apply nfs4mount.c fix to (dropped) nfsv4 patch.  Closes: #354193
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Feb 2006 10:57:29 -0700
+
+util-linux (2.12r-7) unstable; urgency=low
+
+  * Add nfsv4 patch.  Closes: #302420, #239031
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 21 Feb 2006 11:01:21 -0700
+
+util-linux (2.12r-6) unstable; urgency=low
+
+  * make hwclock even more policy compilant.
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 28 Jan 2006 08:57:45 -0700
+
+util-linux (2.12r-5) unstable; urgency=low
+
+  * make hwclock prettier.  Closes: #348718
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 18 Jan 2006 11:44:06 -0700
+
+util-linux (2.12r-4) unstable; urgency=low
+
+  * Stupid fat-fingers typo.  Closes: #348483
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 17 Jan 2006 07:40:56 -0700
+
+util-linux (2.12r-3) unstable; urgency=low
+
+  * Add ppc64 support.  Closes: #322130
+  * Update sections to match the overrides file.
+  * hwclockfirst.sh may not exit, since it gets sourced.
+    Closes: #343447
+  * make the start messages from hwclock{first,}.sh slightly
+    different, for clarity.
+  * Build sparc binaries on sparc64
+  * Actually cleanup pager alternatives.  Closes: #348235
+  * Deal better with long passwords.  Based on patch from YAEGASHI Takeshi
+    <yaegashi@debian.org>.  Closes: #315660
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 16 Jan 2006 14:35:42 -0700
+
+util-linux (2.12r-2) unstable; urgency=low
+
+  * Add back in dropped cramfs-udebsize patch.
+
+ -- LaMont Jones <lamont@debian.org>  Fri,  9 Dec 2005 12:25:19 -0700
+
+util-linux (2.12r-1) unstable; urgency=low
+
+  * New upstream verison and maintainer.
+    - cfdisk: fix a segfault with ReiserFS partitions
+    - umount: disallow -r option for non-root users (CAN-2005-2876)
+    - sfdisk: document -G option in --help output
+    - updated translations: ca, et, fr
+    - sfdisk: add -G option (Andries Brouwer)
+    - updated translations: de, es, ru, sv, tr, nl
+  * split cfdisk into its own udeb.  Closes: #243094, #314368
+  * Really move hwclockfirst.sh back to S18 where it belongs.
+    Put hwclock.sh at S22.  See #50572.
+  * Missing line break in hwclock.sh.  Closes: #337955
+  * Include swap-suspend patch from Ubuntu.
+  * Fix variable name typo in hwclock.sh.  Closes: #340232
+  * Add CPU=$(arch) to make call for building on amd64/i386 mixed systems.
+    Closes: #305907
+  * Cleanup lsb_init function usage.
+
+ -- LaMont Jones <lamont@debian.org>  Wed,  7 Dec 2005 08:52:21 -0700
+
+util-linux (2.12p-8) unstable; urgency=high
+
+  * if /etc/adjtime is a dangling symlink, don't use it in hwclock*.sh
+  * Applited patch by Max Vozeler to fix a local privilege escalation
+    vulnerability in umount -r [debian/patches/51security_CAN-2005-2876.dpatch]
+    Closes: #328141, #329063
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 21 Sep 2005 08:36:17 -0600
+
+util-linux (2.12p-7) unstable; urgency=low
+
+  * Fix non-posix typo in hwclock.sh.  Closes: #323872
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 18 Aug 2005 19:27:51 -0600
+
+util-linux (2.12p-6) unstable; urgency=low
+
+  * Use helper program in mount for guessed FS types too.  Thanks to Manish
+    Singh and Fabio Massimo Di Nitto.  Adds: 20guesshelper.dpatch
+  * Remove /usr/doc links on install.  Closes: #322806, #322816
+  * Fix /usr/bin/pg pager alternative.  Closes: #323204
+  * Overhaul hwclock.sh and hwclockfirst.sh.  Closes: #286948, #251479
+  * Resync with Ubuntu, changes by Martin.Pitt@ubuntu.com:  Closes: #323463
+    debian/patches/60_opt_O1.dpatch:
+    - MCONFIG, configure: Build with -O1 instead of -O2 to work around cfdisk
+      segfault.
+    - Yay for upstream build systems which do not support specifying CFLAGS or
+      OPT without breaking.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 17 Aug 2005 16:14:29 -0600
+
+util-linux (2.12p-5) unstable; urgency=low
+
+  * Merge changes from ubuntu
+    - closes #319143
+  * Build-Depend: libslang2-dev.  Closes: #315634
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 21 Jul 2005 12:08:23 -0600
+
+util-linux (2.12p-4ubuntu4) breezy; urgency=low
+
+  * dpkg-architecture says DEB_HOST_GNU_SYSTEM is "linux-gnu" now, not
+    "linux". Take account of this, and add compatibility code for old
+    dpkg-architecture (closes: Ubuntu #11012).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 21 May 2005 12:03:36 +0100
+
+util-linux (2.12p-4ubuntu3) breezy; urgency=low
+
+  * Don't special case sparc, it has umount2.
+
+ -- Jeff Bailey <jbailey@ubuntu.com>  Fri, 20 May 2005 11:48:24 +0000
+
+util-linux (2.12p-4ubuntu2) breezy; urgency=low
+
+  * Run hwclockfirst.sh after modules load, so that rtc is loaded.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu, 12 May 2005 10:24:42 -0600
+
+util-linux (2.12p-4ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+  * correct shutdown message from hwclock.sh
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 15 Apr 2005 18:01:57 -0600
+
+util-linux (2.12p-4) unstable; urgency=low
+
+  * Depend on newer libblkid1.
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 17 Mar 2005 11:50:49 -0700
+
+util-linux (2.12p-3) unstable; urgency=low
+
+  * Add an alternative for pager pointing at pg (at pref 10).  Closes: #294218
+  * enable fdisk on s390.  Closes: #238151
+
+ -- LaMont Jones <lamont@debian.org>  Tue,  8 Feb 2005 13:45:34 -0700
+
+util-linux (2.12p-2ubuntu2) hoary; urgency=low
+
+  * Update dependencies for new libblkid1
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu, 17 Mar 2005 11:12:42 -0700
+
+util-linux (2.12p-2ubuntu1) hoary; urgency=low
+
+  * Resync with Debian.
+
+ -- LaMont Jones <lamont@canonical.com>  Sat, 25 Dec 2004 08:12:38 -0700
+
+util-linux (2.12p-2) unstable; urgency=low
+
+  * Really fix man page in alternatives.  Closes: #145647
+  * more typos in hwclockfirst.sh.  Closes: #276372
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 25 Dec 2004 08:08:12 -0700
+
+util-linux (2.12p-1ubuntu1) hoary; urgency=low
+
+  * Resync with Debian.  Closes warty #3366, 4784
+
+ -- LaMont Jones <lamont@canonical.com>  Fri, 24 Dec 2004 15:27:32 -0700
+
+util-linux (2.12p-1) unstable; urgency=low
+
+  * New upstream version. (2.12p)
+    Closes: #182325, #270173, #192751, #229875, #230859, #214144, #254317, #272580
+    - cfdisk: fix number of new partition when partitions not in disk order
+    - fdisk: fix Sun label handling in sector mode
+    - mkfs: never truncate filename (not that that ever happened)
+    - more: fix redraw flaw.  Closes: #146678
+  * New upstream version. (2.12o)  Closes: #286519, #132998, #207236
+    - lomount: revert patch from 2.12j
+    - lptune.8: -T option is obsolete
+    - mkswap, mkswap.8, swapon: support labels
+      (use HAVE_BLKID=no as long as the blkid library doesnt support this)
+    - umount: allow user unmounting repeatedly mounted nfs mounts
+  * Build-Depend on uuid-dev.  Closes: #282668
+  * correct chown args in debian/rules.  Closes: #254780
+  * include man page in update-alternatives for pager.  Closes: #145647
+  * fix typos in howclockfirst.sh.  Closes: #276372
+  * fix losetup -N documentation.  Closes: #239475
+  * cleanup some narrow window sprintf issues in cfdisk.
+
+ -- LaMont Jones <lamont@mmjgroup.com>  Fri, 24 Dec 2004 14:38:23 -0700
+
+util-linux (2.12m-1ubuntu1) hoary; urgency=low
+
+  * Resync with Debian.
+
+ -- LaMont Jones <lamont@canonical.com>  Mon, 20 Dec 2004 10:55:20 -0700
+
+util-linux (2.12m-1) unstable; urgency=low
+
+  * New upstream version
+    - cfdisk: recognize JFS, support reiserfs labels (flavio.stanchina@tin.it)
+    - mount: fix option parsing bug
+    - mount.8: several updates
+    - swapon.8: document -v option
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 20 Dec 2004 10:46:16 -0700
+
+util-linux (2.12l-1ubuntu1) hoary; urgency=low
+
+  * Resync with debian
+
+ -- LaMont Jones <lamont@canonical.com>  Wed, 15 Dec 2004 17:22:52 -0700
+
+util-linux (2.12l-1) unstable; urgency=low
+
+  * New upstream version, shrinking the size of the Debian diff.
+    - Makefile: remove cat-id-tbl.c upon make clean
+    - fdisk: fixed a bug that would cause a non-update of a sun disklabel
+    - fdisk: use sectorsize instead of 512 for SGI (Eric Y. Theriault)
+    - fdisk: use __attribute__((packed)) for alpha, ARM: avoid unaligned accesses
+    - hwclock: actually use HAVE_tm_gmtoff
+    - swapon: fix priority handling
+    - umount: refuse to unmount an empty string
+  * Jetisoning the (broken) hurd patch for now.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 15 Dec 2004 17:27:44 -0700
+
+util-linux (2.12k-2ubuntu1) hoary; urgency=low
+
+  * Resync with Debian
+
+ -- LaMont Jones <lamont@canonical.com>  Wed, 15 Dec 2004 11:32:45 -0700
+
+util-linux (2.12k-2) unstable; urgency=low
+
+  * Switch to dpatch.
+  * Clean up --nohashpass in losetup.  Closes: #285639
+  * Use stat instead of open in losetup.  (From #285353)
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 15 Dec 2004 10:43:29 -0700
+
+util-linux (2.12k-1ubuntu1) hoary; urgency=low
+
+  * Resync with Debian
+
+ -- LaMont Jones <lamont@canonical.com>  Mon, 13 Dec 2004 16:55:15 -0700
+
+util-linux (2.12k-1) unstable; urgency=low
+
+  * New upstream version.
+    * various translation updates
+    * gcc-3.4 support help
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 13 Dec 2004 16:50:57 -0700
+
+util-linux (2.12j-3ubuntu1) hoary; urgency=low
+
+  * Resync with Debian
+
+ -- LaMont Jones <lamont@canonical.com>  Fri, 10 Dec 2004 07:23:03 -0700
+
+util-linux (2.12j-3) unstable; urgency=low
+
+  * umount -l "" does bad things.  Don't do let the user do that.
+  * remove non-utf8 characters from changelog.  sorry.
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 10 Dec 2004 07:11:02 -0700
+
+util-linux (2.12j-2ubuntu1) hoary; urgency=low
+
+  * resync with Debian
+
+ -- LaMont Jones <lamont@canonical.com>  Tue,  7 Dec 2004 11:01:29 -0700
+
+util-linux (2.12j-2) unstable; urgency=low
+
+  * uninitialized variable.  Closes: #284597
+
+ -- LaMont Jones <lamont@debian.org>  Tue,  7 Dec 2004 10:52:55 -0700
+
+util-linux (2.12j-1ubuntu1) hoary; urgency=low
+
+  * resync with Debian
+
+ -- LaMont Jones <lamont@canonical.com>  Mon,  6 Dec 2004 03:55:55 -0700
+
+util-linux (2.12j-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- LaMont Jones <lamont@debian.org>  Mon,  6 Dec 2004 03:29:45 -0700
+
+util-linux (2.12h-4ubuntu1) hoary; urgency=low
+
+  * resync with debian.
+
+ -- LaMont Jones <lamont@canonical.com>  Thu,  2 Dec 2004 22:37:16 -0700
+
+util-linux (2.12h-4) unstable; urgency=low
+
+  * mkswap on a file was broken. Thanks to Bas Zoetekouw <bas@debian.org>
+    for the patch.  Closes: #280032, #282678
+  * add libblkid-dev to Build-Depends.  Closes: #282668
+
+ -- LaMont Jones <lamont@debian.org>  Thu,  2 Dec 2004 10:42:04 -0700
+
+util-linux (2.12h-3ubuntu1) hoary; urgency=low
+
+  * Resync with debian.
+    Fix mount segv.  Closes: Warty#3153
+
+ -- LaMont Jones <lamont@canonical.com>  Wed,  3 Nov 2004 10:44:22 -0700
+
+util-linux (2.12h-3) unstable; urgency=low
+
+  * Fix mount segv's.  Closes: #279306
+
+ -- LaMont Jones <lamont@debian.org>  Wed,  3 Nov 2004 10:09:43 -0700
+
+util-linux (2.12h-2ubuntu2) hoary; urgency=medium
+
+  * Fix unterminated string in hwclock.sh (thanks, Jones Lee).
+
+ -- Colin Watson <cjwatson@canonical.com>  Tue,  2 Nov 2004 22:29:24 +0000
+
+util-linux (2.12h-2ubuntu1) hoary; urgency=low
+
+  * Re-sync with Debian.
+
+ -- LaMont Jones <lamont@canonical.com>  Sat, 30 Oct 2004 21:14:51 -0600
+
+util-linux (2.12h-2) unstable; urgency=low
+
+  * Cleanup the changelog entry in the uploaded package, to reduce panic.
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 30 Oct 2004 15:38:18 -0600
+
+util-linux (2.12h-1) unstable; urgency=low
+
+  * Even newer upstream... sigh.
+  * Fix copyright file.  Closes: #278925
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 30 Oct 2004 12:56:19 -0600
+
+util-linux (2.12b-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 29 Oct 2004 15:40:10 -0600
+
+util-linux (2.12-11) unstable; urgency=low
+
+  * Add amd64 to fdisk.
+  * use absolute path to hwclock in scripts.  Closes: #277780
+  * deal with unaligned partition table entries in fdisk.  Closes: #268119
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 29 Oct 2004 15:05:15 -0600
+
+util-linux (2.12-10) unstable; urgency=low
+
+  * The "SO WHY IS LETTING TWO PROCESSES OPEN THE SAME TTY FOR READ A
+    _GOOD_ THING" Release.
+  * Admit that the kernel API doesn't provide what we need, and turn the code
+    back off.  Discussions will follow on how to deal with this post-sarge.
+    Closes: #272689, Reopens: #216658
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 23 Sep 2004 22:29:09 -0600
+
+util-linux (2.12-9) unstable; urgency=high
+
+  * The I-HATE-LINUX-TTY-HANDLING Release
+  * New and improved tty-in-use check, that actually works.  Closes: #272689
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 22 Sep 2004 12:30:01 -0600
+
+util-linux (2.12-8) unstable; urgency=high
+
+  * Fix tty-in-use check.  Many thanks to Samuel Thibault for tracking this
+    down and providing a patch.  Closes: #226443
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 20 Sep 2004 08:53:42 -0600
+
+util-linux (2.12-7) unstable; urgency=low
+
+  * Have pri= only affect that entry in swapon -a.  Closes: #214407
+  * Mention the freshmeat site.  Closes: #225605
+  * fix disk sun label creation in fdisk.  Closes: #228747
+  * Use a more general form for uname.  Closes: #231477
+  * Provide fdisk-udeb for sparc.  Closes: #228444
+  * Cleanup vty code in getty.  Closes: #224028, #224067, #226443, #229788
+  * Changes from Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
+    - Added amd64 architecture (Closes: #241855)
+    - Fixed manpage to avoid pointing to non existant files (Closes: #234875)
+    - Fixed Theodore Tso's address to the new one in dmesg (Closes: #222106)
+    - Modified cfdisk's es.po in order to not ask for an accented character
+      since it will not be shown in cfdisk and causes confusion amongst
+      users, this change could be reverted when upstream manages
+      8-bit characters better (Closes: #210363, #204162)
+    - mkswap manpage now mentiones --sparece=never option to cp 
+      (Closes: #184492)
+    - Added upstream maintainers to debian/copyright (Closes: #130858)
+ 
+ -- LaMont Jones <lamont@debian.org>  Fri,  6 Feb 2004 14:50:09 -0700
+
+util-linux (2.12-6) unstable; urgency=low
+
+  * Clean up FTBFS isses. Closes: #223149
+  * Deal with hwclock.sh on s390x.  Closes: #216567
+  * Have getty check before opening a device.  Closes: #216658
+
+ -- LaMont Jones <lamont@debian.org>  Sat,  6 Dec 2003 18:42:20 -0700
+
+util-linux (2.12-5) unstable; urgency=low
+
+  * Fix compile error in get_blocks.c.  Closes: #218894
+  * Help out fdisk-udeb.  Closes: #218920
+
+ -- LaMont Jones <lamont@debian.org>  Mon,  3 Nov 2003 15:02:04 -0700
+
+util-linux (2.12-4) unstable; urgency=low
+
+  * Version the build-depends on slang1-utf8-dev to make life clearer for
+    woody backporters... Closes: #211974
+  * Deliver pg.  Closes: #217310
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Oct 2003 19:54:10 -0600
+
+util-linux (2.12-3) unstable; urgency=low
+
+  * Re-add support for kerneli (if cryptoapi is there, we use it.  If not, we assume
+    that -e <name> refers to kerneli).  Closes: #65068, #131044, #163639, #211534.
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 19 Sep 2003 20:42:08 -0600
+
+util-linux (2.12-2) unstable; urgency=low
+
+  * release to unstable.  Closes: #206396,#180353
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 16 Sep 2003 23:07:27 -0600
+
+util-linux (2.12-1) experimental; urgency=low
+
+  * Fix package priorities.
+  * Cleanup cryptoapi patch. (Really just needed the keybits patch.)
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 14 Sep 2003 20:40:56 -0600
+
+util-linux (2.12-0) experimental; urgency=low
+
+  * New upstream release.
+  * cryptoapi patch (sort of) migrated forward, along with code inspired by
+    the patch in #206396.  Still fighting with 2.4.22 crypto api, patches
+    welcome.
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 14 Sep 2003 11:30:17 -0600
+
+util-linux (2.11z-5) unstable; urgency=low
+
+  * Fix mount -p (to make -p an accepted option), and add back in okeybits=
+    to make the natives happy.  Closes: #131863, #197211, #157843
+  * Merge in dependency change from -4.1, and cleanup the dirty diff that
+    brought.  Closes: #200327, #205382, #206621
+  * Was creating invalid swap files.  Closes: #196149, #203528
+  * Fix LSB failures in cal.  Closes: #184885
+  * Fix wall copyright, patch from Shaul Karl.  Closes: #196850
+  * Fix HURD patch.  Closes: #198026
+  * Include cramfs support.  Closes: #207207
+  * Fix configure bug.  Closes: #207227
+  * Create /etc/mtab mode 0600.  Closes: #208860
+  * Fix man page ref to rpc.nfsd(8).  Closes: #165381
+
+ -- LaMont Jones <lamont@debian.org>  Sat,  6 Sep 2003 16:43:20 -0600
+
+util-linux (2.11z-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Correct build-depend from slang1-dev to slang1-utf8-dev to get cfdisk in
+    fdisk-udeb to link with the same slang library as the other d-i modules.
+    Patch from Joe Nahmias.  (Closes: #200327, #205382)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Fri,  5 Sep 2003 22:18:21 +0200
+
+util-linux (2.11z-4) unstable; urgency=low
+
+  * Put ddate back in, just to keep the natives quiet.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 21 May 2003 14:36:14 -0600
+
+util-linux (2.11z-3) unstable; urgency=low
+
+  * Fix bashism in postinst from hurd port.  Closes: #194149
+  * Drop ddate.  Closes: #149321, #174459, #180737
+  * Clean up messages in hwclock.sh.  Closes: #167484
+  * Some package description changes. Closes: #139953
+  * properly install changelog.  Closes: #148714
+  * Fix hwclock man page reference to /usr/local/timezone. Closes: #149996
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 21 May 2003 07:47:41 -0600
+
+util-linux (2.11z-2) unstable; urgency=low
+
+  * add in hurd patch.  Closes: #153410
+  * Actually fixed in 2.11z-1 (or earlier)...  Closes: #81531, #138215, #138388, #185430
+  * Install line.  Closes: #141498
+  * Suggest dosfstools (home of mkfs.vfat).  Closes: #175369
+
+ -- LaMont Jones <lamont@debian.org>  Mon, 19 May 2003 21:17:22 -0600
+
+util-linux (2.11z-1) unstable; urgency=low
+
+  * New upstream version.  Closes: #167967, #127086, #122288
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 21 Mar 2003 14:02:39 -0700
+
+util-linux (2.11y-2) unstable; urgency=low
+
+  * Fix sparc build.  sigh.
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 30 Jan 2003 01:00:28 -0700
+
+util-linux (2.11y-1) unstable; urgency=low
+
+  * New upstream version
+  * don't build fdisk on m68k.  Closes: #170669
+  * Honor HWCLOCKACCESS in hwcolockfirst.sh.  Closes: #127972
+
+ -- LaMont Jones <lamont@debian.org>  Fri,  3 Jan 2003 22:05:53 -0700
+
+util-linux (2.11x-1) unstable; urgency=low
+
+  * New upstream version.  Closes: #163851
+  * Include errno.h where needed.  Closes: #168539
+
+ -- LaMont Jones <lamont@debian.org>  Sun, 24 Nov 2002 12:12:23 -0700
+
+util-linux (2.11u-2) unstable; urgency=low
+
+  * Fix changelog.
+
+ -- LaMont Jones <lamont@debian.org>  Mon,  7 Oct 2002 09:42:22 -0600
+
+util-linux (2.11u-1) unstable; urgency=low
+
+  * New upstream release
+  * Incorporate udeb fix from Tollef Fog Heen.  Closes: #156648
+  * Build fdisk-udeb only where we built fdisk...  Closes: #163461
+
+ -- LaMont Jones <lamont@debian.org>  Sun,  6 Oct 2002 23:31:42 -0600
+
+util-linux (2.11n-4.1) unstable; urgency=low
+
+  * NMU with maintainer's permission
+  * Generate udeb with *fdisk in it.  Closes: 156648
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sun, 22 Sep 2002 14:44:24 +0200
+
+util-linux (2.11n-4) unstable; urgency=low
+
+  * New maintainer.  Closes: #130842
+  * Fix Standards-Version.  Closes: #97040
+  * Loosen dependency of util-linux-locales to match upstream version.
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 26 Jan 2002 11:21:41 -0700
+
+util-linux (2.11n-3) unstable; urgency=low
+
+  * Orphaned this package.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 25 Jan 2002 14:36:06 +0100
+
+util-linux (2.11n-2) unstable; urgency=high
+
+  * Applied a patch to hwclock/cmos.c that should fix the
+    compilation on alpha. (closes: #123357)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Tue, 11 Dec 2001 12:13:30 +0100
+
+util-linux (2.11n-1) unstable; urgency=high
+
+  * New upstream release.
+    - It's now possible to build pivot_root on all architectures.
+    - The confusing error message in mount is fixed.
+      (closes: #109483)
+    - minix v2 filesystems are now autodetected by mount.
+      (closes: #118092)
+    - tmpfs is now documented in mount (8). (closes: #120930)
+    - s/top/Top/g in ipc.texi. (closes: #117438)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Mon, 10 Dec 2001 19:46:36 +0100
+
+util-linux (2.11m-1) unstable; urgency=high
+
+  * New upstream release.
+    The following bugs are fixed in this release:
+    - "setterm -foreground default" does work now.
+      (closes: #115447)
+    - "more" on empty files does no longer print junk on powerpc.
+      (closes: #114973)
+    - The entry in the expert menu the option to create a
+      SGI disklabel is now called
+      "create an IRIX (SGI) partition table". (closes: #110277)
+  * debian/rules: "raw" does now compile on m68k.
+  * Remove the special handling for PowerPC/PReP machines from
+    the postinst. (closes: #118367)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Thu,  8 Nov 2001 22:46:55 +0100
+
+util-linux (2.11l-4) unstable; urgency=high
+
+  * Corrected the bug introduced in the last upload that did let
+    the installation of util-linux fail on powerpc.
+    (closes: 117393)
+  * s/"uname -m"/`uname -m`/ in the postinst of util-linux.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 28 Oct 2001 20:11:11 +0100
+
+util-linux (2.11l-3) unstable; urgency=low
+
+  * Don't install debian/tmp/DEBIAN/conffiles on s390 (since
+    there's no longer a hwclock on s390).
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Tue, 23 Oct 2001 20:39:06 +0200
+
+util-linux (2.11l-2) unstable; urgency=low
+
+  * Don't install hwclock on s390. (closes: #115019)
+  * Make the warning in hwclockfirst.sh that occurs when the
+    timezone couldn't be determined more silent.
+    (closes: #116003)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 21 Oct 2001 12:50:40 +0200
+
+util-linux (2.11l-1) unstable; urgency=high
+
+  * New upstream release that consists of bug fixes and several
+    security fixes. (closes: #112271)
+    - renice does no longer incorrectly report a priority of 20.
+      (closes: #37348)
+    - Upstream has included the "replay" script written by
+      Joey Hess <joeyh@debian.org>. (closes: #68556)
+  * Added a hwclockfirst.sh script that runs before S20modutils.
+    (closes: #50572)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Tue,  9 Oct 2001 02:15:34 +0200
+
+util-linux (2.11h-1) unstable; urgency=high
+
+  * New upstream release.
+    - This release contains some fixes in more (1).
+      (closes: #46590)
+  * Don't build pivot_root on ia64 (ia64 has broken kernel
+    headers).
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 27 Jul 2001 19:20:25 +0200
+
+util-linux (2.11g-4) unstable; urgency=low
+
+  * m68k doesn't has pivot_root, too. (closes: #103812)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Mon,  9 Jul 2001 23:20:36 +0200
+
+util-linux (2.11g-3) unstable; urgency=low
+
+  * Don't build "raw" on m68k because it doesn't compile.
+    (closes: #103812)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat,  7 Jul 2001 16:48:23 +0200
+
+util-linux (2.11g-2) unstable; urgency=low
+
+  * hwclock.sh does now check $HWCLOCKACCESS. (closes: #87187)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri,  6 Jul 2001 19:35:04 +0200
+
+util-linux (2.11g-1) unstable; urgency=low
+
+  * New upstream release.
+  * fdisk does now know about the partition type of the
+    Linux/PA-RISC boot loader. (closes: #101853)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Wed, 27 Jun 2001 18:56:34 +0200
+
+util-linux (2.11f-1) unstable; urgency=low
+
+  * New upstream release. Bugs fixed in this release:
+    - Fix for big endian architectures in disk-utils/raw.c.
+      (closes: #100462)
+    - Support for SuperH in mount. (closes: #99804)
+    - The alpha options in hwclock do now work as documented.
+      (closes: #84346)
+    - mount (8) does now mention that the quota utilities do use
+      the *quota options in /etc/fstab. (closes: #98485)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 24 Jun 2001 22:11:23 +0200
+
+util-linux (2.11d-1) unstable; urgency=low
+
+  * New upstream release. This release contains fixes for the
+    following bugs:
+    - Different fix for the problems with the "user" option in
+      umount. (closes: #98129)
+    - Support x86 RTC on UltraSPARC III's. (closes: #91774)
+    - An error message in mount is now proper english.
+      (closes: #92198)
+  * Install more.help in /usr/share/util-linux. (closes: #96375)
+  * Updated README.Debian.hwclock.gz. (closes: #76618)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Thu, 24 May 2001 10:57:43 +0200
+
+util-linux (2.11b-6) unstable; urgency=low
+
+  * Corrected the "charset" in po/nl.po .
+  * Standards-Version: 526.7.8.9.13-Foo.6
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Wed,  9 May 2001 15:54:51 +0200
+
+util-linux (2.11b-5) unstable; urgency=low
+
+  * Made util-linux-locales binary-all.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Thu, 26 Apr 2001 23:57:45 +0200
+
+util-linux (2.11b-4) unstable; urgency=low
+
+  * Applied a fdisk patch for hppa and added hppa to fdisk_arch in
+    debian/rules. (closes: #92912)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 15 Apr 2001 03:01:40 +0200
+
+util-linux (2.11b-3) unstable; urgency=high
+
+  * Fixed the bug in umount that did let a user umount a file system
+    mounted by root when the "user" option is set in /etc/fstab.
+    (closes: #44749)
+  * Corrected a build error on powerpc in debian/rules.
+  * Corrected in util-linux-locales:
+    Section : base -> utils
+    Priority: required -> optional
+  * Added the crypto patch again. (closes: #36939)
+    Fixed in the new crypto patch:
+    - It's now the complete crypto patch. (closes: #55435)
+    - "losetup" no longer lists the available ciphers.
+      (closes: #61425)
+    - It already includes the patch from #68804. (closes: #68804)
+  * Added blockdev to util-linux. (closes: #61488)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Thu, 12 Apr 2001 19:41:14 +0200
+
+util-linux (2.11b-2) unstable; urgency=low
+
+  * Include pivot_root in util-linux. (closes: #91215)
+  * Added a lintian override for mount and umount.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 25 Mar 2001 20:16:39 +0200
+
+util-linux (2.11b-1) unstable; urgency=high
+
+  * New upstream release. This release fixes the following bugs:
+    - the problem with extended partitions when using the "o" command
+      in fdisk is fixed (closes: #45827)
+    - adfs options are now documentated in mount (8) (closes: #79181)
+    - missing .TP in mount (8) was added (closes: #56230)
+  * The locales are now in a seperate util-linux-locales package that
+    is not essential. (closes: #62651)
+  * util-linux "Suggests: kbd | console-tools" to help people to
+    find where "kbdrate" is.
+  * Added support for devfs in rdev. (closes: #74962)
+  * Include the "raw" program in util-linux. (closes: #85695)
+  * Include fdformat again. (closes: #81362)
+  * Moved the "install-info" call from the postrm to the prerm.
+    (closes: #90883)
+  * Install "HOSTORY" as "changelog.gz" in all packages.
+  * Removed the "swapdev" link to "rdev". Upstream says about swapdev:  
+      Nevertheless, all this is ancient junk. I just checked swapdev
+      and found that it was last used in kernel 0.12 but that swapdev
+      (or rdev -s) has not done anything in any kernel later than 0.12.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 23 Mar 2001 15:50:23 +0100
+
+util-linux (2.11a-2) unstable; urgency=low
+
+  * Corrected the location of the examples in getopt (1).
+    (closes: #63036)
+  * Added the missing build dependency on gettext.
+  * Added mips, mipsel and ia64 to fdisk_arch in debian/rules.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Mon, 12 Mar 2001 23:10:03 +0100
+
+util-linux (2.11a-1) unstable; urgency=low
+
+  * New upstream release.
+  * This release contains a fix for an overrun sprintf in mount.
+    (closes: #85739)
+  * A message of cfdisk is less confusing in this release.
+    (closes: #76664)
+  * Don't include a group writable /usr/share/locale/da .
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat, 10 Mar 2001 01:41:51 +0100
+
+util-linux (2.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream removed "kbdrate" from util-linux (it's now in the
+    packages kbd and console-tools).
+    Let util-linux conflict with kbd (<< 1.05-3) and
+    console-tools (<< 1:0.2.3-21) to avoid that a user of these
+    packages has a system without "kbdrate".
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri,  9 Mar 2001 19:40:53 +0100
+
+util-linux (2.10s-2) unstable; urgency=low
+
+  * New maintainer. (closes: #86872)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Wed, 21 Feb 2001 18:21:03 +0100
+
+util-linux (2.10s-1) unstable; urgency=low
+
+  * New upstream release, Closes: #85492
+  * login-utils/wall now checks whether the devices has a colon in it and skips
+    it if it does.  This prevents wall from trying to send to X connectiosn.
+    Closes: #34217
+  * added joeyh's script patch for handling SIGWINCH, Closes: #42497
+  * debian has long been modifying the man page to point at proper file
+    locations, these two bugs were merged with two other bugs that are actually
+    bugs in docs v. reality and so were not getting closed.  unmerged and are
+    now being closed.  Closes: #55500.
+  * DEB_HOST_ARCH is set if not run from within dpkg-buildpackage,
+    Closes: #71978
+  * devfs code now in the upstream, Closes: #72241
+  * upstream fixed the wrong NAME, Closes: #79794
+  * umount knows that mips does not support umount2, Closes: #80386
+  * removed calls to suidregister
+  * orphaning package
+
+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Mon, 12 Feb 2001 14:43:32 -0800
+
+util-linux (2.10q-1) unstable; urgency=low
+
+  * New upstream release
+  * New maintainer (possibly temporarily) 
+  * I left out the alpha fdisk patch and the crypto patch.  Debian needs to
+    line up with the upstream.  If there is demand, will see what I can do.
+    Closes: #77259, #69717
+  * has patch for autofs from #31251, Closes: #31251
+  * loop mounts leaking seems to have been fixed long ago, Closes: #37063
+  * nfs(5) updated to mention (no)lock option, Closes: #50300
+  * umount sigsegv'ing when user lacks permisions seems to have been fixed
+    long ago, Closes: #54757
+  * FHS transition started in last upload forgot to, Closes: #61287, #66322
+  * umount -f is now documented and tries to be functional, Closes: #62625
+  * for all of those "please update this package" bugs, Closes: #64927, #64416
+  * umount -f seems to work now, I believe it was a kernel issue, Closes: #70484
+  * bsdutils description cleaned, no longer refers to missing binaries,
+    Closes: #63617
+  * Patch rejected by upstream, Closes: #25832
+  * problems with alpha and bsd partitions believed fixed in 2.9w,
+    Closes: #34572
+  * /dev/vcsa patch accepted, Closes: #54204
+  * msglevel fixed by upstream, Closes: #54213
+  * update-mime call seems to have been fixed in previous release,
+    Closes: #55140
+  * looks like user error, Closes: #57757, #58833, #70651
+  * does not look valid any more, Closes: #64226, #67815, #60197
+  * LVM supported in current release, Closes: #67297
+  * forgot to Closes: #69442, when I put elvtune's manpage where it belongs
+  * prerm typo, oops, Closes: #77300
+  * fdformat is just a wrapper, no more confusing messages,
+    Closes: #52364, #53037
+  * hwclock.sh supports a BADYEAR argument from etc/default/rcS.
+  * no longer include example.files, they do not readily apply to debian
+    Closes: #59711
+
+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu, 16 Nov 2000 14:25:50 -0800
+
+util-linux (2.10p-1.0) unstable; urgency=low
+
+  * New upstream release
+  * NMU with maintainer's permission
+  * added Build-Depends, Closes: #75713
+  * upstream added the patch from #36340, so Closes: #36340
+  * upstream put '--More--' back to reverse video, Closes: #55165
+  * hwclock man page points at /usr/share/zoneinfo, not usr/lib
+  * all created packages' postints now sets usr/doc/ symlink, its prerm removes
+    said link
+  * copyright file now points to usr/share/common-licenses and the typo in the
+    URL was fixed (it is misc, not Misc)
+  * update hwclock.sh to reflect FHS changes
+  * debian/rules file brought up to date for FHS
+  * elvtune man page put with the binary
+  * The above changes allow Closes: #69698
+  * edited fr.po, fixed "Nombre de partitions" to "Numero de partition",
+    Closes: #71743
+  * whereis knows that /usr/share/man/* is valid, Closes: #72097
+  * debian/rules now sets SHELL to bash, so it can use bashisms, Closes: #74095
+  * upstream HISTORY file included as changelog.gz, Closes: #63175
+  * removed /etc/fdprm, Closes: #62955
+  * made fdformat a sh script instead of a bash script (the bash was unneeded)
+
+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu,  9 Nov 2000 17:55:10 -0800
+
+util-linux (2.10o-1) unstable; urgency=low
+
+  * New upstream code. Add elvtune.
+    closes: #69166: util-linux package not complete.
+
+ -- Vincent Renardias <vincent@debian.org>  Thu, 17 Aug 2000 18:17:34 +0200
+
+util-linux (2.10n-1) unstable; urgency=low
+
+  * New upstream code.
+    closes: #68976 util-linux needs new upstream version.
+    closes: #64536 util-linux: [PATCH] mkswap refuses to create big swap partitions.
+    closes: #63747 Option parsing bug of 'mkswap' command Debian Package util-linux.
+    closes: #62935 mkswap BUG of option parsing in Debian Package util-linux.
+    closes: #59264 util-linux: mkswap: erroneous option parsing, documentation outdated.
+    closes: #64079 util-linux: mkswap's -v[01] option is broken.
+
+ -- Vincent Renardias <vincent@debian.org>  Sun, 13 Aug 2000 00:54:51 +0200
+
+util-linux (2.10f-5.1) frozen unstable; urgency=low
+
+  * Non-Maintainer Upload
+  * Patch from Ben Collins to fix the -v[01] option in mkswap
+    (closes: #64079)
+  * Patch from Chris Butler to fix hwclock's handling of RTC
+    (closes: #62688)
+  * Change to line 879 of fdiskbsdlabel.c to allow building on sparc
+    (patch sent to maintainer)
+    
+ -- Stephen R. Gore <sgore@debian.org>  Sun, 25 Jun 2000 22:18:47 +0500
+
+util-linux (2.10f-5) frozen unstable; urgency=low
+
+  * Patch from David Huggins-Daines <dhd@linuxcare.com>
+    which is required to get a working fdisk on alpha.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon,  1 May 2000 22:40:17 +0200
+
+util-linux (2.10f-4) unstable; urgency=low
+
+  * Patch for mips support from Florian Lohoff <flo@rfc822.org>.
+    closes: #62247: patch for mips/mipsel and bsddisklabel.
+
+ -- Vincent Renardias <vincent@debian.org>  Wed, 12 Apr 2000 17:26:24 +0200
+
+util-linux (2.10f-3) frozen unstable; urgency=low
+
+  * included patch from David Huggins-Daines <dhuggins@linuxcare.com> so
+    that fdisk behaves correctly with OSF/1 disklabels.
+    closes: #59385: Fixes for BSD disklabel support (for Alpha)
+    (Important bug)
+
+ -- Vincent Renardias <vincent@debian.org>  Thu,  2 Mar 2000 13:21:40 +0100
+
+util-linux (2.10f-2) frozen unstable; urgency=low
+
+  * Now that 2.10f-1 has been tested in unstable, re-upload it to frozen.
+    closes: #54252: cfdisk fails to detect DAC960 partitions. (CRITICAL)
+
+ -- Vincent Renardias <vincent@debian.org>  Sat,  5 Feb 2000 19:05:29 +0100
+
+util-linux (2.10f-1) unstable; urgency=low
+
+  * New upstream release:
+    * Security fix for mount (okir)
+    * Avoid infinite loop in namei (Brett Wuth)
+      closes: #56761: namei segment faults on circular links.
+    * added clock-ppc.c (from Matsuura Takanori), not merged yet
+    * deleted clockB subdirectory
+    * recognize mkdosfs string (Michal Svec)
+    * New: rename
+    * Added option to mkswap so that user can override pagesize
+    * fdisk -l now reads /proc/partitions when no device was given
+      closes: #55614: util-linux: 'fdisk -l' no longer works?.
+    * Fixed fdisk.8 (James Manning)
+    * Added devpts info to mount.8 (Elrond)
+    * Newline fix for logger output to stdout (Henri Spencer)
+
+ -- Vincent Renardias <vincent@debian.org>  Thu,  3 Feb 2000 14:19:33 +0100
+
+util-linux (2.10d-7) frozen unstable; urgency=low
+
+  * There is no real concensus about what we should do about the
+    hwclock issue. Now at least the problem is enough documented
+    to let the user decide. (Thanks to Henrique M Holschuh <hmh+debianml@rcm.org.br>
+    for the patch).
+    When this package is installed, I'll examine one by one which BR can
+    be closed.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon, 31 Jan 2000 14:34:03 +0100
+
+util-linux (2.10d-6) frozen unstable; urgency=low
+
+  * kbdrate isn't suid anymore.
+    closes: #54978: ordinary user can change keyboard repeat vor all users.
+
+ -- Vincent Renardias <vincent@debian.org>  Fri, 28 Jan 2000 16:52:27 +0100
+
+util-linux (2.10d-5) unstable; urgency=low
+
+  * Included patch from "J.H.M. Dassen (Ray)" <jhm@cistron.nl>:
+    - Restored enhanced losetup(8) manpage.
+    - Restored encrypted filesystem support, by applying util-linux-2.9w from 
+      patch-int-2.2.13.3.gz as found on ftp.kerneli.org (modified to work with 
+      Debian's kernel-patch-int's crypto.h).
+    (closes: #54657)
+  * Recompiled with ncurses5.
+
+ -- Vincent Renardias <vincent@debian.org>  Wed, 12 Jan 2000 12:24:12 +0100
+
+util-linux (2.10d-4) unstable; urgency=low
+
+  * ipcrm now accepts multiple ids thanks to a patch from Topi Miettinen.
+    closes: #15110: ipcrm doesn't work with xargs.
+  * fix postinst script:
+    closes: #53254: util-linux: ppc chunk of postinst script has syntactical error.
+
+ -- Vincent Renardias <vincent@debian.org>  Wed, 22 Dec 1999 17:24:46 +0100
+
+util-linux (2.10d-3) unstable; urgency=low
+
+  * Disabled 'hwclock --adjust' on boot.
+    closes: #37657: util-linux: hwclock --systohc dangerous.
+    closes: #40283: util-linux: hwclock --systohc dangerous.
+    closes: #41263: hwclock --adjust doesn't work (temporary fix included).
+    closes: #51805: /etc/adjtime.
+    closes: #35432: "/etc/init.d/hwclock.sh" possible bug.
+    closes: #43228: Clock taking advance in potato.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon, 20 Dec 1999 13:55:21 +0100
+
+util-linux (2.10d-2) unstable; urgency=low
+
+  * cfdisk must be build with slang; not ncurses.
+    closes: #52559: cfdisk linked against libncurses instead of slang.
+
+ -- Vincent Renardias <vincent@debian.org>  Fri, 10 Dec 1999 11:21:36 +0100
+
+util-linux (2.10d-1) unstable; urgency=low
+
+  * New upstream release.
+    closes: #52151: mount: mount/umount infinite loop on stale lockfiles.
+  * Put renice manpage in section 1 instead of 8.
+    closes: #52370: bsdutils: wrong section for renice manpage.
+  * kbdrate's PAM now uses pam_unix.so by default.
+    closes: #51273: util-linux: uses pam_pwdb for kbdrate.
+  * already fixed in 2.10-5:
+    closes: #49823: name conflict.
+
+ -- Vincent Renardias <vincent@debian.org>  Fri, 10 Dec 1999 11:21:36 +0100
+
+util-linux (2.10-6) unstable; urgency=low
+
+  * Patch by Topi Miettinen <Topi.Miettinen@nic.fi> to a longstanding
+    bug in logger. closes: #19666.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon,  6 Dec 1999 11:49:10 +0100
+
+util-linux (2.10-5) unstable; urgency=low
+
+  * replace fdformat by a notice asking to use superformat instead.
+  * remove setfdprm; closes: #44941.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon,  6 Dec 1999 11:49:10 +0100
+
+util-linux (2.10-4) unstable; urgency=low
+
+  * conflict/replace with fdisk on sparc.
+    closes: #50254: please conflict and replace fdisk on sparc.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon, 15 Nov 1999 17:28:00 +0100
+
+util-linux (2.10-3) unstable; urgency=low
+
+  * re-introduce missing c?fdisk... (oops ;)
+    closes: #49406, #49457, #49337, #49313, #46732.
+
+ -- Vincent Renardias <vincent@debian.org>  Mon,  8 Nov 1999 13:01:12 +0100
+
+util-linux (2.10-2) unstable; urgency=low
+
+  * Do TheRightThing(tm) for bug #47219.
+  * from NMU prepared by Torsten Landschoff <torsten@debian.org>:
+    * Fixed case expression in hwclock.sh
+      (closes: #42431, #42435, #42856).
+    * Added usage information to hwclock (closes: #23184).
+    * Upstream has long changed mount.c to handle nouser properly
+      (closes: #24954, #24956).
+    * Excluded clock.8 link from powerpc build (closes: #46010).
+    * Replaced "$(shell dpkg --print-architecture)" with
+      "$DEB_HOST_ARCH" in debian/rules.
+
+ -- Vincent Renardias <vincent@debian.org>  Thu,  4 Nov 1999 10:53:37 +0100
+
+util-linux (2.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * make /etc/rc{0,6}.d/*hwclock.sh correctly.
+    closes: #47111: util-linux: hwclock.sh: wrong names on rc*.d links.
+    closes: #47373: hwclock.sh links are wrong.
+  * Correct kdbrate pam entry.
+    closes: #45674: kbdrate PAM config references missing pam_console.so.
+  * Fix fdiskdsblabel.h.
+    closes: #47219: util-linux: errors compiling on sparc.
+  * Use jgg's patch for hwclock.sh
+    closes: #43793: Support for both GMT and UTC default/rc.S setting is wrong.
+  * Really link kbdrate with pam.
+    closes: #48425: pam support for kbdrate useless.
+
+ -- Vincent Renardias <vincent@debian.org>  Wed,  3 Nov 1999 11:41:44 +0100
+
+util-linux (2.9x-1) unstable; urgency=low
+
+  * New upstream release.
+    closes: #32916: hwclock freezes m68k system.
+    closes: #44986: util-linux: PAM support for kbdrate.
+    closes: #44821: util-linux: pam.d entry contains a path.
+    closes: #44727: util-linux: sfdisk examples are present twice in the package.
+    closes: #45565: removed /bin/kill. this is now provided by procps.
+    closes: #36332: problems with our /bin/kill.
+    closes: #41171: wall should be sgid tty, not root.
+
+ -- Vincent Renardias <vincent@debian.org>  Tue, 21 Sep 1999 17:54:47 +0200
+
+util-linux (2.9w-3) unstable; urgency=low
+
+  * Include PowerPC patch from Matt Porter <mporter@phx.mcd.mot.com>.
+  * Should be 100% PAMified(tm). Please report anomalies.
+
+ -- Vincent Renardias <vincent@debian.org>  Tue,  7 Sep 1999 18:53:37 +0200
+
+util-linux (2.9w-2) unstable; urgency=low
+
+  * updated losetup.8 from "J.H.M. Dassen (Ray)" <jdassen@wi.LeidenUniv.nl>.
+
+ -- Vincent Renardias <vincent@debian.org>  Tue, 24 Aug 1999 17:44:06 +0200
+
+util-linux (2.9w-1) unstable; urgency=low
+
+  * Upstream upgrade:
+      util-linux 2.9w:
+      * Updated mount.8 (Yann Droneaud)
+      * Improved makefiles
+      * Fixed flaw in fdisk
+      util-linux 2.9v:
+      * cfdisk no longer believes the kernel's HDGETGEO
+        (and may be able to partition a 2 TB disk)
+      util-linux 2.9u:
+      * Czech more.help and messages (Jii Pavlovsky)
+      * Japanese messages (Daisuke Yamashita)
+      * fdisk fix (Klaus G. Wagner)
+      * mount fix (Hirokazu Takahashi)
+      * agetty: enable hardware flow control (Thorsten Kranzkowski)
+      * minor cfdisk improvements
+      * fdisk no longer accepts a default device
+      * Makefile fix
+  * now uses the script(1) supplied with util-linux instead
+    of the one from the old bsdutils package.
+  * remove alpha specific build patch:
+    closes: #41256.
+  * remove useless warning in preinst.
+
+ -- Vincent Renardias <vincent@debian.org>  Tue, 24 Aug 1999 17:44:06 +0200
+
+util-linux (2.9t-3) unstable; urgency=low
+
+  * include missing fdformat, setfdprm. (How comes nobody noticed yet?!)
+  * recompile against slang1-dev 1.2.2-3.
+
+ -- Vincent Renardias <vincent@debian.org>  Tue, 24 Aug 1999 09:23:59 +0200
+
+util-linux (2.9t-2) unstable; urgency=low
+
+  * correct hwclock.sh;
+    closes: #35429 sysvinit: bad comments in /etc/defaults/rcS.
+
+ -- Vincent Renardias <vincent@debian.org>  Wed, 28 Jul 1999 18:43:05 +0200
+
+util-linux (2.9t-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Applied util-linux-2.9s.patch from patch-int-2.2.10.4.gz as found on
+    ftp.kerneli.org to enable support for mounting encrypted filesystems
+    through the loopback devices when using an international kernel.
+    (Fixes: Bug#36939, #38371)
+  * Include <linux/loop.h> and <linux/crypto.h> in the source, so as not to
+    rely on source outside main.
+  * Updated the losetup(8) manpage.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Thu, 22 Jul 1999 18:32:16 +0200
+
+util-linux (2.9t-1) unstable; urgency=low
+
+  * Upstream upgrade:
+    * national language support for hwclock
+    * Japanese messages (both by Daisuke Yamashita)
+    * German messages and some misc i18n fixes (Elrond)
+    * Czech messages (Jii Pavlovsky)
+    * wall fixed for /dev/pts/xx ttys
+    * make last and wall use getutent() (Sascha Schumann)
+      [Maybe this is bad: last reading all of wtmp may be too slow.
+       Revert in case people complain.]
+    * documented UUID= and LABEL= in fstab.5
+    * added some partition types
+    * swapon: warn only if verbose
+    closes: #37008: de.po file integrated upstream.
+    closes: #37380: it.po file integrated upstream.
+    closes: #38232: patch integrated upstream.
+    closes: #36124: examples included.
+    closes: #36848, #37153, #38101, #38416: pts bug fixed upstream.
+    closes: #40868: use suidregister /usr/bin/wall.
+    closes: #34728: patch integrated upstream.
+    closes: #38219: typo. fixed; patch sent upstream.
+    closes: #37585: bug corrected upstream.
+    closes: #37002: CRLF fstab isn't a problem anymore.
+  * changed hwclock.sh to get rid of a lintian error.
+
+ -- Vincent Renardias <vincent@debian.org>  Fri,  9 Jul 1999 16:15:01 +0200
+
+util-linux (2.9r-3) unstable; urgency=low
+
+  * Added missing *.gmo files
+  * Re-add Harmut's powerpc patch that somehow got left out (closes: #37973).
+
+ -- Vincent Renardias <vincent@debian.org>  Wed, 19 May 1999 12:45:09 +0200
+
+util-linux (2.9r-2) unstable; urgency=low
+
+  * Fix stupid bug #37916.
+
+ -- Vincent Renardias <vincent@debian.org>  Tue, 18 May 1999 15:51:08 +0200
+
+util-linux (2.9r-1) unstable; urgency=low
+
+  * Upstream upgrade.
+  * Now compiled with PAM=yes.
+  * initial .it localisation.
+  * Improved .fr translation.
+  * corrected hwclock.sh (reassigned #35429 back to sysvinit).
+  * put rev into /usr/bin instead of /usr/sbin (Fix #34188,#35421).
+  * include getopt examples (Fix #34705).
+
+ -- Vincent Renardias <vincent@debian.org>  Fri, 14 May 1999 16:21:44 +0200
+
+util-linux (2.9i-1) unstable; urgency=low
+
+  * Upstream upgrade.
+  * This source package now also provides the 'bsdutils' binary
+    package.
+  * Included patch for logger.1 from and1000@debian.org.
+  * Included patch to logger.c from Joey (closes: #32109).
+  * renice.c: include <errno.h> (closes: #31288).
+  * re-use script(1) from the 'old' bsdutils package as well
+    as README.script (closes: #988).
+  * Now umount is compiled with '-f' support (closes: #33147).
+  * Re-add suidregister support for mount (closes: #32495).
+
+ -- Vincent Renardias <vincent@debian.org>  Sun, 21 Feb 1999 20:16:20 +0100
+
+util-linux (2.9g-6) frozen unstable; urgency=low
+
+  * modify mount.8 manpage to warn that nosuid is useless
+    if something like suidperl is installed.
+    (doesn't fix the critical bug #31980 reported on suidperl,
+    but at least warn about its existance)
+  * add missing manpages (ramsize,rootflags,swapdev)
+  * #32414: changed a 'rm' into 'rm -f' so the source
+    package builds cleanly.
+  * also target the upload for frozen since this is the only missing
+    package to be able to safely use kernels 2.2.x:
+    To the FTP/Release maintainers:
+      util-linux_2.9g has been introduced in unstable on Dec, 31st 98;
+      so far I received no bug reports about it except for the missing
+      manpages. Also compared to the 2.7.1 version from frozen, this
+      package fixes _57_ bugs. (see www.debian.org/Bugs/db/pa/lutil-linux.html)
+
+ -- Vincent Renardias <vincent@waw.com>  Tue, 26 Jan 1999 23:51:57 +0100
+
+util-linux (2.9g-5) unstable; urgency=low
+
+  * Fix bug #31981.
+  * Localised cfdisk + provided initial French translation.
+    New translations welcome; you can get the potfile at
+    http://www.ldsol.com/~vincent/util-linux.pot
+
+ -- Vincent Renardias <vincent@waw.com>  Sat, 23 Jan 1999 21:55:06 +0100
+
+util-linux (2.9g-4) unstable; urgency=low
+
+  * Add rev and readprofile commands.
+  * Updated fstab.5 regarding spaces in mount points names.
+  * Fix bugs #32235,#31997 (missing hwclock.8 manpage).
+  * Fix bug #32097 (missing mkswap.8 manpage).
+  * Improve somewhat cfdisk regarding exit codes thanks to
+    Enrique's patch (#31607).
+
+ -- Vincent Renardias <vincent@waw.com>  Fri, 22 Jan 1999 19:13:25 +0100
+
+util-linux (2.9g-3) unstable; urgency=low
+
+  * Include patch from Hartmut Koptein for better powerpc support.
+
+ -- Vincent Renardias <vincent@waw.com>  Wed, 13 Jan 1999 22:46:04 +0100
+
+util-linux (2.9g-2) unstable; urgency=high
+
+  * Patch from Topi Miettinen (Thanks Topi ;) to fix
+    bug #31554,#31573.
+
+ -- Vincent Renardias <vincent@waw.com>  Mon, 11 Jan 1999 03:59:19 +0100
+
+util-linux (2.9g-1) unstable; urgency=high
+
+  * Adopting the package from Guy Maor.
+  * Re-add hwclock & kbdrate which had been lost
+    (Fix bug #31476).
+
+ -- Vincent Renardias <vincent@waw.com>  Fri,  1 Jan 1999 19:53:33 +0100
+
+util-linux (2.9g-0.3) unstable; urgency=high
+
+  * YA NMU.
+  * Split mount out into separate package so as not to
+    force the dangerous replacement of an essential package.
+
+ -- Joel Klecker <espy@debian.org>  Sun,  3 Jan 1999 19:00:31 -0800
+
+util-linux (2.9g-0.2) unstable; urgency=low
+
+  * NMU (Part II): Fix more problems in 'mount'.
+  * swapon now warn if swap device has insecure mode;
+    Patch from Topi Miettinen <tom@medialab.sonera.net>
+    (Fix bug #23249).
+  * mount can now handle multiple hostnames for NFS mounts
+    in fstab (Fix bug #29309).
+  * Do'h; add missing /sbin/swapoff ;).
+
+ -- Vincent Renardias <vincent@waw.com>  Fri,  1 Jan 1999 19:53:33 +0100
+
+util-linux (2.9g-0.1) unstable; urgency=low
+
+  * NMU.
+  * This package now provides /bin/mount & co. and thus
+    obsoletes the mount package.
+  * provides the ddate command (Fix bugs #30015 & #19820).
+  * Move wtmp lockfile from /etc to /var/lock
+    (Fix bug #29128).
+  * Set bug #28885 to 'fixed' (this-is-not-a-bug,-but-a-feature(tm)).
+  * Set bug #27931 to 'fixed' (works again since version 2.8).
+  * Set bug #27723 to 'fixed' (been fixed by the ARM NMU).
+  * Set bug #25831 to 'fixed' (hwclock now works as advertised).
+  * Set buffering off on the output channel in chkdupexe.pl
+    (Fix bug #22839).
+  * Include patch for powerpc build by Joel Klecker <jk@espy.org>
+    (Fix bug #21374).
+  * Removed the confusing references to agetty (Fix bug #20668).
+  * Check the result for the malloc()s added in the code to chown
+    vcsa to root.sys (Fix bug #18696).
+  * Include patch for sparc build by
+    Eric Delaunay <delaunay@lix.polytechnique.fr> (Fix bug #17784).
+  * Set bug #17752 to 'fixed' (Appear to work with current versions
+    of xvt and /bin/more).
+  * Include patch for alpha build by
+    Christopher C Chimelis <chris@classnet.med.miami.edu>
+    (Fix bug #17661).
+  * Patch mkfs.minix doesn't go into infinate loop any more depending
+    on the argument passed to -i (Fix bug #17648).
+  * Set bug #17483 to 'fixed' (now that util-linux is compiled with
+    libc6 > =2.0.6 it should be fixed).
+  * Set bug #26625 to 'fixed' (this patch has already been applied).
+  * Applied patch from Bcwhite to get mime support
+    (Fix bug #26715).
+  * Applied patch from Topi Miettinen <tom@medialab.sonera.net>:
+      POSIX etc fixes:
+      - ioctl(.., TCSETSF,..) -> tcsetattr()
+      - ioctl(.., TCGETS,..) -> tcgetattr()
+      - ioctl(.., TIOCGPGRP,..) -> tcgetpgprp()
+      - gcc -Wall warning fixes
+      - write(2, ..) -> write(fileno(stderr), ..)
+      - vi -> sensible-editor
+      - added setlocale(LC_ALL, "")
+      - use perror, isdigit, isprint, iscntrl where applicable
+      - execv -> execvp
+      - added simple ELF detection
+      OpenBSD fixes:
+      - UCB fix
+      - POSIX: rindex -> strrchr
+      - obsolete fseek flag L_SET -> SEEK_SET
+      - control-F == f
+      - $EDITOR support
+    (Fix bug #27635). 
+  * Link clock.8.gz to hwclock.8.gz (Fix bug #25852).
+
+ -- Vincent Renardias <vincent@waw.com>  Thu, 31 Dec 1998 23:48:42 +0100
+
+util-linux (2.9e-0.4) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Recompiled with slang1.
+
+ -- James Troup <james@nocrew.org>  Sat, 19 Dec 1998 20:42:52 +0000
+
+util-linux (2.9e-0.3) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Include /etc/init.d/hwclock.sh
+  * Fix some of the (pre|post)(inst|rm) script wrt $1 processing
+    Fixes:
+    #18007: sysvinit: hwclock.sh uses GMT env variable - but how?
+    #26904: hwclock.sh doesn't "test -x"
+    #24649: [Peter Kundrat <kundrat@gic.sk>] hwclock startup script
+    #20728: util-linux: hwlock: GMT status lost?
+    #19248: util-linux should install /etc/init.d/hwclock.sh
+
+ -- Miquel van Smoorenburg <miquels@cistron.nl>  Thu, 17 Dec 1998 13:56:45 +0100
+
+util-linux (2.9e-0.2) unstable; urgency=low
+
+  * NMU: Added ARM architecture in 'disk-utils/fdiskbsdlabel.h' and
+    'disk-utils/fdiskbsdlabel.c'.
+  * Removed '-m3' flag from arm-specific optimizations in MCONFIG.
+
+ -- Tor Slettnes <tor@slett.net>  Sun, 29 Nov 1998 01:20:13 -0800
+
+util-linux (2.9e-0.1) unstable; urgency=low
+
+  * Non-maintainer upload - new 2GB swap areas, removed hostid
+  * upstream uses fixed more.c (line 813 had *p++)
+
+ -- Adrian Bridgett <bridgett@debian.org>  Sat, 21 Nov 1998 17:35:35 +0000
+
+util-linux (2.7.1-3.1) frozen unstable; urgency=low
+
+  * Non-maintainer upload
+  * recompiled with slang1 and ncurses4
+
+ -- Joseph Carter <knghtbrd@debian.org>  Sun, 25 Oct 1998 21:48:16 -0800
+
+util-linux (2.7.1-3) unstable; urgency=low
+
+  * Another m68k patch from Roman Hodek
+    <rnhodek@faui22c.informatik.uni-erlangen.de>
+  * fdisk patch from Russell Coker <rjc@snoopy.virtual.net.au> for better
+    behavior on IDE CD's when HDIO_GETGEO fails.
+  * fix getopt(1) typo. (16227)
+  * Use slang for cfdisk.
+  * fdisk -l tries eda also (13841).
+  * Fix fdisk -l segfaults (15236,15603).
+  * Install rdev on only i386 (15228).
+  * Don't strip perl script (15480).
+  * Add type 17=Hidden IFS to cfdisk (16843).
+    
+ -- Guy Maor <maor@ece.utexas.edu>  Sun, 11 Jan 1998 17:20:23 -0800
+
+util-linux (2.7.1-2) unstable; urgency=low
+
+  * Removed sync (13291).
+  * Added m68k hwclock patches from Roman Hodek (9870).
+  * agetty.c: set vcs,vcsa to root.sys 600 when starting.
+
+ -- Guy Maor <maor@ece.utexas.edu>  Thu, 25 Sep 1997 16:51:34 -0500
+
+util-linux (2.7.1-1) unstable; urgency=low
+
+  * libc6 compile of new upstream version (10098, 11744, 13123).
+  * Updated cfdisk to cfdisk 0.8k
+  * Added old patches; I'll send them upstream.
+  	* fdisk - extended paritions, exit on EOF.
+  	* mkfs - fix search paths.
+  	* mkfs.minix - set owner of root dir to invoker.
+  	* chkdupexe - remove upstream brokenness by checking PATH too.
+  	* mcookie - fix man page
+  	* whereis - fix search paths, find .gz files.
+  	* sync - put it back (doh!)
+  * Folded in getty:
+  	* glibc patch (8815, 11687, 12738).
+  	* Set tty to 660 root.dialout (8960).
+  * Register pager alternative (12475).
+    
+ -- Guy Maor <maor@ece.utexas.edu>  Mon, 22 Sep 1997 18:29:53 -0500
+
+util-linux (2.5-12) frozen unstable; urgency=low
+
+  * Updated cfdisk to ftp.win.tue.nl:/pub/linux/util/cfdisk-0.8i.tar.gz
+
+ -- Guy Maor <maor@ece.utexas.edu>  Tue, 6 May 1997 15:29:56 -0500
+
+util-linux (2.5-11) frozen unstable; urgency=medium
+
+  * Updated cfdisk to ftp.win.tue.nl:/pub/linux/util/cfdisk-0.8g.tar.gz (#9146)
+  * -i from 2.5-9 removed as no longer needed.
+
+ -- Guy Maor <maor@ece.utexas.edu>  Tue, 29 Apr 1997 13:40:26 -0500
+
+util-linux (2.5-10) frozen unstable; urgency=medium
+
+  * cfdisk: really fixed cast this time so should be able to deal with
+    >2GB disks(#6747, #8041)
+  * fdisk, cfdisk: Added partition id 0xa6 = OpenBSD (#7571)
+  * setterm: use putp to output (#7852)
+  * Removed miscutils removal trick as it no longer works (#5757, #6862)
+  * mkfs.minix: added patch from Volker Leiendecker <volker@fsing.uni-sb.de>
+    to set owner of root directory to invoker (like mkfs.ext2). (#6902)
+  * Fix dpkg-shlibddeps rules line for m68k (#5818)
+
+ -- Guy Maor <maor@ece.utexas.edu>  Thu, 27 Mar 1997 13:04:35 -0600
+
+util-linux (2.5-9) frozen unstable; urgency=low
+
+  * Add undocumented "-i" flag to ignore bad partition tables when starting
+    instead of throwing a fatal error. Let's pass this to the upstream
+    maintainer, please.
+
+ -- Bruce Perens <bruce@pixar.com>  Fri, 6 Dec 1996 22:12:31 -0800
+
+util-linux (2.5-8) frozen unstable; urgency=low
+
+  * disk-utils/cfdisk.c: cast sector number to ext2_loff_t in calls to
+    ext2_llseek()
+  
+ -- Guy Maor <maor@ece.utexas.edu>  Sat, 23 Nov 1996 23:07:59 -0600
+
+util-linux (2.5-7) unstable; urgency=low
+
+  * sys-utils/clock.c: fixed bug on machines without RTC enabled.
+  * sys-utils/whereis.c: better path, compare function.
+  * Install whereis, cytune, setsid.
+
+ -- Guy Maor <maor@ece.utexas.edu>  Fri, 27 Sep 1996 23:02:09 -0500
+
+util-linux (2.5-6) unstable; urgency=low
+
+  * sys-utils/clock.c: Fixed bugs when real-time clock device is enabled
+    in kernel.
+  * New source format.
+
+ -- Guy Maor <maor@ece.utexas.edu>  Tue, 3 Sep 1996 14:25:31 -0500
+
+util-linux (2.5-5) unstable; urgency=low
+
+  * disk-utils/fdisk.c: Added type a7 = NEXTSTEP (fixes bug 3259)
+  * fdisk.c,cfdisk.c: Applied patch from Miquel van Smoorenburg
+    <miquels@Q.cistron.nl> to let fdisk and cfdisk support Linux
+    extended partitions.
+  * Applied patch from Frank Neumann
+    <Frank.Neumann@Informatik.Uni-Oldenburg.DE> for Linux/m68k
+    support.
+  * Install mkcookie.
+  * disk-utils/mkfs.minix: fixed bug 3777 re parsing oddities.
+
+ -- Guy Maor <maor@ece.utexas.edu>  Tue, 20 Aug 1996 16:21:21 -0500
+
+util-linux (2.5-4) unstable; urgency=low
+
+  * misc-utils/setterm.c (tc_entry): Applied patch from Michael
+    Nonweiler <mrn20@hermes.cam.ac.uk> to make it work with ncurses.
+  * misc-utils/chkdupexe.pl: Fixed some bugs with duplicate path
+    and symbolic links.  Put in a better value for exedirs.
+  * Install chkdupexe, setterm.
+
+ -- Guy Maor <maor@ece.utexas.edu>  Wed, 05 Jun 1996 08:44:25 -0500
+
+util-linux (2.5-3) unstable; urgency=low
+
+  * text-utils/more.c (getline): more now handles files with lines ending
+    with "\r\n".  Fixes Bug #2579.
+  * Added 'priority: required'
+
+ -- Guy Maor <maor@ece.utexas.edu>  Thu, 25 Apr 1996 04:55:22 -0500
+
+util-linux (2.5-2) unstable; urgency=low
+
+  * disk-utils/fdisk.c (read_line): EOF now exits instead of looping
+    forever.  Fixes Bug #1206.
+  * Added 'section: base'
+
+ -- Guy Maor <maor@ece.utexas.edu>  Fri, 19 Apr 1996 05:13:09 -0500
+
+util-linux (2.5-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Guy Maor <maor@ece.utexas.edu>  Thu, 18 Apr 1996 04:32:22 -0500
--- util-linux-2.19.1.orig/debian/util-linux.templates
+++ util-linux-2.19.1/debian/util-linux.templates
@@ -0,0 +1,16 @@
+Template: util-linux/noauto-with-nonzero-passnum
+Type: note
+_Description: Filesystem entries with noauto and non-zero pass number
+ /etc/fstab contains at least one entry that is marked as "noauto" with a
+ non-zero pass number (meaning that the file system should not be
+ automatically mounted upon boot, yet should be checked by fsck, the
+ file system check utility).
+ .
+ From this release onwards, fsck will fail for file systems that have a
+ non-zero pass number and are not available (eg. because they are unplugged)
+ at the time fsck runs. This will cause the system to enter file system
+ repair mode during boot.
+ .
+ To avoid this problem, please adjust such fstab entries for removable
+ devices, by either setting their pass number to zero, or adding the "nofail"
+ option. For more details, please see mount(8).
--- util-linux-2.19.1.orig/debian/util-linux.lintian-overrides
+++ util-linux-2.19.1/debian/util-linux.lintian-overrides
@@ -0,0 +1,3 @@
+util-linux: init.d-script-possible-missing-stop /etc/init.d/hwclock.sh 1
+util-linux: no-debconf-config
+util-linux: postinst-uses-db-input
--- util-linux-2.19.1.orig/debian/hwclock.rules
+++ util-linux-2.19.1/debian/hwclock.rules
@@ -0,0 +1,4 @@
+# Reset the System Clock to UTC if the hardware clock from which it was
+# copied by the kernel was in localtime.
+
+KERNEL=="rtc0", RUN+="/lib/udev/hwclock-set $root/$name"
--- util-linux-2.19.1.orig/debian/util-linux.preinst
+++ util-linux-2.19.1/debian/util-linux.preinst
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+	if [ -e "/etc/udev/rules.d/85-hwclock.rules" ]; then
+		if [ "`md5sum \"/etc/udev/rules.d/85-hwclock.rules\" | sed -e \"s/ .*//\"`" = \
+		     "`dpkg-query -W -f='${Conffiles}' util-linux | sed -n -e \"\\\\' /etc/udev/rules.d/85-hwclock.rules's/.* //p\"`" ]
+		then
+			rm -f "/etc/udev/rules.d/85-hwclock.rules"
+		fi
+	fi
+fi
+
+#DEBHELPER#
--- util-linux-2.19.1.orig/debian/libblkid.copyright
+++ util-linux-2.19.1/debian/libblkid.copyright
@@ -0,0 +1,19 @@
+This is libblkid, previously part of e2fsprogs this is now part of
+util-linux-ng and has thus moved to the util-linux Debian source
+package.
+
+Upstream Author: Theodore Ts'o <tytso@mit.edu>
+
+Copyright:
+
+Copyright (C) 1999, 2001 by Andries Brouwer
+Copyright (C) 1999, 2000, 2003 by Theodore Ts'o
+Copyright (C) 2001 Andreas Dilger
+Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+
+You are free to distribute this software under the terms of the GNU
+Lesser (Library) General Public License.
+
+On Debian systems, the complete text of the GNU Lesser (Library)
+General Public License can be found in /usr/share/common-licenses/LGPL.
--- util-linux-2.19.1.orig/debian/source/format
+++ util-linux-2.19.1/debian/source/format
@@ -0,0 +1 @@
+1.0
--- util-linux-2.19.1.orig/debian/po/pt_BR.po
+++ util-linux-2.19.1/debian/po/pt_BR.po
@@ -0,0 +1,69 @@
+# Debconf translations for util-linux.
+# Copyright (C) 2010 THE util-linux'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the util-linux package.
+# Adriano Rafael Gomes <adrianorg@gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-7\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2011-01-18 21:58-0200\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+"Entradas de sistemas de arquivos com \"noauto\" e nÃºmero de passagem "
+"diferente de zero"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"O arquivo /etc/fstab contÃ©m pelo menos uma entrada que estÃ¡ marcada como "
+"\"noauto\" com um nÃºmero de passagem (\"pass number\") diferente de zero (o "
+"que significa que o sistema de arquivos nÃ£o deve ser montado automaticamente "
+"durante a inicializaÃ§Ã£o, mas no entanto deve ser verificado pelo fsck, o "
+"utilitÃ¡rio de verificaÃ§Ã£o de sistemas de arquivos)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"A partir deste lanÃ§amento, o fsck falharÃ¡ em sistemas de arquivos que "
+"possuam um nÃºmero de passagem (\"pass number\") diferente de zero e nÃ£o "
+"estejam disponÃ­veis (ex.: por estarem desligados) quando o fsck for "
+"executado. Isto farÃ¡ com que o sistema entre em modo de reparaÃ§Ã£o do sistema "
+"de arquivos durante a inicializaÃ§Ã£o."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Para evitar este problema, por favor ajuste as entradas no fstab para "
+"dispositivos removÃ­veis, seja ajustando o seu nÃºmero de passagem (\"pass "
+"number\") para zero, ou adicionando a opÃ§Ã£o \"nofail\". Para mais detalhes, "
+"por favor veja mount(8)."
--- util-linux-2.19.1.orig/debian/po/nl.po
+++ util-linux-2.19.1/debian/po/nl.po
@@ -0,0 +1,66 @@
+# Dutch translation of util-linux debconf templates.
+# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the util-linux package.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux_2.17.2-9.1\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2011-05-02 10:53+0200\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+"Bestandssysteemregel met noauto en een doorgangnummer (fs_passno) anders dan "
+"nul"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab bevat ten minste Ã©Ã©n regel gemarkeerd als \"noauto\" met een "
+"doorgangnummer anders dan nul (dit betekent dat het bestandssysteem bij het "
+"opstarten niet automatisch moet worden aangekoppeld, maar wel moet worden "
+"gecontroleerd door fsck, het hulpprogramma voor bestandssysteemcontrole)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Vanaf deze versie zal fsck mislukken bij bestandsssystemen met een "
+"doorgangnummer anders dan nul die niet beschikbaar zijn (bijvoorbeeld omdat "
+"ze niet verbonden zijn) op het moment dat fsck wordt uitgevoerd. Hierdoor "
+"zal het systeem bij het opstarten in de modus voor bestandssysteemreparatie "
+"terecht komen."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Om dit probleem te voorkomen dient u zulke fstab-regels voor verwijderbare "
+"apparaten aan te passen. Dit kan door hun doorgangnummer op nul te zetten "
+"of door de \"nofail\" optie toe te voegen. Lees mount(8) voor meer details."
--- util-linux-2.19.1.orig/debian/po/id.po
+++ util-linux-2.19.1/debian/po/id.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2011-01-28 07:18+0700\n"
+"Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
+"Language-Team: Bahasa Indonesia <debian-l10n-id@gurame.fisika.ui.ac.id>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "Ada isian sistem berkas dengan pilihan noauto tapi bernomor kode-periksa tidak nol."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "/etc/fstab contains at least one entry that is marked as \"noauto\" with a non-zero pass number (meaning that the file system should not be automatically mounted upon boot, yet should be checked by fsck, the file system check utility)."
+msgstr "/etc/fstab setidaknya berisi satu baris yang bertanda \"noauto\" dan bernomor kode-periksa tidak nol (yang berarti sistem berkas tidak akan dikaitkan secara otomatis saat proses boot, tetapi harus diperiksa dengan fsck, utilitas pemeriksa sistem berkas)"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "From this release onwards, fsck will fail for file systems that have a non-zero pass number and are not available (eg. because they are unplugged) at the time fsck runs. This will cause the system to enter file system repair mode during boot."
+msgstr "Mulai rilis ini, fsck akan berhenti memeriksa sistem berkas yang bernomor kode-periksa tidak nol tetapi tidak/belum dikaitkan saat fsck berlangsung. Hal ini akan menyebabkan sistem masuk ke modus perbaikan saat boot."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "To avoid this problem, please adjust such fstab entries for removable devices, by either setting their pass number to zero, or adding the \"nofail\" option. For more details, please see mount(8)."
+msgstr "Untuk menghindari masalah ini, mohon sesuaikan isian pada berkas fstab untuk piranti lepas-pasang dengan mengubah nomor kode-periksa menjadi nol, atau menambahkan pilihan \"nofail\". Untuk info lengkap, silakan lihat mount(8)."
+
--- util-linux-2.19.1.orig/debian/po/de.po
+++ util-linux-2.19.1/debian/po/de.po
@@ -0,0 +1,64 @@
+# German translation of util-linux debconf templates
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-5\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-30 23:11+0100\n"
+"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "DateisystemeintrÃ¤ge mit Â»noautoÂ« und Â»passÂ« ungleich Null"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab enthÃ¤lt mindestens einen Eintrag mit der Option Â»noautoÂ« und einem "
+"von 0 verschiedenen Wert im Feld <pass>. (Das Dateisystem soll also beim "
+"Hochfahren des Systems nicht automatisch eingebunden, aber dennoch vom "
+"PrÃ¼fprogramm fsck untersucht werden.)"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Beginnend mit dieser VerÃ¶ffentlichung (Release) wird fsck fehlschlagen, wenn "
+"es ein nicht verfÃ¼gbares Dateisystem (beispielsweise ein von der "
+"Stromversorgung abgetrenntes) untersuchen soll. Dieser Fehler versetzt das "
+"System beim Hochfahren in den Dateisystem-Reparaturmodus."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Um dieses Problem zu vermeiden, passen Sie bitte die fstab-EintrÃ¤ge fÃ¼r "
+"Wechselmedien an, indem sie entweder das Feld <pass> auf 0 setzen oder "
+"zusÃ¤tzlich die Option Â»nofailÂ« wÃ¤hlen. Weitere Informationen entnehmen Sie "
+"bitte mount(8)."
--- util-linux-2.19.1.orig/debian/po/sk.po
+++ util-linux-2.19.1/debian/po/sk.po
@@ -0,0 +1,67 @@
+# Slovak translations for util-linux package
+# SlovenskÃ© preklady pre balÃ­k util-linux.
+# Copyright (C) 2010 THE util-linux's COPYRIGHT HOLDER
+# This file is distributed under the same license as the util-linux package.
+# Automatically generated, 2010.
+# Slavko <linux@slavino.sk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-29 20:17+0100\n"
+"Last-Translator: Slavko <linux@slavino.sk>\n"
+"Language-Team: Slovak <nomail>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+"PoloÅ¾ky sÃºborovÃ©ho systÃ©mu s voÄ¾bou noauto a nenulovÃ½m poradÃ­m kontroly"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab obsahuje aspoÅˆ jednu poloÅ¾ku, ktorÃ¡ je oznaÄ�enÃ© ako â€žnoautoâ€� a mÃ¡ "
+"nenulovÃ© poradie kontroly (tzn. Å¾e sÃºborovÃ½ systÃ©m nemÃ¡ byÅ¥ automaticky "
+"pripojenÃ½ pri Å¡tarte systÃ©mu, ale mÃ¡ byÅ¥ kontrolovanÃ½ pomocou fsck, "
+"nÃ¡strojom na kontrolu sÃºborovÃ©ho systÃ©mu)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Od tejto verzie Ä�alej, fsck zlyhÃ¡ pri sÃºborovÃ½ch systÃ©moch, ktorÃ© majÃº "
+"nenulovÃ© poradie kontroly a nie sÃº dostupnÃ© (napr. pretoÅ¾e nie sÃº pripojenÃ©) "
+"v okamÅ¾iku spustenia fsck. Toto bude maÅ¥ za nÃ¡sledok vstup do reÅ¾imu opravy "
+"sÃºborovÃ©ho systÃ©mu poÄ�as Å¡tartu poÄ�Ã­taÄ�a."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Aby ste prediÅ¡li tomuto problÃ©mu, prosÃ­m upravte poloÅ¾ky vymeniteÄ¾nÃ½ch "
+"zariadenÃ­ vo svojom fstab tak, aby mali buÄ� nulovÃ© poradie kontroly alebo "
+"mali nastavenÃº voÄ¾bu â€žnofailâ€�. ÄŽalÅ¡ie podrobnosti hÄ¾adajte v mount(8)."
--- util-linux-2.19.1.orig/debian/po/sv.po
+++ util-linux-2.19.1/debian/po/sv.po
@@ -0,0 +1,66 @@
+# translation of util-linux_sv.po to Swedish
+# Copyright (C) 2010
+# This file is distributed under the same license as the util-linux package.
+#
+# Martin Ã…gren <martin.agren@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux_sv\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-31 11:37+0100\n"
+"Last-Translator: Martin Ã…gren <martin.agren@gmail.com>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "Filsystemposter med noauto och genomgÃ¥ngstal skilt frÃ¥n noll"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab innehÃ¥ller Ã¥tminstone en post som Ã¤r markerad som \"noauto\" med "
+"ett genomgÃ¥ngstal (eng. pass number) "
+"skilt frÃ¥n noll (detta innebÃ¤r att filsystemet inte monteras "
+"automatiskt vid systemstart, men att det ska kontrolleras av fsck, "
+"vertyget fÃ¶r filsystemkontroll)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"FrÃ¥n och med denna utgÃ¥va kommer fsck returnera en felstatus fÃ¶r filsystem som har "
+"ett genomgÃ¥ngstal skilt frÃ¥n noll och som inte Ã¤r tillgÃ¤ngliga (exempelvis fÃ¶r "
+"att de inte kopplats in) dÃ¥ fsck kÃ¶rs. Detta kommer leda till att systemet pÃ¥bÃ¶rjar "
+"reparation av filsystem vid uppstart."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Detta problem undviks genom att justera sÃ¥dana fstab-poster fÃ¶r borttagbara "
+"enheter, antingen genom att sÃ¤tta deras genomgÃ¥ngstal till noll, eller genom att "
+"lÃ¤gga till flaggan \"nofail\". Se mount(8) fÃ¶r fler detaljer."
+
--- util-linux-2.19.1.orig/debian/po/cs.po
+++ util-linux-2.19.1/debian/po/cs.po
@@ -0,0 +1,62 @@
+# Czech PO debconf template translation of util-linux.
+# Copyright (C) 2010 Michal Simunek <michal.simunek@gmail.com>
+# This file is distributed under the same license as the util-linux package.
+# Michal Simunek <michal.simunek@gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-5\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-31 14:01+0100\n"
+"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "SouborovÃ© systÃ©my s noauto a s nenulovou hodnotou pass number"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab obsahuje minimÃ¡lnÄ› jednu poloÅ¾ku, kterÃ¡ je oznaÄ�ena jako \"noauto\" "
+"s nenulovou hodnotou pass number (coÅ¾ znamenÃ¡, Å¾e se takovÃ½ souborovÃ½ systÃ©m "
+"nemÃ¡ po zavedenÃ­ systÃ©mu automaticky pÅ™ipojovat, pÅ™esto mÃ¡ bÃ½t zkontrolovÃ¡n "
+"nÃ¡strojem pro kontrolu souborovÃ©ho systÃ©mu fsck)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Od tohoto a v dalÅ¡Ã­ch vydÃ¡nÃ­ch nebude moÅ¾nÃ©, aby pÅ™i spuÅ¡tÄ›nÃ­ fsck byly "
+"kontrolovÃ¡ny souborovÃ© systÃ©my, kterÃ© majÃ­ nenulovou hodnotu pass number "
+"a nejsou dostupnÃ© (napÅ™. proto, Å¾e jsou nepÅ™ipojenÃ©). To zpÅ¯sobÃ­, Å¾e pÅ™i "
+"zavÃ¡dÄ›nÃ­ pÅ™ejde systÃ©m do reÅ¾imu opravy souborovÃ©ho systÃ©mu."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Chcete-li se tomuto problÃ©mu vyhnout, upravte ve fstab tyto poloÅ¾ky pro "
+"vÃ½mÄ›nnÃ¡ zaÅ™Ã­zenÃ­ buÄ� nastavenÃ­m jejÃ­ch pass number na nulu, nebo pÅ™idÃ¡nÃ­m "
+"volby \"nofail\". Pro vÃ­ce informacÃ­ se podÃ­vejte na mount(8)."
--- util-linux-2.19.1.orig/debian/po/POTFILES.in
+++ util-linux-2.19.1/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] util-linux.templates
--- util-linux-2.19.1.orig/debian/po/nb.po
+++ util-linux-2.19.1/debian/po/nb.po
@@ -0,0 +1,65 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# BjÃ¸rn Steensrud <bjornst@skogkatt.homelinux.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-29 23:22+0100\n"
+"Last-Translator: BjÃ¸rn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian BokmÃ¥l <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "FilsystenoppfÃ¸ringer med noauto og gjennomlÃ¸psnummer som ikke er null"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab inneholder minst Ã©n oppfÃ¸ring som er merket Â«noautoÂ» med "
+"et gjennomlÃ¸psnummer som ikke er null (det betyr at filsystemet ikke "
+"skal monteres automatisk ved oppstart, men likevel kontrolleres med "
+"fsck, verktÃ¸yet for filsystemsjekk)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Fra og med denne utgivelsen vil fsck ikke virke for filsystemer som har "
+"et positivt gjennomlÃ¸pstall og ikke er tilgjengelige (f.eks. ikke koblet "
+"til) "
+"nÃ¥r fsck kjÃ¸rer. Dette vil gjÃ¸re at ved oppstarten vil  systemet starte "
+"reparasjon av filsystemer."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"For Ã¥ unngÃ¥ dette bÃ¸r du justere slike fstab-oppfÃ¸ringer for flyttbare "
+"enheter, enten ved Ã¥ sette gjennomlÃ¸pstallet til null eller ved Ã¥ legge til "
+"Â«nofailÂ»-valget. Se mount(8) for mer detaljer"
+
--- util-linux-2.19.1.orig/debian/po/fi.po
+++ util-linux-2.19.1/debian/po/fi.po
@@ -0,0 +1,64 @@
+# Translation of the util-linux debconf strings to Finnish
+# Copyright (C) 2010
+# This file is distributed under the same license as the util-linux package.
+# Esko ArajÃ¤rvi <edu@iki.fi>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2011-02-26 20:08+0300\n"
+"Last-Translator: Esko ArajÃ¤rvi <edu@iki.fi>\n"
+"Language-Team: debian-10n-finnish@lists.debian.org\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "TiedostojÃ¤rjestelmÃ¤rivillÃ¤ noauto ja nollasta poikkeava jÃ¤rjestysnumero"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab sisÃ¤ltÃ¤Ã¤ ainakin yhden rivin, jolla on merkintÃ¤ â€�noautoâ€� ja "
+"nollasta poikkeava jÃ¤rjestysnumero (mikÃ¤ tarkoittaa, ettei "
+"tiedostojÃ¤rjestelmÃ¤Ã¤ liitetÃ¤ automaattisesti jÃ¤rjestelmÃ¤n kÃ¤ynnistyessÃ¤, "
+"mutta levyjen tarkistusohjelma fsck:n pitÃ¤isi kuitenkin tarkistaa se)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"TÃ¤stÃ¤ julkaisusta alkaen fsck palauttaa virheen, jos tiedostojÃ¤rjestelmÃ¤n "
+"jÃ¤rjestysnumero poikkeaa nollasta, eikÃ¤ levy ole kÃ¤ytettÃ¤vissÃ¤ (esim. koska "
+"sitÃ¤ ei ole liitetty), kun fsck ajetaan. TÃ¤mÃ¤n seurauksena jÃ¤rjestelmÃ¤ "
+"kÃ¤ynnistyy korjaustilaan."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"VÃ¤lttÃ¤Ã¤ksesi tÃ¤mÃ¤n ongelman, muokkaa irroitettavien laitteiden fstab-rivejÃ¤ "
+"joko muuttamalla jÃ¤rjestysnumero nollaksi tai lisÃ¤Ã¤mÃ¤llÃ¤ valitsin â€�nofailâ€�. "
+"LisÃ¤tietoja lÃ¶ytyy ohjesivulta mount(8)."
--- util-linux-2.19.1.orig/debian/po/pt.po
+++ util-linux-2.19.1/debian/po/pt.po
@@ -0,0 +1,72 @@
+# Translation of util-linux debconf messages to Portuguese
+# Copyright (C) 2010 the util-linux's copyright holder
+# This file is distributed under the same license as the util-linux package.
+#
+# AmÃ©rico Monteiro <a_monteiro@netcabo.pt>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-5\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-29 00:38+0000\n"
+"Last-Translator: AmÃ©rico Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+"Entradas de sistemas de ficheiros com noauto e nÃºmero de passagem nÃ£o-zero"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab contÃ©m pelo menos uma entrada que estÃ¡ marcada como \"noauto\" "
+"com um nÃºmero de passagem diferente de zero (o que significa que o sistema "
+"de ficheiros nÃ£o deve ser montado automaticamente durante o arranque, mas "
+"no "
+"entanto deve ser verificado pelo fsck, o utilitÃ¡rio de verificaÃ§Ã£o de "
+"sistemas de ficheiros)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"A partir deste lanÃ§amento e em diante, o fsck irÃ¡ falhar em sistemas de "
+"ficheiros que tÃªm um nÃºmero de passagem diferente de zero e nÃ£o estÃ£o "
+"disponÃ­veis (ex. porque estÃ£o desligados) na altura que o fsck correr. Isto "
+"irÃ¡ causar que o sistema entre em modo de reparaÃ§Ã£o do sistema de ficheiros "
+"durante o arranque."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Para evitar este problema, por favor ajuste as entradas no fstab para "
+"dispositivos amovÃ­veis, seja ao ajustar o seu nÃºmero de passagem para "
+"zero, ou ao adicionar a opÃ§Ã£o \"nofail\". Para mais detalhes, por favor "
+"veja "
+"mount(8)."
+
+
--- util-linux-2.19.1.orig/debian/po/ja.po
+++ util-linux-2.19.1/debian/po/ja.po
@@ -0,0 +1,62 @@
+# Copyright (C) 2010,2011 LaMont Jones <lamont@debian.org>
+# This file is distributed under the same license as util-linux package.
+# Hideki Yamane <henrich@debian.org>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-9.1\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2011-04-30 17:26+0900\n"
+"Last-Translator: Hideki Yamane <henrich@debian.org>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "noauto ã�¨ 0 ä»¥å¤–ã�® pass number ã�Œè¨­å®šã�•ã‚Œã�¦ã�„ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ³ãƒˆãƒª"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab ã�¯ã€�ã€Œnoautoã€�ã�¨è¨˜è¼‰ã�•ã‚Œã�¦ã�„ã‚‹ã�®ã�«åŠ ã�ˆã€�0 ä»¥å¤–ã�® pass number ã�Œè¨˜è¿°"
+"ã�•ã‚Œã�¦ã�„ã‚‹ (ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã�Œèµ·å‹•æ™‚ã�«è‡ªå‹•çš„ã�«ã�¯ãƒžã‚¦ãƒ³ãƒˆã�•ã‚Œã‚‹ã�¹ã��ã�§ã�¯ã�ªã�„ã�Œã€�"
+"ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ãƒ�ã‚§ãƒƒã‚¯ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£ã�® fsck ã�§ãƒ�ã‚§ãƒƒã‚¯ã�•ã‚Œã‚‹ã�¹ã��) ã‚¨ãƒ³ãƒˆãƒª"
+"ã‚’å°‘ã�ªã��ã�¨ã‚‚ 1 ã�¤å�«ã‚“ã�§ã�„ã�¾ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"ä»Šå›žã�®ãƒªãƒªãƒ¼ã‚¹ä»¥é™�ã€�0 ä»¥å¤–ã�® pass number ã‚’æŒ�ã�¤ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã�¨ã€�fsck ã�Œ"
+"å‹•ä½œã�™ã‚‹ã�¨ã��ã�«åˆ©ç”¨ä¸�å�¯èƒ½ (ä¾‹: æŽ¥ç¶šã�•ã‚Œã�¦ã�„ã�ªã�„) ã�ªå ´å�ˆã�« fsck ã�¯å¤±æ•—ã�—ã�¾ã�™ã€‚"
+"ã�“ã�®ã�Ÿã‚�ã€�ã‚·ã‚¹ãƒ†ãƒ ã�¯èµ·å‹•ä¸­ã�«ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã�®ä¿®å¾©ãƒ¢ãƒ¼ãƒ‰ã�«ã�ªã‚Šã�¾ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"ã�“ã�®å•�é¡Œã‚’é�¿ã�‘ã‚‹ã�«ã�¯ã€�pass number ã‚’ 0 ã�«è¨­å®šã�™ã‚‹ã�‹ã€�ã€Œnofailã€�ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’"
+"è¿½åŠ ã�™ã‚‹ã�‹ã�—ã�¦ã€�ãƒªãƒ ãƒ¼ãƒ�ãƒ–ãƒ«ãƒ‡ãƒ�ã‚¤ã‚¹ã�®ã��ã�®ã‚ˆã�†ã�ª fstab ã‚¨ãƒ³ãƒˆãƒªã‚’èª¿æ•´ã�—ã�¦"
+"ã��ã� ã�•ã�„ã€‚è©³ç´°ã�«ã�¤ã�„ã�¦ã�¯ã€�mount(8) ã‚’å�‚ç…§ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
--- util-linux-2.19.1.orig/debian/po/ca.po
+++ util-linux-2.19.1/debian/po/ca.po
@@ -0,0 +1,43 @@
+# util-linux po-debconf translation to Catalan
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the PACKAGE package.
+# Innocent De Marchi <tangram.peces@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-9.1\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2011-05-08 19:15+0100\n"
+"Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n"
+"Language-Team: Catalan <<debian-l10n-catalan@lists.debian.org>>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Catalan\n"
+"X-Poedit-Country: SPAIN\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "Entrades del sistema de fitxers amb Â«noautoÂ» i valor de Â«passnoÂ» distint de zero"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "/etc/fstab contains at least one entry that is marked as \"noauto\" with a non-zero pass number (meaning that the file system should not be automatically mounted upon boot, yet should be checked by fsck, the file system check utility)."
+msgstr "El fitxer Â«/etc/fstabÂ» contÃ© almenys una entrada marcada com a Â«noautoÂ» (muntatge no automÃ tic) y un Â«passnoÂ» (nÃºmero de d'entrada) distint de zero (amb aquesta configuraciÃ³, el sistema de fitxers no es muntarÃ  automÃ ticament a l'arrancada perÃ² serÃ  comprovat amb Â«fsckÂ», la utilitat de verificaciÃ³ del sistema de fitxers)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "From this release onwards, fsck will fail for file systems that have a non-zero pass number and are not available (eg. because they are unplugged) at the time fsck runs. This will cause the system to enter file system repair mode during boot."
+msgstr "A partir d'aquesta versiÃ³, Â«fsckÂ» no funcionarÃ  en els sistemes de fitxers als quals s'ha assignat un Â«passnoÂ» distint de zero i que no estan disponibles (p. ex. degut a quÃ¨ no s'ha connectat) en executar-se Â«fsckÂ». AixÃ² farÃ  que el sistema es posi en el mode de reparaciÃ³ del sistema de fitxers en arrancar."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "To avoid this problem, please adjust such fstab entries for removable devices, by either setting their pass number to zero, or adding the \"nofail\" option. For more details, please see mount(8)."
+msgstr "Per tal d'evitar aquest problema, cal ajustar les entrades del fitxer Â«fstabÂ» per als dispositius extraÃ¯bles, be posant un valor Â«passnoÂ» igual a zero o bÃ© afagint l'opciÃ³ Â«nofailÂ». Consulti Â«mount(8)Â» per obtenir informaciÃ³ mÃ©s detallada."
+
--- util-linux-2.19.1.orig/debian/po/templates.pot
+++ util-linux-2.19.1/debian/po/templates.pot
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
--- util-linux-2.19.1.orig/debian/po/es.po
+++ util-linux-2.19.1/debian/po/es.po
@@ -0,0 +1,65 @@
+# util-linux po-debconf translation to Spanish
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the util-linux package.
+#
+# Changes:
+# - Initial translation
+# CamaleÃ³n <noelamac@gmail.com>, 2010
+#
+# - Updates
+#
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentaciÃ³n de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducciÃ³n al espaÃ±ol, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducciÃ³n de Debian al espaÃ±ol
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducciÃ³n en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guÃ­a de traducciÃ³n de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-5\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-30 10:32+0100\n"
+"Last-Translator: CamaleÃ³n <noelamac@gmail.com>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "Entradas del sistema de archivos con Â«noautoÂ» y un valor Â«passnoÂ» distinto de cero"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "/etc/fstab contains at least one entry that is marked as \"noauto\" with a non-zero pass number (meaning that the file system should not be automatically mounted upon boot, yet should be checked by fsck, the file system check utility)."
+msgstr "El archivo Â«/etc/fstabÂ» contiene al menos una entrada marcada con Â«noautoÂ» y un valor Â«passnoÂ» distinto de cero (lo que significa que ese sistema de archivos no se debe montar automÃ¡ticamente tras el arranque pero aÃºn asÃ­ se debe comprobar con fsck, la utilidad para la verificaciÃ³n del sistema de archivos)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "From this release onwards, fsck will fail for file systems that have a non-zero pass number and are not available (eg. because they are unplugged) at the time fsck runs. This will cause the system to enter file system repair mode during boot."
+msgstr "A partir de esta versiÃ³n, fsck no funcionarÃ¡ en los sistemas de archivos a los que se le haya pasado un valor Â«passnoÂ» distinto de cero y que no se encuentren disponibles (p. ej., si no estÃ¡n conectados) cuando se ejecute fsck. Esto harÃ¡ que el sistema entre en el modo de reparaciÃ³n del sistema de archivos durante el arranque."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "To avoid this problem, please adjust such fstab entries for removable devices, by either setting their pass number to zero, or adding the \"nofail\" option. For more details, please see mount(8)."
+msgstr "Para evitar este problema, ajuste las entradas del archivo fstab para los dispositivos extraÃ­bles, bien definiendo un valor Â«passnoÂ» igual a cero o aÃ±adiendo la opciÃ³n Â«nofailÂ». Consulte Â«mount(8)Â» para obtener mÃ¡s detalles."
+
--- util-linux-2.19.1.orig/debian/po/it.po
+++ util-linux-2.19.1/debian/po/it.po
@@ -0,0 +1,63 @@
+# ITALIAN TRANSLATION OF UTIL-LINUX'S PO-DEBCONF FILE.
+# COPYRIGHT (C) 2010 THE UTIL-LINUX'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the util-linux package.
+# Vincenzo Campanella <vinz65@gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-5\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-29 19:52+0100\n"
+"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "Voci del file system con Â«noautoÂ» e numero di passaggio non zero"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"Â«/etc/fstabÂ» contiene almeno una voce marcata come Â«noautoÂ» con un numero "
+"di passaggio non zero (ciÃ² che significa che il file system non dovrebbe "
+"essere montato automaticamente all'avvio, ma dovrebbe essere controllato "
+"da fsck, l'utilitÃ  di controllo del file system)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"A partire da questo rilascio l'esecuzione di fsck non Ã¨ possibile su sistemi "
+"che hanno un numero di passaggio non zero e che non sono disponibili (per "
+"esempio poichÃ© non sono collegati). CiÃ² causerÃ  l'avvio del sistema in "
+"modalitÃ  di riparazione del file system."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Onde evitare questo problema Ã¨ necessario modificare le voci in fstab per i "
+"dispositivi rimovibili, o impostando il loro numero di passaggio a zero, o "
+"aggiungendo l'opzione Â«nofailÂ». Per maggiori dettagli consultare mount(8)."
+
--- util-linux-2.19.1.orig/debian/po/da.po
+++ util-linux-2.19.1/debian/po/da.po
@@ -0,0 +1,63 @@
+# Danish translation util-linux.
+# Copyright (C) 2010 util-linux & nedenstÃ¥ende oversÃ¦ttere.
+# This file is distributed under the same license as the util-linux package.
+# Joe Hansen (joedalton2@yahoo.dk), 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-30 12:42+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr "Filsystempunkter med noauto og non-zero pass number"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"/etc/fstab indeholder mindst et punkt, som er markeret som Â»noautoÂ« med et "
+"non-zero pass number (hvilket betyder at filsystemet ikke bÃ¸r monteres "
+"automatisk ved opstart, men dog stadig skal tjekkes af fsck, vÃ¦rktÃ¸jet til "
+"filsystemtjekning)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Fra og med denne udgave, vil fsck fejle for filsystemer, som har et non-zero "
+"pass number og som ikke er tilgÃ¦ngelige (det vil sige de er afkoblet) pÃ¥ det "
+"tidspunkt, som fsck kÃ¸rer pÃ¥. Dette vil fÃ¥ systemet til at gÃ¥ i "
+"reparationstilstanden for filsystemet under opstart."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Tilpas sÃ¥danne fstab-punkter for eksterne enheder for at undgÃ¥ dette "
+"problem, enten ved at angive deres pass number til zero, eller tilfÃ¸je "
+"tilvalget Â»nofailÂ«. For yderligere detaljer se mount(8)."
--- util-linux-2.19.1.orig/debian/po/fr.po
+++ util-linux-2.19.1/debian/po/fr.po
@@ -0,0 +1,66 @@
+# Translation of util-linux debconf template to French.
+# Copyright (C) 2010 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the util-linux package.
+# Translators:
+# Christian Perrier <bubulle@debian.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-29 19:41+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+"SystÃ¨mes de fichiers avec option Â«Â noautoÂ Â» et nombre de passes non nul"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"Le fichier /etc/fstab comporte au moins une entrÃ©e marquÃ©e Â«Â noautoÂ Â» avec "
+"un nombre de passes non nul (ce qui indique que le systÃ¨me de fichier "
+"correspondant n'est pas montÃ© au dÃ©marrage mais doit cependant Ãªtre contrÃ´lÃ© "
+"par Â«Â fsckÂ Â»)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Ã€ partir de cette version de util-linux, la commande fsck Ã©chouera pour les "
+"systÃ¨mes de fichiers qui ont un nombre de passes non nul mais qui sont "
+"indisponibles (car non montÃ©s) au moment de l'exÃ©cution de la commande. Cela "
+"provoquera alors la bascule en mode de rÃ©paration, au dÃ©marrage."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Pour Ã©viter ce problÃ¨me, vous devriez modifier les entrÃ©es correspondantes "
+"dans le fichier fstab, soit en y indiquant un nombre de passes  nul, soit en "
+"ajoutant l'option Â«Â nofailÂ Â». Pour plus d'informations, veuillez consulter "
+"la page de manuel de mount(8)."
--- util-linux-2.19.1.orig/debian/po/ru.po
+++ util-linux-2.19.1/debian/po/ru.po
@@ -0,0 +1,67 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the util-linux package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.17.2-5\n"
+"Report-Msgid-Bugs-To: util-linux@packages.debian.org\n"
+"POT-Creation-Date: 2010-12-24 12:50-0700\n"
+"PO-Revision-Date: 2010-12-29 22:05+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid "Filesystem entries with noauto and non-zero pass number"
+msgstr ""
+"Ð¤Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ðµ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ‹, Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½Ð½Ñ‹Ðµ ÐºÐ°Ðº noauto Ð¸ Ñ� Ð½ÐµÐ½ÑƒÐ»ÐµÐ²Ñ‹Ð¼ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑ�Ñ‚Ð²Ð¾Ð¼ Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¾Ð²"
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"/etc/fstab contains at least one entry that is marked as \"noauto\" with a "
+"non-zero pass number (meaning that the file system should not be "
+"automatically mounted upon boot, yet should be checked by fsck, the file "
+"system check utility)."
+msgstr ""
+"Ð’ Ñ„Ð°Ð¹Ð»Ðµ /etc/fstab Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚Ñ�Ñ�, ÐºÐ°Ðº Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼, Ð¾Ð´Ð½Ð° Ñ�Ñ‚Ñ€Ð¾ÐºÐ°, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ ÑƒÐºÐ°Ð·Ð°Ð½ "
+"Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ \"noauto\" Ð¸ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð½ÐµÐ½ÑƒÐ»ÐµÐ²Ð¾Ðµ Ñ‡Ð¸Ñ�Ð»Ð¾ Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¾Ð² (Ð¾Ð·Ð½Ð°Ñ‡Ð°ÑŽÑ‰ÐµÐµ, Ñ‡Ñ‚Ð¾ "
+"Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ� Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð° Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑ�ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒÑ�Ñ� Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÐžÐ¡, "
+"Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‡Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ð¾Ð¹ fsck, ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ð¾Ð¹ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼)."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"From this release onwards, fsck will fail for file systems that have a non-"
+"zero pass number and are not available (eg. because they are unplugged) at "
+"the time fsck runs. This will cause the system to enter file system repair "
+"mode during boot."
+msgstr ""
+"Ð�Ð°Ñ‡Ð¸Ð½Ð°Ñ� Ñ� Ñ�Ñ‚Ð¾Ð³Ð¾ Ð²Ñ‹Ð¿ÑƒÑ�ÐºÐ° fsck Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ñ‚ÑŒÑ�Ñ� Ñ� Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ñ‹Ñ… "
+"Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð°Ñ…, Ñƒ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ Ð½ÐµÐ½ÑƒÐ»ÐµÐ²Ð¾Ðµ Ñ‡Ð¸Ñ�Ð»Ð¾ Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¾Ð² Ð¸ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½ÐµÐ´Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ñ‹ "
+"(Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, ÐµÑ�Ð»Ð¸ ÑƒÑ�Ñ‚Ñ€Ð¾Ð¹Ñ�Ñ‚Ð²Ð¾ Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾) Ð² Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ð·Ð°Ð¿ÑƒÑ�ÐºÐ° fsck. Ð¢Ð°ÐºÐ°Ñ� "
+"Ñ�Ð¸Ñ‚ÑƒÐ°Ñ†Ð¸Ñ� Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¸Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ðº Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ Ð² Ñ€ÐµÐ¶Ð¸Ð¼ Ð²Ð¾Ñ�Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ� Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ "
+"Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ‹ Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÐžÐ¡."
+
+#. Type: note
+#. Description
+#: ../util-linux.templates:1001
+msgid ""
+"To avoid this problem, please adjust such fstab entries for removable "
+"devices, by either setting their pass number to zero, or adding the \"nofail"
+"\" option. For more details, please see mount(8)."
+msgstr ""
+"Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ Ñ�Ñ‚Ð¾Ð¹ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹, Ñ�ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ Ð¸Ð¼ÐµÑŽÑ‰Ð¸ÐµÑ�Ñ� Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸ Ð² fstab "
+"Ð´Ð»Ñ� Ñ�ÑŠÑ‘Ð¼Ð½Ñ‹Ñ… ÑƒÑ�Ñ‚Ñ€Ð¾Ð¹Ñ�Ñ‚Ð² Ð¸Ð»Ð¸ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ð² Ñ‡Ð¸Ñ�Ð»Ð¾ Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¾Ð² Ð² Ð½Ð¾Ð»ÑŒ, Ð¸Ð»Ð¸ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð² "
+"Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ \"nofail\". ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½ÐµÐ¹ Ð¾Ð± Ñ�Ñ‚Ð¾Ð¼ Ñ�Ð¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð² mount(8)."
+
--- util-linux-2.19.1.orig/config/config.sub
+++ util-linux-2.19.1/config/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,16 +32,13 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -152,7 +149,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -287,7 +284,6 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -295,14 +291,13 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
-	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -345,7 +340,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -373,7 +368,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -382,7 +377,6 @@
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
-	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -732,9 +726,6 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
-		basic_machine=microblaze-xilinx
-		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1256,9 +1247,6 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
-		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1280,8 +1268,8 @@
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1302,7 +1290,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
--- util-linux-2.19.1.orig/config/config.guess
+++ util-linux-2.19.1/config/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -333,9 +333,6 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -810,12 +807,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:*)
+    *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    authenticamd | genuineintel | EM64T)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -857,20 +854,6 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -893,17 +876,6 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -929,18 +901,39 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -949,11 +942,8 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -976,6 +966,58 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1205,16 +1247,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--- util-linux-2.19.1.orig/config/ltmain.sh
+++ util-linux-2.19.1/config/ltmain.sh
@@ -1,10 +1,9 @@
 # Generated from ltmain.m4sh.
 
-# libtool (GNU libtool) 2.2.10
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -33,54 +32,50 @@
 #
 # Provide generalized library-building support services.
 #
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
 #
 # MODE must be one of the following:
 #
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# MODE-ARGS vary depending on the MODE.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.2.10
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
+#       host-triplet:	$host
+#       shell:		$SHELL
+#       compiler:		$LTCC
+#       compiler flags:		$LTCFLAGS
+#       linker:		$LD (gnu? $with_gnu_ld)
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       automake:		$automake_version
+#       autoconf:		$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
 
-PROGRAM=libtool
+PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=2.2.10
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
 TIMESTAMP=""
-package_revision=1.3175
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -96,15 +91,10 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
 # NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -117,24 +107,15 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
 
 
 
 : ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="echo"}
 : ${EGREP="/bin/grep -E"}
 : ${FGREP="/bin/grep -F"}
 : ${GREP="/bin/grep"}
@@ -178,168 +159,32 @@
 func_dirname_and_basename ()
 {
   # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
   if test "X$func_dirname_result" = "X${1}"; then
     func_dirname_result="${3}"
   else
     func_dirname_result="$func_dirname_result${2}"
   fi
-  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 }
 
 # Generated shell functions inserted here.
 
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 # The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
 func_dirname_and_basename "$progpath"
 progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
 
 # Make sure we have an absolute path for reexecution:
 case $progpath in
@@ -413,13 +258,6 @@
     :
 }
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
 # func_error arg...
 # Echo program name prefixed message to standard error.
 func_error ()
@@ -488,9 +326,9 @@
         case $my_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
       done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
 
       save_mkdir_p_IFS="$IFS"; IFS=':'
       for my_dir in $my_dir_list; do
@@ -540,7 +378,7 @@
         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $ECHO "$my_tmpdir"
+    $ECHO "X$my_tmpdir" | $Xsed
 }
 
 
@@ -554,7 +392,7 @@
 {
     case $1 in
       *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
       *)
         func_quote_for_eval_unquoted_result="$1" ;;
     esac
@@ -581,7 +419,7 @@
 {
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
+	my_arg=`$ECHO "X$1" | $Xsed \
 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
         my_arg="$1" ;;
@@ -651,19 +489,14 @@
 }
 
 
+
+
+
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
         s/^# //
 	s/^# *$//
         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -676,20 +509,19 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+    $SED -n '/^# Usage:/,/# -h/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
 	p
     }' < "$progpath"
-    echo
+    $ECHO
     $ECHO "run \`$progname --help | more' for full usage"
     exit $?
 }
 
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+# func_help
+# Echo long help message to standard output and exit.
 func_help ()
 {
     $SED -n '/^# Usage:/,/# Report bugs to/ {
@@ -706,10 +538,7 @@
 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 	p
      }' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
+    exit $?
 }
 
 # func_missing_arg argname
@@ -717,7 +546,7 @@
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1."
+    func_error "missing argument for $1"
     exit_cmd=exit
 }
 
@@ -727,6 +556,29 @@
 
 
 
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
 
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
@@ -784,16 +636,16 @@
 # Display the features supported by this script.
 func_features ()
 {
-    echo "host: $host"
+    $ECHO "host: $host"
     if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
+      $ECHO "enable shared libraries"
     else
-      echo "disable shared libraries"
+      $ECHO "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
+      $ECHO "enable static libraries"
     else
-      echo "disable static libraries"
+      $ECHO "disable static libraries"
     fi
 
     exit $?
@@ -920,21 +772,10 @@
 
       --quiet|--silent)	preserve_args="$preserve_args $opt"
 			opt_silent=:
-			opt_verbose=false
-			;;
-
-      --no-quiet|--no-silent)
-			preserve_args="$preserve_args $opt"
-			opt_silent=false
 			;;
 
       --verbose| -v)	preserve_args="$preserve_args $opt"
 			opt_silent=false
-			opt_verbose=:
-			;;
-
-      --no-verbose)	preserve_args="$preserve_args $opt"
-			opt_verbose=false
 			;;
 
       --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
@@ -952,7 +793,6 @@
 
       -\?|-h)		func_usage					;;
       --help)		opt_help=:					;;
-      --help-all)	opt_help=': help-all'				;;
       --version)	func_version					;;
 
       -*)		func_fatal_help "unrecognized option \`$opt'"	;;
@@ -1176,13 +1016,10 @@
         func_quote_for_eval "$arg"
 	CC_quoted="$CC_quoted $func_quote_for_eval_result"
       done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -1196,11 +1033,8 @@
 	      func_quote_for_eval "$arg"
 	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
 	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1379,7 +1213,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1454,7 +1288,7 @@
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
     else
       output_obj=
@@ -1611,7 +1445,7 @@
 }
 
 $opt_help || {
-  test "$mode" = compile && func_mode_compile ${1+"$@"}
+test "$mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
@@ -1648,11 +1482,10 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
   -shared           do not build a \`.o' file suitable for static linking
   -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 from the given SOURCEFILE.
@@ -1705,7 +1538,7 @@
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -1725,8 +1558,6 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1755,11 +1586,6 @@
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -1797,40 +1623,14 @@
         ;;
     esac
 
-    echo
+    $ECHO
     $ECHO "Try \`$progname --help' for more information about other modes."
+
+    exit $?
 }
 
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
 
 
 # func_mode_execute arg...
@@ -1912,7 +1712,7 @@
     for file
     do
       case $file in
-      -* | *.la | *.lo ) ;;
+      -*) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
@@ -1954,7 +1754,7 @@
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
+	$ECHO "export $shlibpath_var"
       fi
       $ECHO "$cmd$args"
       exit $EXIT_SUCCESS
@@ -1995,23 +1795,23 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
     for libdir in $libdirs; do
       $ECHO "   $libdir"
     done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
     if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
     fi
     if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
     fi
     if test -n "$hardcode_libdir_flag_spec"; then
       libdir=LIBDIR
@@ -2023,21 +1823,21 @@
       $ECHO "   - have your system administrator run these commands:$admincmds"
     fi
     if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
     fi
-    echo
+    $ECHO
 
-    echo "See any operating system documentation about shared libraries for"
+    $ECHO "See any operating system documentation about shared libraries for"
     case $host in
       solaris2.[6789]|solaris2.1[0-9])
-        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	echo "pages."
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	$ECHO "pages."
 	;;
       *)
-        echo "more information, such as the ld(1) and ld.so(8) manual pages."
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
         ;;
     esac
-    echo "----------------------------------------------------------------------"
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
 }
 
@@ -2052,7 +1852,7 @@
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -2067,11 +1867,6 @@
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
     install_prog="$install_prog$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -2081,10 +1876,8 @@
     install_type=
     isdir=no
     stripme=
-    no_mode=:
     for arg
     do
-      arg2=
       if test -n "$dest"; then
 	files="$files $dest"
 	dest=$arg
@@ -2094,9 +1887,10 @@
       case $arg in
       -d) isdir=yes ;;
       -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
+	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -2110,10 +1904,6 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -2125,10 +1915,6 @@
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
       install_prog="$install_prog $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -2137,13 +1923,6 @@
     test -n "$prev" && \
       func_fatal_help "the \`$prev' option requires an argument"
 
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
-      fi
-    fi
-
     if test -z "$files"; then
       if test -z "$dest"; then
 	func_fatal_help "no file or destination specified"
@@ -2231,7 +2010,7 @@
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2244,9 +2023,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  func_warning "relinking \`$file'"
@@ -2264,7 +2043,7 @@
 	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
 	  tstripme="$stripme"
 	  case $host_os in
@@ -2404,7 +2183,7 @@
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
 	    if test -n "$libdir" && test ! -f "$libfile"; then
 	      func_warning "\`$lib' has not been installed in \`$libdir'"
 	      finalize=no
@@ -2423,7 +2202,7 @@
 		file="$func_basename_result"
 	        outputname="$tmpdir/$file"
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_silent || {
 	          func_quote_for_expand "$relink_command"
@@ -2442,7 +2221,7 @@
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -2544,10 +2323,6 @@
 extern \"C\" {
 #endif
 
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
 /* External symbol declarations for the compiler. */\
 "
 
@@ -2557,7 +2332,7 @@
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
 	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
 	    func_verbose "extracting global C symbols from \`$progfile'"
 	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
@@ -2596,7 +2371,7 @@
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
+	        *cygwin | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2640,10 +2415,10 @@
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
-	  echo >> "$output_objdir/$my_dlsyms" "\
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
 typedef struct {
@@ -2653,7 +2428,7 @@
 "
 	  case $host in
 	  *cygwin* | *mingw* | *cegcc* )
-	    echo >> "$output_objdir/$my_dlsyms" "\
+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
 /* DATA imports from DLLs on WIN32 con't be const, because
    runtime relocations are performed -- see ld's documentation
    on pseudo-relocs.  */"
@@ -2666,7 +2441,7 @@
 	    lt_dlsym_const=const ;;
 	  esac
 
-	  echo >> "$output_objdir/$my_dlsyms" "\
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
 extern $lt_dlsym_const lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
 $lt_dlsym_const lt_dlsymlist
@@ -2682,7 +2457,7 @@
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -2740,16 +2515,16 @@
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
 	  fi
 	  ;;
 	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
@@ -2763,8 +2538,8 @@
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
     fi
 }
 
@@ -2774,7 +2549,6 @@
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
   $opt_debug
@@ -2785,9 +2559,8 @@
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 |
 	$SED -n -e '
 	    1,100{
@@ -2825,18 +2598,7 @@
     $opt_debug
     f_ex_an_ar_dir="$1"; shift
     f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -2907,7 +2669,7 @@
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -2922,30 +2684,25 @@
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
 }
 
 
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
+
+# func_emit_wrapper_part1 [arg=no]
 #
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+	func_emit_wrapper_part1_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part1_arg1=$1
+	fi
 
 	$ECHO "\
 #! $SHELL
@@ -2961,6 +2718,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # Be Bourne compatible
@@ -2991,132 +2749,31 @@
 else
   # When we are sourced in execute mode, \$file and \$ECHO are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
 "
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+	$ECHO "\
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -3126,13 +2783,30 @@
       esac
     fi
 
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -3140,7 +2814,7 @@
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -3203,7 +2877,7 @@
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
 
     export $shlibpath_var
 "
@@ -3220,18 +2894,64 @@
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
     fi
   else
     # The program doesn't exist.
     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
 fi\
 "
 }
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
 
 
 # func_to_host_path arg
@@ -3258,19 +2978,23 @@
 func_to_host_path ()
 {
   func_to_host_path_result="$1"
-  if test -n "$1"; then
+  if test -n "$1" ; then
     case $host in
       *mingw* )
         lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
         case $build in
           *mingw* ) # actually, msys
             # awkward: cmd appends spaces to result
-            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
-              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
             ;;
           *cygwin* )
-            func_to_host_path_result=`cygpath -w "$1" |
-	      $SED -e "$lt_sed_naive_backslashify"`
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
             ;;
           * )
             # Unfortunately, winepath does not exit with a non-zero
@@ -3282,17 +3006,17 @@
             # the odd construction:
             func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
             if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
                 $SED -e "$lt_sed_naive_backslashify"`
             else
               # Allow warning below.
-              func_to_host_path_result=
+              func_to_host_path_result=""
             fi
             ;;
         esac
         if test -z "$func_to_host_path_result" ; then
           func_error "Could not determine host path corresponding to"
-          func_error "  \`$1'"
+          func_error "  '$1'"
           func_error "Continuing, but uninstalled executables may not work."
           # Fallback:
           func_to_host_path_result="$1"
@@ -3325,24 +3049,30 @@
 func_to_host_pathlist ()
 {
   func_to_host_pathlist_result="$1"
-  if test -n "$1"; then
+  if test -n "$1" ; then
     case $host in
       *mingw* )
         lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
         # Remove leading and trailing path separator characters from
         # ARG. msys behavior is inconsistent here, cygpath turns them
         # into '.;' and ';.', and winepath ignores them completely.
-	func_stripname : : "$1"
-        func_to_host_pathlist_tmp1=$func_stripname_result
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
         case $build in
           *mingw* ) # Actually, msys.
             # Awkward: cmd appends spaces to result.
-            func_to_host_pathlist_result=`
-	      ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
-	      $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
             ;;
           *cygwin* )
-            func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
               $SED -e "$lt_sed_naive_backslashify"`
             ;;
           * )
@@ -3358,17 +3088,18 @@
                   if test -z "$func_to_host_pathlist_result" ; then
                     func_to_host_pathlist_result="$func_to_host_path_result"
                   else
-                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
                   fi
                 fi
               fi
+              IFS=:
             done
             IFS=$func_to_host_pathlist_oldIFS
             ;;
         esac
-        if test -z "$func_to_host_pathlist_result"; then
+        if test -z "$func_to_host_pathlist_result" ; then
           func_error "Could not determine the host path(s) corresponding to"
-          func_error "  \`$1'"
+          func_error "  '$1'"
           func_error "Continuing, but uninstalled executables may not work."
           # Fallback. This may break if $1 contains DOS-style drive
           # specifications. The fix is not to complicate the expression
@@ -3385,7 +3116,7 @@
             ;;
         esac
         case "$1" in
-          *: ) func_append func_to_host_pathlist_result ";"
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
             ;;
         esac
         ;;
@@ -3410,23 +3141,31 @@
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
 */
 EOF
 	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
 # include <io.h>
+# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3438,44 +3177,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -3491,7 +3192,14 @@
 # define S_IXGRP 0
 #endif
 
-/* path handling portability macros */
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
@@ -3522,6 +3230,10 @@
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -3534,13 +3246,22 @@
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
 #else
-static int lt_debug = 0;
+# define LTWRAPPER_DEBUGPRINTF(args)
 #endif
 
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+const char *program_name = NULL;
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -3550,17 +3271,31 @@
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
+void lt_fatal (const char *message, ...);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
+
+static const char *script_text_part1 =
+EOF
+
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
 EOF
+	    func_emit_wrapper_part2 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
 
 	    cat <<EOF
 const char * MAGIC_EXE = "$magic_exe";
@@ -3605,10 +3340,24 @@
 	    cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
 
 int
 main (int argc, char *argv[])
@@ -3625,13 +3374,10 @@
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
 
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
+  /* very simple arg parsing; don't want to rely on getopt */
   for (i = 1; i < argc; i++)
     {
       if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3645,57 +3391,25 @@
 	      esac
 
 	    cat <<"EOF"
-	  lt_dump_script (stdout);
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
 	  return 0;
 	}
-      if (strcmp (argv[i], debug_opt) == 0)
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
     }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
+  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
 
   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -3713,9 +3427,8 @@
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
 EOF
 
 	    cat <<EOF
@@ -3768,12 +3481,77 @@
   lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
 
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
   for (i = 0; i < newargc; i++)
     {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
     }
 
 EOF
@@ -3782,14 +3560,11 @@
 	      mingw*)
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
       return 127;
     }
   return rval;
@@ -3811,7 +3586,7 @@
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+    lt_fatal ("Memory exhausted");
 
   return p;
 }
@@ -3845,8 +3620,8 @@
 {
   struct stat st;
 
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
   if ((!path) || (!*path))
     return 0;
 
@@ -3863,8 +3638,8 @@
   int rval = 0;
   struct stat st;
 
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
   if ((!path) || (!*path))
     return 0;
 
@@ -3890,8 +3665,8 @@
   int tmp_len;
   char *concat_name;
 
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
@@ -3944,8 +3719,7 @@
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
+		    lt_fatal ("getcwd failed");
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3970,8 +3744,7 @@
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
+    lt_fatal ("getcwd failed");
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -3997,9 +3770,8 @@
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -4021,9 +3793,8 @@
 	}
       else
 	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
 	}
     }
   XFREE (tmp_pathspec);
@@ -4036,8 +3807,7 @@
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -4063,25 +3833,11 @@
   return str;
 }
 
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
 static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
+lt_error_core (int exit_status, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  fprintf (stderr, "%s: %s: ", program_name, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -4090,32 +3846,20 @@
 }
 
 void
-lt_fatal (const char *file, int line, const char *message, ...)
+lt_fatal (const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
   va_end (ap);
 }
 
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
 void
 lt_setenv (const char *name, const char *value)
 {
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
@@ -4160,12 +3904,95 @@
   return new_value;
 }
 
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
 void
 lt_update_exe_path (const char *name, const char *value)
 {
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
 
   if (name && *name && value && *value)
     {
@@ -4184,9 +4011,9 @@
 void
 lt_update_lib_path (const char *name, const char *value)
 {
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
 
   if (name && *name && value && *value)
     {
@@ -4196,152 +4023,11 @@
     }
 }
 
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
 
-            cat <<"EOF"
-}
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -4386,7 +4072,6 @@
     new_inherited_linker_flags=
 
     avoid_version=no
-    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -4479,11 +4164,6 @@
 	esac
 
 	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
@@ -4745,11 +4425,6 @@
 	continue
 	;;
 
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
       -dlopen)
 	prev=dlfiles
 	continue
@@ -4828,7 +4503,7 @@
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
@@ -4847,7 +4522,7 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -5033,7 +4708,7 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $func_quote_for_eval_result"
+	  arg="$arg $wl$func_quote_for_eval_result"
 	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
@@ -5079,19 +4754,18 @@
 	arg="$func_quote_for_eval_result"
 	;;
 
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
         func_quote_for_eval "$arg"
 	arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"
@@ -5251,7 +4925,7 @@
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
@@ -5359,7 +5033,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5374,8 +5051,7 @@
 	  # Collect preopened libtool deplibs, except any this library
 	  # has declared as weak libs
 	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
 	    *) deplibs="$deplibs $deplib" ;;
@@ -5554,7 +5230,7 @@
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
 		    valid_a_lib=yes
 		  fi
@@ -5564,15 +5240,15 @@
 		;;
 	      esac
 	      if test "$valid_a_lib" != yes; then
-		echo
+		$ECHO
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+		$ECHO "*** that it is just a static archive that I should not use here."
 	      else
-		echo
+		$ECHO
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
@@ -5645,7 +5321,7 @@
 
 	# Convert "-framework foo" to "foo.ltframework"
 	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
@@ -5653,7 +5329,7 @@
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -5671,19 +5347,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -5907,7 +5583,7 @@
 	    fi
 	  done
 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
+	    $ECHO
 	    if test "$linkmode" = prog; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
@@ -6010,9 +5686,9 @@
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
 			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
+			  $ECHO
+			  $ECHO "*** And there doesn't seem to be a static archive available"
+			  $ECHO "*** The link will probably fail, sorry"
 			else
 			  add="$dir/$old_library"
 			fi
@@ -6152,21 +5828,21 @@
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    echo
+	    $ECHO
 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
+	    $ECHO "*** I have the capability to make that library automatically link in when"
+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+	    $ECHO "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      $ECHO "*** But as you try to build a module library, libtool will still create "
+	      $ECHO "*** a static module, that should work as long as the dlopening application"
+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		$ECHO
+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$ECHO "*** not find such a program.  So, this module is probably useless."
+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
 		build_libtool_libs=module
@@ -6286,7 +5962,7 @@
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"
@@ -6454,7 +6130,7 @@
 	if test "$deplibs_check_method" != pass_all; then
 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  echo
+	  $ECHO
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
 	  libobjs="$libobjs $objs"
@@ -6522,7 +6198,7 @@
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
+	  freebsd-aout|freebsd-elf|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
@@ -6534,6 +6210,9 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -6756,14 +6435,14 @@
 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
@@ -6804,7 +6483,7 @@
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
@@ -6889,13 +6568,13 @@
 		    newdeplibs="$newdeplibs $i"
 		  else
 		    droppeddeps=yes
-		    echo
+		    $ECHO
 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		    $ECHO "*** I have the capability to make that library automatically link in when"
+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+		    $ECHO "*** shared version of the library, which I believe you do not have"
+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
 		;;
@@ -6932,22 +6611,22 @@
 		      newdeplibs="$newdeplibs $i"
 		    else
 		      droppeddeps=yes
-		      echo
+		      $ECHO
 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      $ECHO "*** I have the capability to make that library automatically link in when"
+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+		      $ECHO "*** shared version of the library, which you do not appear to have"
+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  echo
+		  $ECHO
 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
+		  $ECHO "*** make it link in!  You will probably need to install it or some"
+		  $ECHO "*** library that it depends on before this library will be fully"
+		  $ECHO "*** functional.  Installing it before continuing would be even better."
 		fi
 		;;
 	      *)
@@ -6993,7 +6672,7 @@
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@ -7008,12 +6687,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
+		$ECHO
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
@@ -7051,7 +6730,7 @@
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
 		      newdeplibs="$newdeplibs $a_deplib"
 		      a_deplib=""
@@ -7062,12 +6741,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		echo
+		$ECHO
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
@@ -7085,25 +6764,25 @@
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	    for i in $predeps $postdeps ; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
 	    done
 	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+	     $GREP . >/dev/null; then
+	    $ECHO
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
+	    $ECHO "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	    ;;
-	  esac
+	  fi
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -7115,23 +6794,23 @@
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
 	if test "$droppeddeps" = yes; then
 	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO
+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
+	    $ECHO "*** a static module, that should work as long as the dlopening"
+	    $ECHO "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      $ECHO
+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $ECHO "*** not find such a program.  So, this module is probably useless."
+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -7141,16 +6820,16 @@
 	      build_libtool_libs=no
 	    fi
 	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+	    $ECHO "*** automatically added whenever a program is linked with this library"
+	    $ECHO "*** or is declared to -dlopen it."
 
 	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
+	      $ECHO
+	      $ECHO "*** Since this library must not contain undefined symbols,"
+	      $ECHO "*** because either the platform does not support them or"
+	      $ECHO "*** it was explicitly requested with -no-undefined,"
+	      $ECHO "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -7167,9 +6846,9 @@
       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
       case $host in
 	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -7291,7 +6970,7 @@
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 	test "X$libobjs" = "X " && libobjs=
 
 	delfiles=
@@ -7357,7 +7036,7 @@
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  tmp_export_symbols="$export_symbols"
 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7458,8 +7137,7 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -7472,12 +7150,12 @@
 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
 	    output=${output_objdir}/${output_la}.lnkscript
 	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
+	    $ECHO 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
 	      $ECHO "$obj" >> $output
 	    done
-	    echo ')' >> $output
+	    $ECHO ')' >> $output
 	    delfiles="$delfiles $output"
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
@@ -7519,19 +7197,17 @@
 		  # command to the queue.
 		  if test "$k" -eq 1 ; then
 		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
 		  else
 		    # All subsequent reloadable object files will link in
 		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
 		  fi
 		  last_robj=$output_objdir/$output_la-${k}.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
 		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
+		  objlist=$obj
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -7541,8 +7217,7 @@
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
@@ -7601,7 +7276,7 @@
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	      tmp_export_symbols="$export_symbols"
 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
@@ -7766,7 +7441,7 @@
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -7777,7 +7452,7 @@
       fi
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
       func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7837,8 +7512,8 @@
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -7855,8 +7530,8 @@
 	  esac
 	fi
 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -7993,8 +7668,8 @@
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
 
       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -8006,15 +7681,15 @@
 
       wrappers_required=yes
       case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
       *cygwin* | *mingw* )
         if test "$build_libtool_libs" != yes; then
           wrappers_required=no
         fi
         ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -8023,7 +7698,7 @@
       esac
       if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -8070,7 +7745,7 @@
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
@@ -8089,7 +7764,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -8101,7 +7776,7 @@
       fi
 
       # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
@@ -8125,7 +7800,18 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -8246,7 +7932,7 @@
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  echo "copying selected object files to avoid basename conflicts..."
+	  $ECHO "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
 	  generated="$generated $gentop"
 	  func_mkdir_p "$gentop"
@@ -8357,7 +8043,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -8442,27 +8128,9 @@
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
