diff -X excl -rduNp libtool.branch-2-0.oorig/m4/libtool.m4 libtool.branch-2-0/m4/libtool.m4
--- libtool.branch-2-0.oorig/m4/libtool.m4	2005-04-27 13:52:13.000000000 +0200
+++ libtool.branch-2-0/m4/libtool.m4	2005-04-30 23:58:23.295518624 +0200
@@ -71,7 +71,7 @@ LIBTOOL_DEPS="$ltmain"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
+AC_SUBST([LIBTOOL])dnl
 
 # Set options
 _LT_SET_OPTIONS([$1])dnl
@@ -866,7 +866,7 @@ if test "X$lt_ECHO" = "X$CONFIG_SHELL [$
    lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 fi
 
-AC_SUBST(lt_ECHO)
+AC_SUBST([lt_ECHO])
 ])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
 _LT_DECL([], [ECHO], [1],
@@ -1219,9 +1219,9 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
   esac
 ])
 if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+  AC_MSG_RESULT([$lt_cv_sys_max_cmd_len])
 else
-  AC_MSG_RESULT(none)
+  AC_MSG_RESULT([none])
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 _LT_DECL([], [max_cmd_len], [0],
@@ -2300,9 +2300,9 @@ _LT_EOF
 esac])
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
+  AC_MSG_RESULT([$MAGIC_CMD])
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT([no])
 fi
 _LT_DECL([], [MAGIC_CMD], [0],
 	 [Used to examine libraries when file_magic_cmd begins "file"])dnl
@@ -2408,9 +2408,9 @@ else
 fi])
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
+  AC_MSG_RESULT([$LD])
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT([no])
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 _LT_PATH_LD_GNU
@@ -2948,9 +2948,9 @@ if test -z "$lt_cv_sys_global_symbol_pip
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
+  AC_MSG_RESULT([failed])
 else
-  AC_MSG_RESULT(ok)
+  AC_MSG_RESULT([ok])
 fi
 
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
@@ -5982,7 +5982,7 @@ AC_DEFUN([LT_PROG_GCJ],
   [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
     [AC_CHECK_TOOL(GCJ, gcj,)
       test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])dnl
+      AC_SUBST([GCJFLAGS])])])dnl
 ])
 
 # Old name: