Mercurial > hg > octave-lojdl > gnulib-hg

--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,5 +1,16 @@
 2003-08-12  Paul Eggert  <eggert@twinsun.com>

+	* srclist-update: Add copyright notice.
+	(remove_id_lines, remove_trailing_blanks): New constants.
+	(fixfile): Use them to normalize spacing a bit in copied files.
+	* config.guess, config.sub, install-sh, missing, texinfo.texi:
+	Normalize leading white space and remove trailing white space.
+
+	* texinfo.tex: Sync with texinfo.
+
+	* srclist.txt: Don't get regex.h, strdup.c, strtoll.c,
+	strtoul.c from libc, to merge coreutils whitespace changes.
+
 	* srclist.txt: Get the following m4 files from gettext:
 	codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4,
 	inttypes-pri.m4, lcmessage.m4, lib-ld.m4, lib-link.m4, lib-prefix.m4,
--- a/config/config.guess
+++ b/config/config.guess
@@ -176,7 +176,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -382,23 +382,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+	exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -464,8 +464,8 @@
 	echo m88k-motorola-sysv3
 	exit 0 ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -478,7 +478,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit 0 ;;
@@ -574,52 +574,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
 		    sed 's/^              //' << EOF >$dummy.c

-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+	      #define _HPUX_SOURCE
+	      #include <stdlib.h>
+	      #include <unistd.h>

-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+	      int main ()
+	      {
+	      #if defined(_SC_KERNEL_BITS)
+		  long bits = sysconf(_SC_KERNEL_BITS);
+	      #endif
+		  long cpu  = sysconf (_SC_CPU_VERSION);

-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		  switch (cpu)
+		{
+		case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+		case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+		case CPU_PA_RISC2_0:
+	      #if defined(_SC_KERNEL_BITS)
+		    switch (bits)
+			{
+			case 64: puts ("hppa2.0w"); break;
+			case 32: puts ("hppa2.0n"); break;
+			default: puts ("hppa2.0"); break;
+			} break;
+	      #else  /* !defined(_SC_KERNEL_BITS) */
+		    puts ("hppa2.0"); break;
+	      #endif
+		default: puts ("hppa1.0"); break;
+		}
+		  exit (0);
+	      }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -699,22 +699,22 @@
 	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+	exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+	exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+	exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+	exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+	exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
@@ -734,14 +734,14 @@
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -869,7 +869,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -889,7 +889,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -911,7 +911,7 @@
 				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_targets" in
+	case "$ld_supported_targets" in
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
@@ -960,11 +960,11 @@
 	echo i386-sequent-sysv4
 	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
     i*86:OS/2:*:*)
@@ -1020,10 +1020,10 @@
 	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+	exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit 0 ;;
@@ -1058,8 +1058,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1093,9 +1093,9 @@
 	fi
 	exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
+		      # says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1117,11 +1117,11 @@
 	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+	exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit 0 ;;
@@ -1206,7 +1206,7 @@
 	echo pdp10-unknown-its
 	exit 0 ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
 esac

@@ -1230,11 +1230,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	  "4"
 #else
 	  ""
 #endif
-         ); exit (0);
+	 ); exit (0);
 #endif
 #endif
--- a/config/config.sub
+++ b/config/config.sub
@@ -162,10 +162,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -1100,8 +1100,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1288,8 +1288,8 @@
 		os=-aout
 		;;
     c4x-* | tic4x-*)
-        os=-coff
-        ;;
+	os=-coff
+	;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
--- a/config/install-sh
+++ b/config/install-sh
@@ -96,53 +96,53 @@
 while test -n "$1"; do
   case $1 in
     -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-        shift
-        continue;;
+	shift
+	continue;;

     -c) instcmd=$cpprog
-        shift
-        continue;;
+	shift
+	continue;;

     -d) dir_arg=true
-        shift
-        continue;;
+	shift
+	continue;;

     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift
+	shift
+	continue;;

     --help) echo "$usage"; exit 0;;

     -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+	shift
+	shift
+	continue;;

     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift
+	shift
+	continue;;

     -s) stripcmd=$stripprog
-        shift
-        continue;;
+	shift
+	continue;;

     -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-        shift
-        continue;;
+	shift
+	continue;;

     --version) echo "$0 $scriptversion"; exit 0;;

     *)  if test -z "$src"; then
-          src=$1
-        else
-          # this colon is to work around a 386BSD /bin/sh bug
-          :
-          dst=$1
-        fi
-        shift
-        continue;;
+	  src=$1
+	else
+	  # this colon is to work around a 386BSD /bin/sh bug
+	  :
+	  dst=$1
+	fi
+	shift
+	continue;;
   esac
 done

@@ -223,7 +223,7 @@
     dstfile=`basename "$dst"`
   else
     dstfile=`basename "$dst" $transformbasename \
-             | sed $transformarg`$transformbasename
+	     | sed $transformarg`$transformbasename
   fi

   # don't allow the sed command to completely eliminate the filename.
--- a/config/missing
+++ b/config/missing
@@ -95,9 +95,9 @@

     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
+	 you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+	 to install the \`Automake' and \`Perl' packages.  Grab them from
+	 any GNU archive site."
     touch aclocal.m4
     ;;

@@ -109,9 +109,9 @@

     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
+	 you modified \`${configure_ac}'.  You might want to install the
+	 \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+	 archive site."
     touch configure
     ;;

@@ -123,9 +123,9 @@

     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
+	 you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+	 to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+	 from any GNU archive site."
     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
     touch_files=
@@ -147,9 +147,9 @@

     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
+	 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+	 You might want to install the \`Automake' and \`Perl' packages.
+	 Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
@@ -163,10 +163,10 @@

     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
+	 system.  You might have modified some files without having the
+	 proper tools for further handling them.
+	 You can get \`$1' as part of \`Autoconf' from any GNU
+	 archive site."

     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
     test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
@@ -186,21 +186,21 @@
   bison|yacc)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
+	 you modified a \`.y' file.  You may need the \`Bison' package
+	 in order for those modifications to take effect.  You can get
+	 \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
+	eval LASTARG="\${$#}"
 	case "$LASTARG" in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
 	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
+		 cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
 	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
+		 cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
@@ -216,17 +216,17 @@
   lex|flex)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
+	 you modified a \`.l' file.  You may need the \`Flex' package
+	 in order for those modifications to take effect.  You can get
+	 \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
+	eval LASTARG="\${$#}"
 	case "$LASTARG" in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
 	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
+		 cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
@@ -269,11 +269,11 @@

     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
+	 you modified a \`.texi' or \`.texinfo' file, or any other file
+	 indirectly affecting the aspect of the manual.  The spurious
+	 call might also be the consequence of using a buggy \`make' (AIX,
+	 DU, IRIX).  You might want to install the \`Texinfo' package or
+	 the \`GNU make' package.  Grab either from any GNU archive site."
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
       file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
@@ -316,19 +316,19 @@

     echo 1>&2 "\
 WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
+	 You may want to install GNU tar or Free paxutils, or check the
+	 command line arguments."
     exit 1
     ;;

   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
+	 system.  You might have modified some files without having the
+	 proper tools for further handling them.  Check the \`README' file,
+	 it often tells you about the needed prerequirements for installing
+	 this package.  You may also peek at any GNU archive site, in case
+	 some other package would contain this missing \`$1' program."
     exit 1
     ;;
 esac
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,11 +1,29 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.10 2003-07-16 12:47:48 karl Exp $
+# $Id: srclist-update,v 1.11 2003-08-13 06:48:58 eggert Exp $
 #
 # Check for files in directory $1 being up to date, according to the
 # list on stdin.  Don't actually make any changes, just show the diffs.
 #
 # Source `dirname $0`/srclistvars.sh first, if it exists.

+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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.
+
+# Written by Karl Berry.
+
+
 if test -n "$1"; then
   cd "$1" || exit 1
 fi
@@ -60,10 +78,20 @@
 }


+
+# sed command to remove lines containing $Id lines.
+# Quote the $Id so that CVS does not expand it in this script.
+remove_id_lines='/[$]Id:.*[$]/d'
+
+# sed command to remove trailing blanks.
+# Do not use [[:space:]] in this pattern, as that would kill formfeeds.
+remove_trailing_blanks='s/[	 ][	 ]*$//'
+
 # $1 is input file, $2 is output.
 # Remove $Id lines, since they'll differ between source locations.
 # If $options contains "gpl", change the license to be the standard
 # GPL.  We use this for libc files, et al.
+# Also, normalize white space simple-mindedly.
 #
 fixfile() \
 {
@@ -73,7 +101,8 @@
   *)
     cat $1;;
   esac \
-  | grep -v '[$]Id:.*[$]' >$2 2>&1
+  | unexpand \
+  | sed "$remove_id_lines; $remove_trailing_blanks" >$2
 }


@@ -98,7 +127,7 @@
   eval dst=$dst
   test -d $dst && dst=$dst/`basename $src`

-  # Do license changes and $Id removal in both src and dst, for the sake
+  # Fix files in both src and dst, for the sake
   # of a clean comparison.
   srctmp=$TMPDIR/`basename $src`
   fixfile $src $srctmp
--- a/config/texinfo.tex
+++ b/config/texinfo.tex
@@ -255,25 +255,25 @@
     \escapechar = `\\     % use backslash in output files.
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-                   % the page break happens to be in the middle of an example.
+		   % the page break happens to be in the middle of an example.
     \shipout\vbox{%
       \ifcropmarks \vbox to \outervsize\bgroup
-        \hsize = \outerhsize
-        \vskip-\topandbottommargin
-        \vtop to0pt{%
-          \line{\ewtop\hfil\ewtop}%
-          \nointerlineskip
-          \line{%
-            \vbox{\moveleft\cornerthick\nstop}%
-            \hfill
-            \vbox{\moveright\cornerthick\nstop}%
-          }%
-          \vss}%
-        \vskip\topandbottommargin
-        \line\bgroup
-          \hfil % center the page within the outer (page) hsize.
-          \ifodd\pageno\hskip\bindingoffset\fi
-          \vbox\bgroup
+	\hsize = \outerhsize
+	\vskip-\topandbottommargin
+	\vtop to0pt{%
+	  \line{\ewtop\hfil\ewtop}%
+	  \nointerlineskip
+	  \line{%
+	    \vbox{\moveleft\cornerthick\nstop}%
+	    \hfill
+	    \vbox{\moveright\cornerthick\nstop}%
+	  }%
+	  \vss}%
+	\vskip\topandbottommargin
+	\line\bgroup
+	  \hfil % center the page within the outer (page) hsize.
+	  \ifodd\pageno\hskip\bindingoffset\fi
+	  \vbox\bgroup
       \fi
       %
       % Do this early so pdf references go to the beginning of the page.
@@ -282,27 +282,27 @@
       \unvbox\headlinebox
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
-        % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingxxx.)
-        % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 2\baselineskip
-        \unvbox\footlinebox
+	% Only leave this space if the footline is nonempty.
+	% (We lessened \vsize for it in \oddfootingxxx.)
+	% The \baselineskip=24pt in plain's \makefootline has no effect.
+	\vskip 2\baselineskip
+	\unvbox\footlinebox
       \fi
       %
       \ifcropmarks
-          \egroup % end of \vbox\bgroup
-        \hfil\egroup % end of (centering) \line\bgroup
-        \vskip\topandbottommargin plus1fill minus1fill
-        \boxmaxdepth = \cornerthick
-        \vbox to0pt{\vss
-          \line{%
-            \vbox{\moveleft\cornerthick\nsbot}%
-            \hfill
-            \vbox{\moveright\cornerthick\nsbot}%
-          }%
-          \nointerlineskip
-          \line{\ewbot\hfil\ewbot}%
-        }%
+	  \egroup % end of \vbox\bgroup
+	\hfil\egroup % end of (centering) \line\bgroup
+	\vskip\topandbottommargin plus1fill minus1fill
+	\boxmaxdepth = \cornerthick
+	\vbox to0pt{\vss
+	  \line{%
+	    \vbox{\moveleft\cornerthick\nsbot}%
+	    \hfill
+	    \vbox{\moveright\cornerthick\nsbot}%
+	  }%
+	  \nointerlineskip
+	  \line{\ewbot\hfil\ewbot}%
+	}%
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
@@ -595,7 +595,7 @@
     % group, force a page break.
     \ifdim \dimen0 > \dimen2
       \ifdim \pagetotal < \vfilllimit\pageheight
-        \page
+	\page
       \fi
     \fi
     \copy\groupbox
@@ -1078,9 +1078,9 @@
       \ifx\empty\imagewidth\else width \imagewidth \fi
       \ifx\empty\imageheight\else height \imageheight \fi
       \ifnum\pdftexversion<13
-         #1.pdf%
+	 #1.pdf%
        \else
-         {#1.pdf}%
+	 {#1.pdf}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
@@ -1123,13 +1123,13 @@
       % The `-' means take the \expnumber as the absolute number of
       % subentries, which we calculated on our first read of the .toc above.
       \def\chapentry##1##2##3{%
-        \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
+	\pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
       \def\secentry##1##2##3##4{%
-        \pdfoutline goto name{\pdfmkpgn{##1}}count-\expnumber{sec##2.##3}{##1}}
+	\pdfoutline goto name{\pdfmkpgn{##1}}count-\expnumber{sec##2.##3}{##1}}
       \def\subsecentry##1##2##3##4##5{%
-        \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
+	\pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
       \def\subsubsecentry##1##2##3##4##5##6{%
-        \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
+	\pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
       %
       % Make special characters normal for writing to the pdf file.
       \indexnofonts
@@ -1147,7 +1147,7 @@
       \ifnum\lnkcount>0,\fi
       \picknum{#1}%
       \startlink attr{/Border [0 0 0]}
-        goto name{\pdfmkpgn{\the\pgn}}%
+	goto name{\pdfmkpgn{\the\pgn}}%
       \linkcolor #1%
       \advance\lnkcount by 1%
       \endlink
@@ -1173,7 +1173,7 @@
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
       \ifx\p\space\else\addtokens{\filename}{\PP}%
-        \advance\filenamelength by 1
+	\advance\filenamelength by 1
       \fi
     \fi
     \nextsp}
@@ -1189,8 +1189,8 @@
       \let\value=\expandablevalue
       \leavevmode\Red
       \startlink attr{/Border [0 0 0]}%
-        user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
-        % #1
+	user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
+	% #1
     \endgroup}
   \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
@@ -1205,9 +1205,9 @@
     \else
       \ifnum0=\countA\else\makelink\fi
       \ifx\first.\let\next=\done\else
-        \let\next=\maketoks
-        \addtokens{\toksB}{\the\toksD}
-        \ifx\first,\addtokens{\toksB}{\space}\fi
+	\let\next=\maketoks
+	\addtokens{\toksB}{\the\toksD}
+	\ifx\first,\addtokens{\toksB}{\space}\fi
       \fi
     \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
     \next}
@@ -1249,7 +1249,7 @@
   \normalbaselines
   \setbox\strutbox =\hbox{%
     \vrule width0pt height\strutheightpercent\baselineskip
-                    depth \strutdepthpercent \baselineskip
+		    depth \strutdepthpercent \baselineskip
   }%
 }

@@ -1487,7 +1487,7 @@
 % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
 % unless the following character is such as not to need one.
 \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-                    \ptexslash\fi\fi\fi}
+		    \ptexslash\fi\fi\fi}
 \def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
 \def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}

@@ -1595,10 +1595,10 @@
   % will therefore expand the active definition of _, which is us
   % (inside @code that is), therefore an endless loop.
   \ifusingtt{\ifmmode
-               \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
-             \else\normalunderscore \fi
-             \discretionary{}{}{}}%
-            {\_}%
+	       \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
+	     \else\normalunderscore \fi
+	     \discretionary{}{}{}}%
+	    {\_}%
 }
 \def\codex #1{\tclose{#1}\endgroup}

@@ -1657,9 +1657,9 @@
     \setbox0 = \hbox{\ignorespaces #2}%
     \ifdim\wd0 > 0pt
       \ifpdf
-        \unhbox0             % PDF: 2nd arg given, show only it
+	\unhbox0             % PDF: 2nd arg given, show only it
       \else
-        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
+	\unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
       \fi
     \else
       \code{#1}% only url given, so show it
@@ -1745,14 +1745,14 @@

 \def\shorttitlepage{\parsearg\shorttitlepagezzz}
 \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-        \endgroup\page\hbox{}\page}
+	\endgroup\page\hbox{}\page}

 \def\titlepage{\begingroup \parindent=0pt \textfonts
    \let\subtitlerm=\tenrm
    \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
    %
    \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
-                   \let\tt=\authortt}%
+		   \let\tt=\authortt}%
    %
    % Leave some space at the very top of the page.
    \vglue\titlepagetopglue
@@ -1760,9 +1760,9 @@
    % Now you can print the title using @title.
    \def\title{\parsearg\titlezzz}%
    \def\titlezzz##1{\leftline{\titlefonts\rm ##1}
-                    % print a rule at the page bottom also.
-                    \finishedtitlepagefalse
-                    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
+		    % print a rule at the page bottom also.
+		    \finishedtitlepagefalse
+		    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
    % No rule at page bottom unless we print one at the top with @title.
    \finishedtitlepagetrue
    %
@@ -1780,7 +1780,7 @@
    \let\oldpage = \page
    \def\page{%
       \iffinishedtitlepage\else
-         \finishtitlepage
+	 \finishtitlepage
       \fi
       \oldpage
       \let\page = \oldpage
@@ -1835,9 +1835,9 @@

 % Now make Tex use those variables
 \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
-                            \else \the\evenheadline \fi}}
+			    \else \the\evenheadline \fi}}
 \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
-                            \else \the\evenfootline \fi}\HEADINGShook}
+			    \else \the\evenfootline \fi}\HEADINGShook}
 \let\HEADINGShook=\relax

 % Commands to set those variables.
@@ -2001,10 +2001,10 @@
 \def\internalBkitemx{\itemxpar \parsearg\kitemzzz}

 \def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}%
-                 \itemzzz {#1}}
+		 \itemzzz {#1}}

 \def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}%
-                 \itemzzz {#1}}
+		 \itemzzz {#1}}

 \def\itemzzz #1{\begingroup %
   \advance\hsize by -\rightskip
@@ -2192,9 +2192,9 @@
     \else
       % It's a letter.
       \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
-        \lowercaseenumerate % lowercase letter
+	\lowercaseenumerate % lowercase letter
       \else
-        \uppercaseenumerate % uppercase letter
+	\uppercaseenumerate % uppercase letter
       \fi
     \fi
   \else
@@ -2218,7 +2218,7 @@
     % Be sure we're not beyond the end of the alphabet.
     \ifnum\itemno=0
       \errmessage{No more lowercase letters in @enumerate; get a bigger
-                  alphabet}%
+		  alphabet}%
     \fi
     \char\lccode\itemno
   }%
@@ -2231,7 +2231,7 @@
     % Be sure we're not beyond the end of the alphabet.
     \ifnum\itemno=0
       \errmessage{No more uppercase letters in @enumerate; get a bigger
-                  alphabet}
+		  alphabet}
     \fi
     \char\uccode\itemno
   }%
@@ -2371,12 +2371,12 @@
       \global\setpercenttrue
     \else
       \ifsetpercent
-         \let\go\pickupwholefraction
+	 \let\go\pickupwholefraction
       \else
-         \global\advance\colcount by 1
-         \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
-                   % separator; typically that is always in the input, anyway.
-         \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
+	 \global\advance\colcount by 1
+	 \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
+		   % separator; typically that is always in the input, anyway.
+	 \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
       \fi
     \fi
     \ifx\go\pickupwholefraction
@@ -2494,12 +2494,12 @@
 \ifdim\multitableparskip>\multitablelinespace
 \global\multitableparskip=\multitablelinespace
 \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
+				      %% than skip between lines in the table.
 \fi%
 \ifdim\multitableparskip=0pt
 \global\multitableparskip=\multitablelinespace
 \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
+				      %% than skip between lines in the table.
 \fi}

 % In case a @footnote appears inside an alignment, save the footnote
@@ -2631,7 +2631,7 @@
 }

 % We have to swallow the remaining "\ST@P".
-%
+%
 \def\doignoretextzzz#1{%
   \ifnum\doignorecount = 0	% We have just found the outermost @end.
     \let\next\enddoignore
@@ -3128,65 +3128,65 @@
       \indexdummies % Must do this here, since \bf, etc expand at this stage
       \escapechar=`\\
       {%
-        \let\folio = 0% We will expand all macros now EXCEPT \folio.
-        \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
-        % so it will be output as is; and it will print as backslash.
-        %
-        % The main index entry text.
-        \toks0 = {#2}%
-        %
-        % If third arg is present, precede it with space in sort key.
-        \def\thirdarg{#3}%
-        \ifx\thirdarg\emptymacro \else
-           % If the third (subentry) arg is present, add it to the index
-           % line to write.
-          \toks0 = \expandafter{\the\toks0 \space #3}%
-        \fi
-        %
-        % Process the index entry with all font commands turned off, to
-        % get the string to sort by.
-        {\indexnofonts
-         \edef\temp{\the\toks0}% need full expansion
-         \xdef\indexsorttmp{\temp}%
-        }%
-        %
-        % Set up the complete index entry, with both the sort key and
-        % the original text, including any font commands.  We write
-        % three arguments to \entry to the .?? file (four in the
-        % subentry case), texindex reduces to two when writing the .??s
-        % sorted result.
-        \edef\temp{%
-          \write\csname#1indfile\endcsname{%
-            \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
-        }%
-        %
-        % If a skip is the last thing on the list now, preserve it
-        % by backing up by \lastskip, doing the \write, then inserting
-        % the skip again.  Otherwise, the whatsit generated by the
-        % \write will make \lastskip zero.  The result is that sequences
-        % like this:
-        % @end defun
-        % @tindex whatever
-        % @defun ...
-        % will have extra space inserted, because the \medbreak in the
-        % start of the @defun won't see the skip inserted by the @end of
-        % the previous defun.
-        %
-        % But don't do any of this if we're not in vertical mode.  We
-        % don't want to do a \vskip and prematurely end a paragraph.
-        %
-        % Avoid page breaks due to these extra skips, too.
-        %
-        \iflinks
-          \ifvmode
-            \skip0 = \lastskip
-            \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi
-          \fi
-          %
-          \temp % do the write
-          %
-          \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
-        \fi
+	\let\folio = 0% We will expand all macros now EXCEPT \folio.
+	\def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
+	% so it will be output as is; and it will print as backslash.
+	%
+	% The main index entry text.
+	\toks0 = {#2}%
+	%
+	% If third arg is present, precede it with space in sort key.
+	\def\thirdarg{#3}%
+	\ifx\thirdarg\emptymacro \else
+	   % If the third (subentry) arg is present, add it to the index
+	   % line to write.
+	  \toks0 = \expandafter{\the\toks0 \space #3}%
+	\fi
+	%
+	% Process the index entry with all font commands turned off, to
+	% get the string to sort by.
+	{\indexnofonts
+	 \edef\temp{\the\toks0}% need full expansion
+	 \xdef\indexsorttmp{\temp}%
+	}%
+	%
+	% Set up the complete index entry, with both the sort key and
+	% the original text, including any font commands.  We write
+	% three arguments to \entry to the .?? file (four in the
+	% subentry case), texindex reduces to two when writing the .??s
+	% sorted result.
+	\edef\temp{%
+	  \write\csname#1indfile\endcsname{%
+	    \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
+	}%
+	%
+	% If a skip is the last thing on the list now, preserve it
+	% by backing up by \lastskip, doing the \write, then inserting
+	% the skip again.  Otherwise, the whatsit generated by the
+	% \write will make \lastskip zero.  The result is that sequences
+	% like this:
+	% @end defun
+	% @tindex whatever
+	% @defun ...
+	% will have extra space inserted, because the \medbreak in the
+	% start of the @defun won't see the skip inserted by the @end of
+	% the previous defun.
+	%
+	% But don't do any of this if we're not in vertical mode.  We
+	% don't want to do a \vskip and prematurely end a paragraph.
+	%
+	% Avoid page breaks due to these extra skips, too.
+	%
+	\iflinks
+	  \ifvmode
+	    \skip0 = \lastskip
+	    \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi
+	  \fi
+	  %
+	  \temp % do the write
+	  %
+	  \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
+	\fi
       }%
     }%
     \penalty\count255
@@ -3872,8 +3872,8 @@
 \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
 \def\chapheadingzzz #1{%
   {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                    \parindent=0pt\raggedright
-                    \rm #1\hfill}}%
+		    \parindent=0pt\raggedright
+		    \rm #1\hfill}}%
   \bigskip \par\penalty 200\relax
   \suppressfirstparagraphindent
 }
@@ -3939,8 +3939,8 @@
     \def\chapnum{#2}%
     \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-          \hangindent = \wd0 \centerparametersmaybe
-          \unhbox0 #1\par}%
+	  \hangindent = \wd0 \centerparametersmaybe
+	  \unhbox0 #1\par}%
   }%
   \nobreak\bigskip % no page break after a chapter title
   \nobreak
@@ -3964,8 +3964,8 @@

 \def\unnchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\raggedright
-                       \rm #1\hfill}}\bigskip \par\nobreak
+		       \parindent=0pt\raggedright
+		       \rm #1\hfill}}\bigskip \par\nobreak
 }

 \def\chfopen #1#2{\chapoddpage {\chapfonts
@@ -3975,8 +3975,8 @@

 \def\centerchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt
-                       \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
+		       \parindent=0pt
+		       \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
 }

 \def\CHAPFopen{%
@@ -4022,8 +4022,8 @@
     \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
     %
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-          \hangindent = \wd0 % zero if no section number
-          \unhbox0 #3}%
+	  \hangindent = \wd0 % zero if no section number
+	  \unhbox0 #3}%
   }%
   % Add extra space after the heading -- either a line space or a
   % paragraph space, whichever is more.  (Some people like to set
@@ -4142,8 +4142,8 @@
       \let\unnumbsubsubsecentry = \subsubsecentry
       \openin 1 \jobname.toc
       \ifeof 1 \else
-        \closein 1
-        \input \jobname.toc
+	\closein 1
+	\input \jobname.toc
       \fi
      \vfill \eject
      \contentsalignmacro % in case @setchapternewpage odd is in effect
@@ -4299,8 +4299,8 @@
    \vbox{
       \hrule height\dimen2
       \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
-         \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-         \kern3pt\vrule width\dimen2}% Space to right.
+	 \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
+	 \kern3pt\vrule width\dimen2}% Space to right.
       \hrule height\dimen2}
     \hfil}
 %
@@ -4411,51 +4411,51 @@
 \def\cbl{{\circle\char'012\hskip -6pt}}
 \def\cbr{{\hskip 6pt\circle\char'011}}
 \def\carttop{\hbox to \cartouter{\hskip\lskip
-        \ctl\leaders\hrule height\circthick\hfil\ctr
-        \hskip\rskip}}
+	\ctl\leaders\hrule height\circthick\hfil\ctr
+	\hskip\rskip}}
 \def\cartbot{\hbox to \cartouter{\hskip\lskip
-        \cbl\leaders\hrule height\circthick\hfil\cbr
-        \hskip\rskip}}
+	\cbl\leaders\hrule height\circthick\hfil\cbr
+	\hskip\rskip}}
 %
 \newskip\lskip\newskip\rskip

 \def\cartouche{%
 \par  % can't be in the midst of a paragraph.
 \begingroup
-        \lskip=\leftskip \rskip=\rightskip
-        \leftskip=0pt\rightskip=0pt %we want these *outside*.
-        \cartinner=\hsize \advance\cartinner by-\lskip
-                          \advance\cartinner by-\rskip
-        \cartouter=\hsize
-        \advance\cartouter by 18.4pt % allow for 3pt kerns on either
+	\lskip=\leftskip \rskip=\rightskip
+	\leftskip=0pt\rightskip=0pt %we want these *outside*.
+	\cartinner=\hsize \advance\cartinner by-\lskip
+			  \advance\cartinner by-\rskip
+	\cartouter=\hsize
+	\advance\cartouter by 18.4pt % allow for 3pt kerns on either
 %                                    side, and for 6pt waste from
 %                                    each corner char, and rule thickness
-        \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-        % Flag to tell @lisp, etc., not to narrow margin.
-        \let\nonarrowing=\comment
-        \vbox\bgroup
-                \baselineskip=0pt\parskip=0pt\lineskip=0pt
-                \carttop
-                \hbox\bgroup
-                        \hskip\lskip
-                        \vrule\kern3pt
-                        \vbox\bgroup
-                                \hsize=\cartinner
-                                \kern3pt
-                                \begingroup
-                                        \baselineskip=\normbskip
-                                        \lineskip=\normlskip
-                                        \parskip=\normpskip
-                                        \vskip -\parskip
+	\normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
+	% Flag to tell @lisp, etc., not to narrow margin.
+	\let\nonarrowing=\comment
+	\vbox\bgroup
+		\baselineskip=0pt\parskip=0pt\lineskip=0pt
+		\carttop
+		\hbox\bgroup
+			\hskip\lskip
+			\vrule\kern3pt
+			\vbox\bgroup
+				\hsize=\cartinner
+				\kern3pt
+				\begingroup
+					\baselineskip=\normbskip
+					\lineskip=\normlskip
+					\parskip=\normpskip
+					\vskip -\parskip
 \def\Ecartouche{%
-                                \endgroup
-                                \kern3pt
-                        \egroup
-                        \kern3pt\vrule
-                        \hskip\rskip
-                \egroup
-                \cartbot
-        \egroup
+				\endgroup
+				\kern3pt
+			\egroup
+			\kern3pt\vrule
+			\hskip\rskip
+		\egroup
+		\cartbot
+	\egroup
 \endgroup
 }}

@@ -5226,14 +5226,14 @@
 %
 \def\deftypeop #1 {\def\deftypeopcategory{#1}%
   \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader
-                       \deftypeopcategory}
+		       \deftypeopcategory}
 %
 % #1 is the class name, #2 the data type, #3 the operation name, #4 the args.
 \def\deftypeopheader#1#2#3#4{%
   \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
   \begingroup
     \defname{\defheaderxcond#2\relax$.$#3}
-            {\deftypeopcategory\ \putwordon\ \code{#1}}%
+	    {\deftypeopcategory\ \putwordon\ \code{#1}}%
     \deftypefunargs{#4}%
   \endgroup
 }
@@ -5262,7 +5262,7 @@
   \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
   \begingroup
     \defname{\defheaderxcond#2\relax$.$#3}
-            {\putwordInstanceVariableof\ \code{#1}}%
+	    {\putwordInstanceVariableof\ \code{#1}}%
     \defvarargs{#3}%
   \endgroup
 }
@@ -5428,7 +5428,7 @@
 \newtoks\macname    % Macro name
 \newif\ifrecursive  % Is it recursive?
 \def\macrolist{}    % List of all defined macros in the form
-                    % \do\macro1\do\macro2...
+		    % \do\macro1\do\macro2...

 % Utility routines.
 % Thisdoes \let #1 = #2, except with \csnames.
@@ -5577,13 +5577,13 @@
 % the macro is used.

 \def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-        \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
+	\let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
 \def\parsemargdefxxx#1,{%
   \if#1;\let\next=\relax
   \else \let\next=\parsemargdefxxx
     \advance\paramno by 1%
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-        {\xeatspaces{\hash\the\paramno}}%
+	{\xeatspaces{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}

@@ -5606,55 +5606,55 @@
     \ifcase\paramno
     % 0
       \expandafter\xdef\csname\the\macname\endcsname{%
-        \noexpand\scanmacro{\temp}}%
+	\noexpand\scanmacro{\temp}}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\braceorline
-         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
+	 \bgroup\noexpand\macroargctxt
+	 \noexpand\braceorline
+	 \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-         \egroup\noexpand\scanmacro{\temp}}%
+	 \egroup\noexpand\scanmacro{\temp}}%
     \else % many
       \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\csname\the\macname xx\endcsname}%
+	 \bgroup\noexpand\macroargctxt
+	 \noexpand\csname\the\macname xx\endcsname}%
       \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+	  \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
       \expandafter\expandafter
       \expandafter\xdef
       \expandafter\expandafter
-        \csname\the\macname xxx\endcsname
-          \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+	\csname\the\macname xxx\endcsname
+	  \paramlist{\egroup\noexpand\scanmacro{\temp}}%
     \fi
   \else
     \ifcase\paramno
     % 0
       \expandafter\xdef\csname\the\macname\endcsname{%
-        \noexpand\norecurse{\the\macname}%
-        \noexpand\scanmacro{\temp}\egroup}%
+	\noexpand\norecurse{\the\macname}%
+	\noexpand\scanmacro{\temp}\egroup}%
     \or % 1
       \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\braceorline
-         \expandafter\noexpand\csname\the\macname xxx\endcsname}%
+	 \bgroup\noexpand\macroargctxt
+	 \noexpand\braceorline
+	 \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-        \egroup
-        \noexpand\norecurse{\the\macname}%
-        \noexpand\scanmacro{\temp}\egroup}%
+	\egroup
+	\noexpand\norecurse{\the\macname}%
+	\noexpand\scanmacro{\temp}\egroup}%
     \else % many
       \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \expandafter\noexpand\csname\the\macname xx\endcsname}%
+	 \bgroup\noexpand\macroargctxt
+	 \expandafter\noexpand\csname\the\macname xx\endcsname}%
       \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+	  \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
       \expandafter\expandafter
       \expandafter\xdef
       \expandafter\expandafter
       \csname\the\macname xxx\endcsname
       \paramlist{%
-          \egroup
-          \noexpand\norecurse{\the\macname}%
-          \noexpand\scanmacro{\temp}\egroup}%
+	  \egroup
+	  \noexpand\norecurse{\the\macname}%
+	  \noexpand\scanmacro{\temp}\egroup}%
     \fi
   \fi}

