-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
I noticed that CVS m4's configure inherited en_UK spellings from libtool,
although the GNU coding standards recommend en_US. Any objections to
applying this to 1.5.x and CVS head?
2006-07-24 Eric Blake <[EMAIL PROTECTED]>
* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Use en_US spelling.
- --
Life is short - so eat dessert first!
Eric Blake [EMAIL PROTECTED]
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFExZOo84KuGfSFAYARAlFlAJ9hkO+IxQgrULqhkksyridfek6aqQCdHlD6
9jRWpd+aaUZZzU51QbaKz+o=
=WlK6
-END PGP SIGNATURE-
Index: libtool.m4
===
RCS file: /sources/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.159
diff -u -p -r1.314.2.159 libtool.m4
--- libtool.m4 24 Jun 2006 05:00:22 - 1.314.2.159
+++ libtool.m4 25 Jul 2006 03:39:26 -
@@ -7,7 +7,7 @@
## unlimited permission to copy and/or distribute it, with or without
## modifications, as long as this notice is preserved.
-# serial 48 AC_PROG_LIBTOOL
+# serial 49 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -2057,7 +2057,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
# AC_PATH_TOOL_PREFIX
# ---
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
@@ -2120,7 +2120,7 @@ fi
# AC_PATH_MAGIC
# -
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2267,7 +2267,7 @@ esac
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@ -2459,7 +2459,7 @@ AC_DEFUN([AC_PROG_NM],
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
@@ -5687,7 +5687,7 @@ EOF
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
-*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
Index: libltdl/m4/libtool.m4
===
RCS file: /sources/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.75
diff -u -p -r1.75 libtool.m4
--- libltdl/m4/libtool.m4 24 Jun 2006 04:58:58 - 1.75
+++ libltdl/m4/libtool.m4 25 Jul 2006 03:41:26 -
@@ -37,7 +37,7 @@ m4_define([_LT_COPYING], [dnl
# the same distribution terms that you use for the rest of that program.
])
-# serial 52 LT_INIT
+# serial 53 LT_INIT
# LT_PREREQ(VERSION)
@@ -606,7 +606,7 @@ do
-*) AC_MSG_ERROR([unrecognized option: $[1]
Try `$[0] --help' for more information.]) ;;
-*) AC_MSG_ERROR([unrecognised argument: $[1]
+*) AC_MSG_ERROR([unrecognized argument: $[1]
Try `$[0] --help for more information.]) ;;
esac
shift
@@ -2545,7 +2545,7 @@ _LT_DECL([], [sys_lib_dlsearch_path_spec
# _LT_PATH_TOOL_PREFIX(TOOL)
# --
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
@@ -2615,7 +2615,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2777,7 +2777,7 @@ _LT_DECL([], [reload_cmds], [2])dnl
# -- PORTME fill in with the dynamic library characteristics
m4_defun([_LT_CHECK_MAGIC_METHOD],
[m4_require([_LT_DECL_EGREP])
-AC_CACHE_CHECK([how to recognise dependent libraries],
+AC_CACHE_CHECK([how to recognize dependent libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
