> Please learn to use git for sending patches; thanks!
The new patch is attached.
Please tell me if there are still issues with it.
Christophe
>From 965eb1b22d3350ee24765b0c115a91512a382f3d Mon Sep 17 00:00:00 2001
From: Christophe Jarry <christophe.ja...@ouvaton.org>
Date: Mon, 5 Sep 2011 20:49:19 +0200
Subject: [PATCH] Replace Linux with GNU/Linux where appropriate
---
TODO | 20 ++++++++++----------
doc/libtool.texi | 8 ++++----
doc/notes.texi | 2 +-
libltdl/README | 6 +++---
libltdl/config/ltmain.m4sh | 2 +-
libltdl/m4/libtool.m4 | 4 ++--
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/TODO b/TODO
index ee43037..cbfd8cf 100644
--- a/TODO
+++ b/TODO
@@ -58,7 +58,7 @@ GNU Libtool
* Audit file listing in libtool.m4.
-* Fix deplibs_check_method=pass_all (which is wrong!) on linux.
+* Fix deplibs_check_method=pass_all (which is wrong!) on GNU/Linux.
* Fix -dlopen "self" on AIX. Reported by Gary Kumfert <kumf...@llnl.gov>.
@@ -290,15 +290,15 @@ GNU Libtool
and central_unixish_to_mingw would still do all the work (with its guts
customized based on $build).
- For more reasonable cross environments (e.g. linux->some_embedded) I think
- you could probably work out a general M+N scheme, since most embedded $hosts
- aren't as strange as the win32 variants -- even VxWorks and INTEGRITY have
- basic, unix-like file systems (although INTEGRITY does have multiple roots).
- Aggressive use of the m4 function_replace machinery WOULD be appropriate for
- /these/ conversion functions. OTOH...(a) you can't run the $host apps on
- $build anyway, in these embedded situations. At best you'd use $TARGETSHELL
- and "run" them via a remote connection, and (b) they don't use the C
- wrapper!
+ For more reasonable cross environments (e.g. GNU/Linux->some_embedded) I
+ think you could probably work out a general M+N scheme, since most embedded
+ $hosts aren't as strange as the win32 variants -- even VxWorks and INTEGRITY
+ have basic, unix-like file systems (although INTEGRITY does have multiple
+ roots). Aggressive use of the m4 function_replace machinery WOULD be
+ appropriate for /these/ conversion functions. OTOH...(a) you can't run the
+ $host apps on $build anyway, in these embedded situations. At best you'd use
+ $TARGETSHELL and "run" them via a remote connection, and (b) they don't use
+ the C wrapper!
So...I don't think it makes much difference *right now* in the amount of
code required, or the number of functions implemented. At some point in the
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 72bb0fc..d044844 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -3784,7 +3784,7 @@ libltdl supports currently the following dynamic linking mechanisms:
@itemize @bullet
@item
-@code{dlopen} (Solaris, Linux and various BSD flavors)
+@code{dlopen} (Solaris, GNU/Linux and various BSD flavors)
@item
@code{shl_load} (HP-UX)
@item
@@ -3823,7 +3823,7 @@ distribution terms that you use for the rest of that program.
@section How to use libltdl in your programs
@noindent
-The libltdl API is similar to the dlopen interface of Solaris and Linux,
+The libltdl API is similar to the dlopen interface of Solaris and GNU/Linux,
which is very simple but powerful.
@noindent
@@ -3945,7 +3945,7 @@ This search path is the value of the environment variable
@item system library search path:
The system dependent library search path
-(e.g.@: on Linux it is @env{LD_LIBRARY_PATH}).
+(e.g.@: on GNU/Linux it is @env{LD_LIBRARY_PATH}).
@end enumerate
Each search path must be a list of absolute directories separated by
@@ -5372,7 +5372,7 @@ uninstalled correctly.
The @file{tests/mdemo} subdirectory contains a demonstration of a
package that uses libtool and the system independent dlopen wrapper
@file{libltdl} to load modules. The library @file{libltdl} provides a
-dlopen wrapper for various platforms (Linux, Solaris, HP/UX etc.)
+dlopen wrapper for various platforms (GNU/Linux, Solaris, HP/UX etc.)
including support for dlpreopened modules (@pxref{Dlpreopening}).
The tests matching @file{mdemo-*make.test}, @file{mdemo-*exec.test},
diff --git a/doc/notes.texi b/doc/notes.texi
index 44b50d1..57fc6d5 100644
--- a/doc/notes.texi
+++ b/doc/notes.texi
@@ -68,7 +68,7 @@ to use autoconf-mode, which is distributed with GNU Emacs 21, Autoconf itself,
and all recent releases of XEmacs.
@item
-When building on some linux systems for multilib targets
+When building on some GNU/Linux systems for multilib targets
@command{libtool} sometimes guesses the wrong paths that the linker
and dynamic linker search by default. If this occurs, you may override
libtool's guesses at @command{configure} time by setting the
diff --git a/libltdl/README b/libltdl/README
index 54b1aea..e61a97a 100644
--- a/libltdl/README
+++ b/libltdl/README
@@ -1,15 +1,15 @@
This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
It supports the following dlopen interfaces:
-* dlopen (Solaris, Linux and various BSD flavors)
+* dlopen (Solaris, GNU/Linux and various BSD flavors)
* shl_load (HP-UX)
* LoadLibrary (Win16 and Win32)
* load_add_on (BeOS)
* GNU DLD (emulates dynamic linking for static libraries)
* dyld (darwin/Mac OS X)
* libtool's dlpreopen
---
- Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+--
+ Copyright (C) 1999, 2003, 2011 Free Software Foundation, Inc.
Written by Thomas Tanner, 1999
This file is part of GNU Libtool.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 511480f..9ffac83 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6608,7 +6608,7 @@ func_mode_link ()
none) ;;
darwin)
- # Like Linux, but with the current version available in
+ # Like linux, but with the current version available in
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 2ed41b7..65bf4fa 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2638,7 +2638,7 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
+# This must be GNU userland with ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
@@ -3284,7 +3284,7 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
+# This must be GNU userland with ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
--
1.5.6.5