@@ -5683,7 +5683,7 @@
 \def\aliasxxx #1{\aliasyyy#1\relax}
 \def\aliasyyy #1=#2\relax{\ignoreactivespaces
 \edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=%
-           \expandafter\noexpand\csname#2\endcsname}%
+	   \expandafter\noexpand\csname#2\endcsname}%
 \expandafter\endgroup\next}


@@ -5782,16 +5782,16 @@
       % Use the actual chapter/section title appear inside
       % the square brackets.  Use the real section title if we have it.
       \ifdim \wd1 > 0pt
-        % It is in another manual, so we don't have it.
-        \def\printednodename{\ignorespaces #1}%
+	% It is in another manual, so we don't have it.
+	\def\printednodename{\ignorespaces #1}%
       \else
-        \ifhavexrefs
-          % We know the real title if we have the xref values.
-          \def\printednodename{\refx{#1-title}{}}%
-        \else
-          % Otherwise just copy the Info node name.
-          \def\printednodename{\ignorespaces #1}%
-        \fi%
+	\ifhavexrefs
+	  % We know the real title if we have the xref values.
+	  \def\printednodename{\refx{#1-title}{}}%
+	\else
+	  % Otherwise just copy the Info node name.
+	  \def\printednodename{\ignorespaces #1}%
+	\fi%
       \fi
     \fi
   \fi
@@ -5808,10 +5808,10 @@
     {\turnoffactive \otherbackslash
      \ifnum\filenamelength>0
        \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{#1}%
+	 goto file{\the\filename.pdf} name{#1}%
      \else
        \startlink attr{/Border [0 0 0]}%
-         goto name{\pdfmkpgn{#1}}%
+	 goto name{\pdfmkpgn{#1}}%
      \fi
     }%
     \linkcolor
@@ -5917,12 +5917,12 @@
     \angleleft un\-de\-fined\angleright
     \iflinks
       \ifhavexrefs
-        \message{\linenumber Undefined cross reference `#1'.}%
+	\message{\linenumber Undefined cross reference `#1'.}%
       \else
-        \ifwarnedxrefs\else
-          \global\warnedxrefstrue
-          \message{Cross reference values unknown; you must run TeX again.}%
-        \fi
+	\ifwarnedxrefs\else
+	  \global\warnedxrefstrue
+	  \message{Cross reference values unknown; you must run TeX again.}%
+	\fi
       \fi
     \fi
   \else
@@ -6325,9 +6325,9 @@
   %
   % If page is nothing but text, make it come out even.
   \internalpagesizes{46\baselineskip}{6in}%
-                    {\voffset}{.25in}%
-                    {\bindingoffset}{36pt}%
-                    {11in}{8.5in}%
+		    {\voffset}{.25in}%
+		    {\bindingoffset}{36pt}%
+		    {11in}{8.5in}%
 }}

 % Use @smallbook to reset parameters for 7x9.5 (or so) format.
@@ -6336,9 +6336,9 @@
   \textleading = 12pt
   %
   \internalpagesizes{7.5in}{5in}%
-                    {\voffset}{.25in}%
-                    {\bindingoffset}{16pt}%
-                    {9.25in}{7in}%
+		    {\voffset}{.25in}%
+		    {\bindingoffset}{16pt}%
+		    {9.25in}{7in}%
   %
   \lispnarrowing = 0.3in
   \tolerance = 700
@@ -6363,9 +6363,9 @@
   % \global\bindingoffset = 10mm
   % @end tex
   \internalpagesizes{51\baselineskip}{160mm}
-                    {\voffset}{\hoffset}%
-                    {\bindingoffset}{44pt}%
-                    {297mm}{210mm}%
+		    {\voffset}{\hoffset}%
+		    {\bindingoffset}{44pt}%
+		    {297mm}{210mm}%
   %
   \tolerance = 700
   \hfuzz = 1pt
@@ -6381,9 +6381,9 @@
   \textleading = 12.5pt
   %
   \internalpagesizes{160mm}{120mm}%
-                    {\voffset}{\hoffset}%
-                    {\bindingoffset}{8pt}%
-                    {210mm}{148mm}%
+		    {\voffset}{\hoffset}%
+		    {\bindingoffset}{8pt}%
+		    {210mm}{148mm}%
   %
   \lispnarrowing = 0.2in
   \tolerance = 800
@@ -6397,9 +6397,9 @@
 \def\afourlatex{{\globaldefs = 1
   \afourpaper
   \internalpagesizes{237mm}{150mm}%
-                    {\voffset}{4.6mm}%
-                    {\bindingoffset}{7mm}%
-                    {297mm}{210mm}%
+		    {\voffset}{4.6mm}%
+		    {\bindingoffset}{7mm}%
+		    {297mm}{210mm}%
   %
   % Must explicitly reset to 0 because we call \afourpaper.
   \globaldefs = 0
@@ -6409,9 +6409,9 @@
 \def\afourwide{{\globaldefs = 1
   \afourpaper
   \internalpagesizes{241mm}{165mm}%
-                    {\voffset}{-2.95mm}%
-                    {\bindingoffset}{7mm}%
-                    {297mm}{210mm}%
+		    {\voffset}{-2.95mm}%
+		    {\bindingoffset}{7mm}%
+		    {297mm}{210mm}%
   \globaldefs = 0
 }}

@@ -6435,9 +6435,9 @@
   \advance\dimen2 by \normaloffset
   %
   \internalpagesizes{#1}{\hsize}%
-                    {\voffset}{\normaloffset}%
-                    {\bindingoffset}{44pt}%
-                    {\dimen0}{\dimen2}%
+		    {\voffset}{\normaloffset}%
+		    {\bindingoffset}{44pt}%
+		    {\dimen0}{\dimen2}%
 }}

 % Set default to letter.
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2003-08-12  Paul Eggert  <eggert@twinsun.com>

+	* argp-help.c, argp-parse.c, config.charset, getopt.h:
+	Normalize leading white space and remove trailing white space.
+	* ref-add.sin, ref-del.sin: Use '#' before empty line in copyright
+	notice, as per ../config/srclist-update.
+
 	Merge from coreutils.
 	* euidaccess.h: New file.
 	* euidaccess.c: Include it.
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -294,13 +294,13 @@
      {"no-parent", 'P',	      0,     0, "Include processes without parents"},
      {0,           'x',       0,     OPTION_ALIAS},
      {"all-fields",'Q',       0,     0, "Don't elide unusable fields (normally"
-                                        " if there's some reason ps can't"
+					" if there's some reason ps can't"
 					" print a field for any process, it's"
-                                        " removed from the output entirely)" },
+					" removed from the output entirely)" },
      {"reverse",   'r',       0,     0, "Reverse the order of any sort"},
      {"gratuitously-long-reverse-option", 0, 0, OPTION_ALIAS},
      {"session",   OPT_SESS,  "SID", OPTION_ARG_OPTIONAL,
-                                        "Add the processes from the session"
+					"Add the processes from the session"
 					" SID (which defaults to the sid of"
 					" the current process)" },

@@ -1641,7 +1641,7 @@
 	__argp_fmtstream_putc (fs, '\n');
       __argp_fmtstream_printf (fs, dgettext (argp->argp_domain,
 					     "Report bugs to %s.\n"),
- 			       argp_program_bug_address);
+			       argp_program_bug_address);
       anything = 1;
     }
--- a/lib/argp-parse.c
+++ b/lib/argp-parse.c
@@ -411,7 +411,7 @@

       if (children)
 	/* Assign GROUP's CHILD_INPUTS field some space from
-           CVT->child_inputs_end.*/
+	   CVT->child_inputs_end.*/
 	{
 	  unsigned num_children = 0;
 	  while (children[num_children].argp)
@@ -845,7 +845,7 @@
 	  parser->try_getopt = 0;
 	  if (parser->state.next > 1
 	      && strcmp (parser->state.argv[parser->state.next - 1], QUOTE)
-	           == 0)
+		   == 0)
 	    /* Not only is this the end of the options, but it's a
 	       `quoted' region, which may have args that *look* like
 	       options, so we definitely shouldn't try to use getopt past
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -12,7 +12,7 @@
 #	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.
@@ -257,8 +257,8 @@
 	  echo "$l.ASCII ASCII"
 	done
 	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+		 fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+		 lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
 	  echo "$l.ISO_8859-1 ISO-8859-1"
 	  echo "$l.DIS_8859-15 ISO-8859-15"
 	done
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -149,15 +149,15 @@
 # ifndef __need_getopt
 extern int getopt_long (int ___argc, char *const *___argv,
 			const char *__shortopts,
-		        const struct option *__longopts, int *__longind);
+			const struct option *__longopts, int *__longind);
 extern int getopt_long_only (int ___argc, char *const *___argv,
 			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind);
+			     const struct option *__longopts, int *__longind);

 /* Internal only.  Users should not call this directly.  */
 extern int _getopt_internal (int ___argc, char *const *___argv,
 			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind,
+			     const struct option *__longopts, int *__longind,
 			     int __long_only);
 # endif
 #else /* not __STDC__ */
--- a/lib/ref-add.sin
+++ b/lib/ref-add.sin
@@ -11,7 +11,7 @@
 #	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.
--- a/lib/ref-del.sin
+++ b/lib/ref-del.sin
@@ -11,7 +11,7 @@
 #	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.
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,9 @@
 2003-08-12  Paul Eggert  <eggert@twinsun.com>

+	* gettext.m4, iconv.m4, intdiv0.m4, inttypes-pri.m4, lib-link.m4,
+	lib-prefix.m4, longdouble.m4, po.m4, progtest.m4, signed.m4:
+	Normalize leading white space and remove trailing white space.
+
 	Merge from coreutils
 	* euidaccess.m4 (gl_FUNC_EUIDACCESS): Check for euidaccess decl.
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -109,25 +109,25 @@
     ifelse(gt_included_intl, yes, [
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
+	[  --with-included-gettext use the GNU gettext library included here],
+	nls_cv_force_use_gnu_gettext=$withval,
+	nls_cv_force_use_gnu_gettext=no)
       AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)

       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
     ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
+	dnl User does not insist on using GNU NLS library.  Figure out what
+	dnl to use.  If GNU gettext is available we use this.  Else we have
+	dnl to fall back to GNU NLS library.

-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+	dnl Add a version number to the cache macros.
+	define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+	define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+	define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])

-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
+	AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+	 [AC_TRY_LINK([#include <libintl.h>
 ]ifelse([$2], [need-formatstring-macros],
 [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
@@ -137,29 +137,29 @@
 changequote([,])dnl
 ], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
+	    [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
+	    gt_cv_func_gnugettext_libc=yes,
+	    gt_cv_func_gnugettext_libc=no)])

-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
+	if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+	  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+	  ifelse(gt_included_intl, yes, , [
+	    AM_ICONV_LINK
+	  ])
+	  dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+	  dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+	  dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+	  dnl even if libiconv doesn't exist.
+	  AC_LIB_LINKFLAGS_BODY([intl])
+	  AC_CACHE_CHECK([for GNU gettext in libintl],
+	    gt_cv_func_gnugettext_libintl,
+	   [gt_save_CPPFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS $INCINTL"
+	    gt_save_LIBS="$LIBS"
+	    LIBS="$LIBS $LIBINTL"
+	    dnl Now see whether libintl exists and does not depend on libiconv.
+	    AC_TRY_LINK([#include <libintl.h>
 ]ifelse([$2], [need-formatstring-macros],
 [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
@@ -173,14 +173,14 @@
 "C"
 #endif
 const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
+	      [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
+	      gt_cv_func_gnugettext_libintl=yes,
+	      gt_cv_func_gnugettext_libintl=no)
+	    dnl Now see whether libintl exists and depends on libiconv.
+	    if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+	      LIBS="$LIBS $LIBICONV"
+	      AC_TRY_LINK([#include <libintl.h>
 ]ifelse([$2], [need-formatstring-macros],
 [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
@@ -194,61 +194,61 @@
 "C"
 #endif
 const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
+		[bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
+	       [LIBINTL="$LIBINTL $LIBICONV"
+		LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+		gt_cv_func_gnugettext_libintl=yes
+	       ])
+	    fi
+	    CPPFLAGS="$gt_save_CPPFLAGS"
+	    LIBS="$gt_save_LIBS"])
+	fi

-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
+	dnl If an already present or preinstalled GNU gettext() is found,
+	dnl use it.  But if this macro is used in GNU gettext, and GNU
+	dnl gettext is already preinstalled in libintl, we update this
+	dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+	if test "$gt_cv_func_gnugettext_libc" = "yes" \
+	   || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+		&& test "$PACKAGE" != gettext-runtime \
+		&& test "$PACKAGE" != gettext-tools; }; then
+	  gt_use_preinstalled_gnugettext=yes
+	else
+	  dnl Reset the values set by searching for libintl.
+	  LIBINTL=
+	  LTLIBINTL=
+	  INCINTL=
+	fi

     ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
+	if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+	  dnl GNU gettext is not found in the C library.
+	  dnl Fall back on included GNU gettext library.
+	  nls_cv_use_gnu_gettext=yes
+	fi
       fi

       if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+	dnl Mark actions used to generate GNU NLS library.
+	BUILD_INCLUDED_LIBINTL=yes
+	USE_INCLUDED_LIBINTL=yes
+	LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+	LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi

       if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
+	 || test "$nls_cv_use_gnu_gettext" = "yes"; then
+	dnl Mark actions to use GNU gettext tools.
+	CATOBJEXT=.gmo
       fi
     ])

     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
+	[Define to 1 if translation of program messages to the user's native language
    is requested.])
     else
       USE_NLS=no
@@ -261,9 +261,9 @@
     AC_MSG_CHECKING([where the gettext function comes from])
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        gt_source="external libintl"
+	gt_source="external libintl"
       else
-        gt_source="libc"
+	gt_source="libc"
       fi
     else
       gt_source="included intl directory"
@@ -275,9 +275,9 @@

     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+	AC_MSG_CHECKING([how to link with libintl])
+	AC_MSG_RESULT([$LIBINTL])
+	AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
       fi

       dnl For backward compatibility. Some packages may be using this.
@@ -400,7 +400,7 @@
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
       1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
 changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+	 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
     esac
     AC_MSG_RESULT([$ac_prog_version])
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -49,11 +49,11 @@
       LIBS="$LIBS $LIBICONV"
       AC_TRY_LINK([#include <stdlib.h>
 #include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
+	[iconv_t cd = iconv_open("","");
+	 iconv(cd,NULL,NULL,NULL,NULL);
+	 iconv_close(cd);],
+	am_cv_lib_iconv=yes
+	am_cv_func_iconv=yes)
       LIBS="$am_save_LIBS"
     fi
   ])
@@ -96,7 +96,7 @@
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
     AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
+	 }[$]am_cv_proto_iconv)
     AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
       [Define as const if the declaration of iconv() needs const.])
   fi
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -53,15 +53,15 @@
   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
-        ])
+	[
+	  # 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;;
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -18,7 +18,7 @@
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [
-        AC_TRY_COMPILE([#include <inttypes.h>
+	AC_TRY_COMPILE([#include <inttypes.h>
 #ifdef PRId32
 char *p = PRId32;
 #endif
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -18,7 +18,7 @@
   AC_REQUIRE([AC_LIB_RPATH])
   define([Name],[translit([$1],[./-], [___])])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+			       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
     AC_LIB_LINKFLAGS_BODY([$1], [$2])
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -52,7 +52,7 @@
   AC_REQUIRE([AC_LIB_RPATH])
   define([Name],[translit([$1],[./-], [___])])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+			       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])

   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
   dnl accordingly.
@@ -125,7 +125,7 @@
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+			       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
@@ -140,13 +140,13 @@
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
+	AC_LIB_WITH_FINAL_PREFIX([
+	  eval additional_includedir=\"$includedir\"
+	  eval additional_libdir=\"$libdir\"
+	])
       else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+	additional_includedir="$withval/include"
+	additional_libdir="$withval/lib"
       fi
     fi
 ])
@@ -165,332 +165,332 @@
     for name in $names_this_round; do
       already_handled=
       for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
+	if test "$n" = "$name"; then
+	  already_handled=yes
+	  break
+	fi
       done
       if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
+	names_already_handled="$names_already_handled $name"
+	dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+	dnl or AC_LIB_HAVE_LINKFLAGS call.
+	uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+	eval value=\"\$HAVE_LIB$uppername\"
+	if test -n "$value"; then
+	  if test "$value" = yes; then
+	    eval value=\"\$LIB$uppername\"
+	    test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+	    eval value=\"\$LTLIB$uppername\"
+	    test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+	  else
+	    dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+	    dnl that this library doesn't exist. So just drop it.
+	    :
+	  fi
+	else
+	  dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+	  dnl and the already constructed $LIBNAME/$LTLIBNAME.
+	  found_dir=
+	  found_la=
+	  found_so=
+	  found_a=
+	  if test $use_additional = yes; then
+	    if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+	      found_dir="$additional_libdir"
+	      found_so="$additional_libdir/lib$name.$shlibext"
+	      if test -f "$additional_libdir/lib$name.la"; then
+		found_la="$additional_libdir/lib$name.la"
+	      fi
+	    else
+	      if test -f "$additional_libdir/lib$name.$libext"; then
+		found_dir="$additional_libdir"
+		found_a="$additional_libdir/lib$name.$libext"
+		if test -f "$additional_libdir/lib$name.la"; then
+		  found_la="$additional_libdir/lib$name.la"
+		fi
+	      fi
+	    fi
+	  fi
+	  if test "X$found_dir" = "X"; then
+	    for x in $LDFLAGS $LTLIB[]NAME; do
+	      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+	      case "$x" in
+		-L*)
+		  dir=`echo "X$x" | sed -e 's/^X-L//'`
+		  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+		    found_dir="$dir"
+		    found_so="$dir/lib$name.$shlibext"
+		    if test -f "$dir/lib$name.la"; then
+		      found_la="$dir/lib$name.la"
+		    fi
+		  else
+		    if test -f "$dir/lib$name.$libext"; then
+		      found_dir="$dir"
+		      found_a="$dir/lib$name.$libext"
+		      if test -f "$dir/lib$name.la"; then
+			found_la="$dir/lib$name.la"
+		      fi
+		    fi
+		  fi
+		  ;;
+	      esac
+	      if test "X$found_dir" != "X"; then
+		break
+	      fi
+	    done
+	  fi
+	  if test "X$found_dir" != "X"; then
+	    dnl Found the library.
+	    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+	    if test "X$found_so" != "X"; then
+	      dnl Linking with a shared library. We attempt to hardcode its
+	      dnl directory into the executable's runpath, unless it's the
+	      dnl standard /usr/lib.
+	      if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+		dnl No hardcoding is needed.
+		LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+	      else
+		dnl Use an explicit option to hardcode DIR into the resulting
+		dnl binary.
+		dnl Potentially add DIR to ltrpathdirs.
+		dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+		haveit=
+		for x in $ltrpathdirs; do
+		  if test "X$x" = "X$found_dir"; then
+		    haveit=yes
+		    break
+		  fi
+		done
+		if test -z "$haveit"; then
+		  ltrpathdirs="$ltrpathdirs $found_dir"
+		fi
+		dnl The hardcoding into $LIBNAME is system dependent.
+		if test "$hardcode_direct" = yes; then
+		  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+		  dnl resulting binary.
+		  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+		else
+		  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+		    dnl Use an explicit option to hardcode DIR into the resulting
+		    dnl binary.
+		    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+		    dnl Potentially add DIR to rpathdirs.
+		    dnl The rpathdirs will be appended to $LIBNAME at the end.
+		    haveit=
+		    for x in $rpathdirs; do
+		      if test "X$x" = "X$found_dir"; then
+			haveit=yes
+			break
+		      fi
+		    done
+		    if test -z "$haveit"; then
+		      rpathdirs="$rpathdirs $found_dir"
+		    fi
+		  else
+		    dnl Rely on "-L$found_dir".
+		    dnl But don't add it if it's already contained in the LDFLAGS
+		    dnl or the already constructed $LIBNAME
+		    haveit=
+		    for x in $LDFLAGS $LIB[]NAME; do
+		      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+		      if test "X$x" = "X-L$found_dir"; then
+			haveit=yes
+			break
+		      fi
+		    done
+		    if test -z "$haveit"; then
+		      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+		    fi
+		    if test "$hardcode_minus_L" != no; then
+		      dnl FIXME: Not sure whether we should use
+		      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+		      dnl here.
+		      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+		    else
+		      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+		      dnl here, because this doesn't fit in flags passed to the
+		      dnl compiler. So give up. No hardcoding. This affects only
+		      dnl very old systems.
+		      dnl FIXME: Not sure whether we should use
+		      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+		      dnl here.
+		      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+		    fi
+		  fi
+		fi
+	      fi
+	    else
+	      if test "X$found_a" != "X"; then
+		dnl Linking with a static library.
+		LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+	      else
+		dnl We shouldn't come here, but anyway it's good to have a
+		dnl fallback.
+		LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+	      fi
+	    fi
+	    dnl Assume the include files are nearby.
+	    additional_includedir=
+	    case "$found_dir" in
+	      */lib | */lib/)
+		basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+		additional_includedir="$basedir/include"
+		;;
+	    esac
+	    if test "X$additional_includedir" != "X"; then
+	      dnl Potentially add $additional_includedir to $INCNAME.
+	      dnl But don't add it
+	      dnl   1. if it's the standard /usr/include,
+	      dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+	      dnl   3. if it's already present in $CPPFLAGS or the already
+	      dnl      constructed $INCNAME,
+	      dnl   4. if it doesn't exist as a directory.
+	      if test "X$additional_includedir" != "X/usr/include"; then
+		haveit=
+		if test "X$additional_includedir" = "X/usr/local/include"; then
+		  if test -n "$GCC"; then
+		    case $host_os in
+		      linux*) haveit=yes;;
+		    esac
+		  fi
+		fi
+		if test -z "$haveit"; then
+		  for x in $CPPFLAGS $INC[]NAME; do
+		    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+		    if test "X$x" = "X-I$additional_includedir"; then
+		      haveit=yes
+		      break
+		    fi
+		  done
+		  if test -z "$haveit"; then
+		    if test -d "$additional_includedir"; then
+		      dnl Really add $additional_includedir to $INCNAME.
+		      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+		    fi
+		  fi
+		fi
+	      fi
+	    fi
+	    dnl Look for dependencies.
+	    if test -n "$found_la"; then
+	      dnl Read the .la file. It defines the variables
+	      dnl dlname, library_names, old_library, dependency_libs, current,
+	      dnl age, revision, installed, dlopen, dlpreopen, libdir.
+	      save_libdir="$libdir"
+	      case "$found_la" in
+		*/* | *\\*) . "$found_la" ;;
+		*) . "./$found_la" ;;
+	      esac
+	      libdir="$save_libdir"
+	      dnl We use only dependency_libs.
+	      for dep in $dependency_libs; do
+		case "$dep" in
+		  -L*)
+		    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+		    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+		    dnl But don't add it
+		    dnl   1. if it's the standard /usr/lib,
+		    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+		    dnl   3. if it's already present in $LDFLAGS or the already
+		    dnl      constructed $LIBNAME,
+		    dnl   4. if it doesn't exist as a directory.
+		    if test "X$additional_libdir" != "X/usr/lib"; then
+		      haveit=
+		      if test "X$additional_libdir" = "X/usr/local/lib"; then
+			if test -n "$GCC"; then
+			  case $host_os in
+			    linux*) haveit=yes;;
+			  esac
+			fi
+		      fi
+		      if test -z "$haveit"; then
+			haveit=
+			for x in $LDFLAGS $LIB[]NAME; do
+			  AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+			  if test "X$x" = "X-L$additional_libdir"; then
+			    haveit=yes
+			    break
+			  fi
+			done
+			if test -z "$haveit"; then
+			  if test -d "$additional_libdir"; then
+			    dnl Really add $additional_libdir to $LIBNAME.
+			    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+			  fi
+			fi
+			haveit=
+			for x in $LDFLAGS $LTLIB[]NAME; do
+			  AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+			  if test "X$x" = "X-L$additional_libdir"; then
+			    haveit=yes
+			    break
+			  fi
+			done
+			if test -z "$haveit"; then
+			  if test -d "$additional_libdir"; then
+			    dnl Really add $additional_libdir to $LTLIBNAME.
+			    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+			  fi
+			fi
+		      fi
+		    fi
+		    ;;
+		  -R*)
+		    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+		    if test "$enable_rpath" != no; then
+		      dnl Potentially add DIR to rpathdirs.
+		      dnl The rpathdirs will be appended to $LIBNAME at the end.
+		      haveit=
+		      for x in $rpathdirs; do
+			if test "X$x" = "X$dir"; then
+			  haveit=yes
+			  break
+			fi
+		      done
+		      if test -z "$haveit"; then
+			rpathdirs="$rpathdirs $dir"
+		      fi
+		      dnl Potentially add DIR to ltrpathdirs.
+		      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+		      haveit=
+		      for x in $ltrpathdirs; do
+			if test "X$x" = "X$dir"; then
+			  haveit=yes
+			  break
+			fi
+		      done
+		      if test -z "$haveit"; then
+			ltrpathdirs="$ltrpathdirs $dir"
+		      fi
+		    fi
+		    ;;
+		  -l*)
+		    dnl Handle this in the next round.
+		    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+		    ;;
+		  *.la)
+		    dnl Handle this in the next round. Throw away the .la's
+		    dnl directory; it is already contained in a preceding -L
+		    dnl option.
+		    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+		    ;;
+		  *)
+		    dnl Most likely an immediate library name.
+		    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+		    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+		    ;;
+		esac
+	      done
+	    fi
+	  else
+	    dnl Didn't find the library; assume it is in the system directories
+	    dnl known to the linker and runtime loader. (All the system
+	    dnl directories known to the linker should also be known to the
+	    dnl runtime loader, otherwise the system is severely misconfigured.)
+	    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+	    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+	  fi
+	fi
       fi
     done
   done
@@ -501,7 +501,7 @@
       dnl single library, but not when more than one $LIBNAMEs are used.
       alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+	alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
       dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
       acl_save_libdir="$libdir"
@@ -512,11 +512,11 @@
     else
       dnl The -rpath options are cumulative.
       for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+	acl_save_libdir="$libdir"
+	libdir="$found_dir"
+	eval flag=\"$hardcode_libdir_flag_spec\"
+	libdir="$acl_save_libdir"
+	LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
       done
     fi
   fi
@@ -540,8 +540,8 @@
     for x in $[$1]; do
       AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
       if test "X$x" = "X$element"; then
-        haveit=yes
-        break
+	haveit=yes
+	break
       fi
     done
     if test -z "$haveit"; then
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -41,13 +41,13 @@
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
+	AC_LIB_WITH_FINAL_PREFIX([
+	  eval additional_includedir=\"$includedir\"
+	  eval additional_libdir=\"$libdir\"
+	])
       else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+	additional_includedir="$withval/include"
+	additional_libdir="$withval/lib"
       fi
     fi
 ])
@@ -61,26 +61,26 @@
     if test "X$additional_includedir" != "X/usr/include"; then
       haveit=
       for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
+	AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+	if test "X$x" = "X-I$additional_includedir"; then
+	  haveit=yes
+	  break
+	fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
+	if test "X$additional_includedir" = "X/usr/local/include"; then
+	  if test -n "$GCC"; then
+	    case $host_os in
+	      linux*) haveit=yes;;
+	    esac
+	  fi
+	fi
+	if test -z "$haveit"; then
+	  if test -d "$additional_includedir"; then
+	    dnl Really add $additional_includedir to $CPPFLAGS.
+	    CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+	  fi
+	fi
       fi
     fi
     dnl Potentially add $additional_libdir to $LDFLAGS.
@@ -92,26 +92,26 @@
     if test "X$additional_libdir" != "X/usr/lib"; then
       haveit=
       for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
+	AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+	if test "X$x" = "X-L$additional_libdir"; then
+	  haveit=yes
+	  break
+	fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
+	if test "X$additional_libdir" = "X/usr/local/lib"; then
+	  if test -n "$GCC"; then
+	    case $host_os in
+	      linux*) haveit=yes;;
+	    esac
+	  fi
+	fi
+	if test -z "$haveit"; then
+	  if test -d "$additional_libdir"; then
+	    dnl Really add $additional_libdir to $LDFLAGS.
+	    LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+	  fi
+	fi
       fi
     fi
   fi
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -17,12 +17,12 @@
        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)
+	 /* 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.])
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -64,7 +64,7 @@
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
       AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
+	[found $GMSGFMT program is not GNU msgfmt; ignore it])
       GMSGFMT=":"
     fi
   fi
@@ -79,7 +79,7 @@
       : ;
     else
       AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
+	[found xgettext program is not GNU xgettext; ignore it])
       XGETTEXT=":"
     fi
     dnl Remove leftover from FreeBSD xgettext call.
@@ -90,101 +90,101 @@
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+	*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
       esac
       # PO directories have a Makefile.in generated from Makefile.in.in.
       case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
+	# Adjust a relative srcdir.
+	ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+	ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+	ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+	# In autoconf-2.13 it is called $ac_given_srcdir.
+	# In autoconf-2.50 it is called $srcdir.
+	test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+	case "$ac_given_srcdir" in
+	  .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+	  /*) top_srcdir="$ac_given_srcdir" ;;
+	  *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+	esac
+	if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+	  rm -f "$ac_dir/POTFILES"
+	  test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+	  cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+	  POMAKEFILEDEPS="POTFILES.in"
+	  # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+	  # on $ac_dir but don't depend on user-specified configuration
+	  # parameters.
+	  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+	    # The LINGUAS file contains the set of available languages.
+	    if test -n "$OBSOLETE_ALL_LINGUAS"; then
+	      test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+	    fi
+	    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+	    # Hide the ALL_LINGUAS assigment from automake.
+	    eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+	    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+	  else
+	    # The set of available languages was given in configure.in.
+	    eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+	  fi
+	  case "$ac_given_srcdir" in
+	    .) srcdirpre= ;;
+	    *) srcdirpre='$(srcdir)/' ;;
+	  esac
+	  POFILES=
+	  GMOFILES=
+	  UPDATEPOFILES=
+	  DUMMYPOFILES=
+	  for lang in $ALL_LINGUAS; do
+	    POFILES="$POFILES $srcdirpre$lang.po"
+	    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+	    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+	    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+	  done
+	  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+	  # environment variable.
+	  INST_LINGUAS=
+	  if test -n "$ALL_LINGUAS"; then
+	    for presentlang in $ALL_LINGUAS; do
+	      useit=no
+	      if test "%UNSET%" != "$LINGUAS"; then
+		desiredlanguages="$LINGUAS"
+	      else
+		desiredlanguages="$ALL_LINGUAS"
+	      fi
+	      for desiredlang in $desiredlanguages; do
+		# Use the presentlang catalog if desiredlang is
+		#   a. equal to presentlang, or
+		#   b. a variant of presentlang (because in this case,
+		#      presentlang can be used as a fallback for messages
+		#      which are not translated in the desiredlang catalog).
+		case "$desiredlang" in
+		  "$presentlang"*) useit=yes;;
+		esac
+	      done
+	      if test $useit = yes; then
+		INST_LINGUAS="$INST_LINGUAS $presentlang"
+	      fi
+	    done
+	  fi
+	  CATALOGS=
+	  if test -n "$INST_LINGUAS"; then
+	    for lang in $INST_LINGUAS; do
+	      CATALOGS="$CATALOGS $lang.gmo"
+	    done
+	  fi
+	  test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+	  sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+	  for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+	    if test -f "$f"; then
+	      case "$f" in
+		*.orig | *.bak | *~) ;;
+		*) cat "$f" >> "$ac_dir/Makefile" ;;
+	      esac
+	    fi
+	  done
+	fi
+	;;
       esac
     done],
    [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -66,12 +66,12 @@
       IFS="$ac_save_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
+	if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+	  if [$3]; then
+	    ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+	    break 2
+	  fi
+	fi
       done
     done
     IFS="$ac_save_IFS"
--- a/m4/signed.m4
+++ b/m4/signed.m4
@@ -14,6 +14,6 @@
    [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.])
+	      [Define to empty if the C compiler doesn't support this keyword.])
   fi
 ])