* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): s/recognise/recognize/.

diff --git a/ChangeLog b/ChangeLog
index 2c4549a1e9256000d09256b1d1a40e6348ac0484..a0b660cac9883c7cabe3f56eba0c538d14c1055f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-28  Eric Blake  <ebb9@byu.net>
+
+       * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): s/recognise/recognize/.
+
 2006-06-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 (_LT_COMPILER_BOILERPLATE, _LT_LINKER_BOILERPLATE):
@@ -328,7 +332,7 @@
 
 2005-11-26  Peter O'Gorman  <peter@pogma.com>
 
-       * ltmain.in (link mode): Add missing $LTCFLAGS for a $LTCC. 
+       * ltmain.in (link mode): Add missing $LTCFLAGS for a $LTCC.
        * libtool.m4 [darwin]: Use $LTCC $LTCFLAGS to create reloadable
        objects.
 
@@ -595,7 +599,7 @@
 
 2005-10-17  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
-       * ltmain.in [darwin]: Don't check for "bundle" in file path. 
+       * ltmain.in [darwin]: Don't check for "bundle" in file path.
        Reported by Christoph Egger <Christoph_Egger@gmx.de>.
 
 2005-10-13  Peter O'Gorman  <peter@pogma.com>

diff --git a/libtool.m4 b/libtool.m4
index 4d6701474e5df27240c671bebe8a94daba7e6273..e3aa54e581a92482ae5ac767b1b3079fbffcf665 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -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_PROG_EGREP],
 
 # 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