Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-26 Thread Christophe Jarry
> I just committed a slightly modified patch in your name.

Thank you very much Peter.

Christophe



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-25 Thread Peter O'Gorman

On 09/05/2011 02:10 PM, Christophe Jarry wrote:

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


I just committed a slightly modified patch in your name.

Peter



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-12 Thread Paolo Bonzini

On 09/04/2011 03:22 PM, Ralf Wildenhues wrote:

>  -# This must be Linux ELF.
>  +# This must be GNU/Linux ELF.

The comment does not match the code below it, see the following line.
Not your fault, and generally I don't want to take patches hostage on
unrelated bugs, but*please*  make this
   # This must be GNU userland with ELF and


On the same line, in the documentation it is almost invariably better to 
mention glibc rather than GNU/Linux.


Paolo



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-11 Thread Christophe Jarry
Dear developers,

Some days ago, I did post a patch to fix bug #9210
(http://lists.gnu.org/archive/html/libtool-patches/2011-09/msg00013.html). As
far as I can see on http://git.savannah.gnu.org/cgit/libtool.git/log/, the
patch has not been applied yet.

Is there something wrong in the patch? If it is, please tell me what the
problem is.

Thanks,

Christophe



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-05 Thread Bob Friesenhahn

On Mon, 5 Sep 2011, Christophe Jarry wrote:


Please learn to use git for sending patches; thanks!


The new patch is attached.

Please tell me if there are still issues with it.


This patch looks ok to apply to me.

Bob
--
Bob Friesenhahn
bfrie...@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
GraphicsMagick Maintainer,http://www.GraphicsMagick.org/



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-05 Thread Christophe Jarry
> 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 
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 .
 
@@ -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 independe

Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-04 Thread Christophe Jarry
Hello Ralf,

On Sun, 04 Sep 2011 15:22:55 +0200
"Ralf Wildenhues"  wrote:

> > --- libtool.orig/libltdl/config/ltmain.m4sh 2011-08-31
> > 21:50:53.0 +0200 +++ libtool.new/libltdl/config/ltmain.m4sh
> > 2011-09-04 12:27:53.0 +0200
> 
> Please learn to use git for sending patches; thanks!

Please tell me precisely how I should send a patch to you the good way.

> > -# No shared lib support for Linux oldld, aout, or coff.
> > +# No shared lib support for GNU/Linux oldld, aout, or coff.
> 
> Ugh.  What is oldld?  Is it Linux or GNU specific (or both)?
> Because the urge to call something GNU/Linux is definitely only valid for
> things that are, in fact, not just one of the two.

That is why I wrote in my first message
(http://lists.gnu.org/archive/html/libtool-patches/2011-09/msg2.html):

I may have replaced "Linux" by "GNU/Linux" even if "Linux" was used to refer
to the "kernel Linux". If that is the case somewhere in the patch, please
tell me and explain me. I will modify my patch accordingly.

So are "oldld", "aout" and "coff" things from the kernel Linux? If not, where do
they come from?

Christophe



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-04 Thread Ralf Wildenhues
Hello Christophe,

* Christophe Jarry wrote on Sun, Sep 04, 2011 at 12:55:37PM CEST:
> --- libtool.orig/libltdl/config/ltmain.m4sh   2011-08-31 21:50:53.0 
> +0200
> +++ libtool.new/libltdl/config/ltmain.m4sh2011-09-04 12:27:53.0 
> +0200

Please learn to use git for sending patches; thanks!

> @@ -6605,7 +6605,7 @@
>   none) ;;
>  
>   darwin)
> -   # Like Linux, but with the current version available in
> +   # Like GNU/Linux, but with the current version available in

This should be "Like linux", because it speaks about version_type names.

> # verstring for coding it into the library header
> func_arith $current - $age
> major=.$func_arith_result

> --- libtool.orig/libltdl/m4/libtool.m42011-08-31 21:50:53.0 
> +0200
> +++ libtool.new/libltdl/m4/libtool.m4 2011-09-04 12:27:36.0 +0200
> @@ -2633,12 +2633,12 @@
>hardcode_into_libs=yes
>;;
>  
> -# No shared lib support for Linux oldld, aout, or coff.
> +# No shared lib support for GNU/Linux oldld, aout, or coff.

Ugh.  What is oldld?  Is it Linux or GNU specific (or both)?
Because the urge to call something GNU/Linux is definitely only valid for
things that are, in fact, not just one of the two.

>  linux*oldld* | linux*aout* | linux*coff*)
>dynamic_linker=no
>;;
>  
> -# This must be Linux ELF.
> +# This must be GNU/Linux ELF.

The comment does not match the code below it, see the following line.
Not your fault, and generally I don't want to take patches hostage on
unrelated bugs, but *please* make this
  # This must be GNU userland with ELF and 

>  linux* | k*bsd*-gnu | kopensolaris*-gnu)
>version_type=linux
>need_lib_prefix=no
> @@ -3284,7 +3284,7 @@
>lt_cv_deplibs_check_method=pass_all
>;;
>  
> -# This must be Linux ELF.
> +# This must be GNU/Linux ELF.

Ditto.

>  linux* | k*bsd*-gnu | kopensolaris*-gnu)
>lt_cv_deplibs_check_method=pass_all
>;;
> @@ -4066,7 +4066,7 @@
> cxx*)
>   # Compaq C++
>   # Make sure the PIC flag is empty.  It appears that all Alpha
> - # Linux and Compaq Tru64 Unix objects are PIC.
> + # GNU/Linux and Compaq Tru64 Unix objects are PIC.

An object compiled with Compaq C++ bears no connection a priori with GNU.
I think the statement before is wrong on more grounds, but I'm too lazy
to dig history now; please just leave it as it is.  Thanks.

>   _LT_TAGVAR(lt_prog_compiler_pic, $1)=
>   _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>   ;;
> @@ -4121,7 +4121,7 @@
>   # Digital/Compaq C++
>   _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>   # Make sure the PIC flag is empty.  It appears that all Alpha
> - # Linux and Compaq Tru64 Unix objects are PIC.
> + # GNU/Linux and Compaq Tru64 Unix objects are PIC.

Ditto.

>   _LT_TAGVAR(lt_prog_compiler_pic, $1)=
>   _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>   ;;

Thanks,
Ralf



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-04 Thread Christophe Jarry

> Version type = linux has been used in libtool for a long time, changing it is
> pointless, not in any way called for by the GNU coding standards,

I understand that the value "linux" of the variable "version_type" is
acceptable according to the GNU coding standards. I think the documentation
would have been more consistent with the value "gnu-linux" though.

> and will likely lead to bugs.

Definitely.

I have attached to this mail an updated version of my previous patch.

Christophe
diff -Naur libtool.orig/doc/libtool.texi libtool.new/doc/libtool.texi
--- libtool.orig/doc/libtool.texi	2011-08-31 21:50:53.0 +0200
+++ libtool.new/doc/libtool.texi	2011-09-04 12:30:18.0 +0200
@@ -3784,7 +3784,7 @@
 
 @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 @@
 @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 @@
 
 @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 @@
 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 -Naur libtool.orig/doc/notes.texi libtool.new/doc/notes.texi
--- libtool.orig/doc/notes.texi	2011-08-31 21:50:53.0 +0200
+++ libtool.new/doc/notes.texi	2011-09-04 12:25:56.0 +0200
@@ -68,7 +68,7 @@
 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 -Naur libtool.orig/libltdl/config/ltmain.m4sh libtool.new/libltdl/config/ltmain.m4sh
--- libtool.orig/libltdl/config/ltmain.m4sh	2011-08-31 21:50:53.0 +0200
+++ libtool.new/libltdl/config/ltmain.m4sh	2011-09-04 12:27:53.0 +0200
@@ -6605,7 +6605,7 @@
 	none) ;;
 
 	darwin)
-	  # Like Linux, but with the current version available in
+	  # Like GNU/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 -Naur libtool.orig/libltdl/m4/libtool.m4 libtool.new/libltdl/m4/libtool.m4
--- libtool.orig/libltdl/m4/libtool.m4	2011-08-31 21:50:53.0 +0200
+++ libtool.new/libltdl/m4/libtool.m4	2011-09-04 12:27:36.0 +0200
@@ -2633,12 +2633,12 @@
   hardcode_into_libs=yes
   ;;
 
-# No shared lib support for Linux oldld, aout, or coff.
+# No shared lib support for GNU/Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be GNU/Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -3284,7 +3284,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be GNU/Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4066,7 +4066,7 @@
 	  cxx*)
 	# Compaq C++
 	# Make sure the PIC flag is empty.  It appears that all Alpha
-	# Linux and Compaq Tru64 Unix objects are PIC.
+	# GNU/Linux and Compaq Tru64 Unix objects are PIC.
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	;;
@@ -4121,7 +4121,7 @@
 	# Digital/Compaq C++
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	# Make sure the PIC flag is empty.  It appears that all Alpha
-	# Linux and Compaq Tru64 Unix objects are PIC.
+	# GNU/Linux and Compaq Tru64 Unix objects are PIC.
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	;;
diff -Naur libtool.orig/libltdl/README libtool.new/libltdl/README
--- libtool.orig/libltdl/README	2011-08-31 21:50:53.0 +0200
+++ libtool.new/libltdl/README	2011-09-04 12:25:56.0 +0200
@@ -1,7 +1,7 @@
 This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
 
 It supports the following dlopen in

Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-04 Thread Peter O'Gorman

On Sep 4, 2011, at 1:05 AM, Christophe Jarry wrote:

> On Sat, 03 Sep 2011 16:34:51 -0500
> Peter O'Gorman  wrote:
> 
>> Please do not change the version type for libtool library versioning 
>> from linux to gnu-linux. [...] I object to this change.
> 
> Could you please explain to me why you object to this change?

I am willing to change the documentation and even the comments, I am not 
willing to change variable names or their values. Version type = linux has been 
used in libtool for a long time, changing it is pointless, not in any way 
called for by the GNU coding standards,  and will likely lead to bugs.

Peter





Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-03 Thread Christophe Jarry
On Sat, 03 Sep 2011 16:34:51 -0500
Peter O'Gorman  wrote:

> Please do not change the version type for libtool library versioning 
> from linux to gnu-linux. [...] I object to this change.

Could you please explain to me why you object to this change?

Thanks,

Christophe



Re: Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-03 Thread Peter O'Gorman

On 09/03/2011 02:10 PM, Christophe Jarry wrote:

Dear developers,

I have reported the following bug on  (see
http://lists.gnu.org/archive/html/bug-libtool/2011-07/msg2.html and
http://lists.gnu.org/archive/html/bug-libtool/2011-08/msg1.html).

On the documentation of libtool, the word "linux" is sometimes used to refer to
the entire free software system that uses the kernel Linux. According to the GNU
project's "Information for Maintainers of GNU Software", maintainers of GNU
programs have to name the entire system
"GNU/Linux" (http://www.gnu.org/prep/maintain/maintain.html#Preface and
http://www.gnu.org/prep/maintain/maintain.html#GNU-and-Linux).

So here is a patch to fix this bug in various parts of GNU libtool:



- core files libltdl/config/ltmain.m4sh and libltdl/m4/libtool.m4.


Please do not change the version type for libtool library versioning 
from linux to gnu-linux. I don't really mind the documentation changes, 
but I object to this change.


Peter





Bug 9210: fix to replace Linux with GNU/Linux where needed

2011-09-03 Thread Christophe Jarry
Dear developers,

I have reported the following bug on  (see
http://lists.gnu.org/archive/html/bug-libtool/2011-07/msg2.html and
http://lists.gnu.org/archive/html/bug-libtool/2011-08/msg1.html).

On the documentation of libtool, the word "linux" is sometimes used to refer to
the entire free software system that uses the kernel Linux. According to the GNU
project's "Information for Maintainers of GNU Software", maintainers of GNU
programs have to name the entire system
"GNU/Linux" (http://www.gnu.org/prep/maintain/maintain.html#Preface and
http://www.gnu.org/prep/maintain/maintain.html#GNU-and-Linux).

So here is a patch to fix this bug in various parts of GNU libtool:

- documentation,
- files HACKING, libltdl/README and TODO,
- core files libltdl/config/ltmain.m4sh and libltdl/m4/libtool.m4.

I have not changed the files that won't be modified in the future as those
files are used for an historical purpose. This includes files Changelog* and
files under the "mail" directory. If it is a problem, please tell me.

I may have replaced "Linux" by "GNU/Linux" even if "Linux" was used to refer to
the "kernel Linux". If that is the case somewhere in the patch, please tell me
and explain me. I will modify my patch accordingly.

Thanks,

Christophe
diff -Naur libtool.orig/doc/libtool.texi libtool/doc/libtool.texi
--- libtool.orig/doc/libtool.texi	2011-08-31 21:50:53.0 +0200
+++ libtool/doc/libtool.texi	2011-08-31 22:10:53.0 +0200
@@ -3784,7 +3784,7 @@
 
 @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 @@
 @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 @@
 
 @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 @@
 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},
@@ -7120,7 +7120,7 @@
 
 @defvar version_type
 The library version numbering type.  One of @samp{libtool},
-@samp{freebsd-aout}, @samp{freebsd-elf}, @samp{irix}, @samp{linux},
+@samp{freebsd-aout}, @samp{freebsd-elf}, @samp{irix}, @samp{gnu-linux},
 @samp{osf}, @samp{sunos}, @samp{windows}, or @samp{none}.
 @end defvar
 
diff -Naur libtool.orig/doc/notes.texi libtool/doc/notes.texi
--- libtool.orig/doc/notes.texi	2011-08-31 21:50:53.0 +0200
+++ libtool/doc/notes.texi	2011-08-31 21:54:10.0 +0200
@@ -68,7 +68,7 @@
 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 -Naur libtool.orig/HACKING libtool/HACKING
--- libtool.orig/HACKING	2011-08-31 21:50:53.0 +0200
+++ libtool/HACKING	2011-09-03 20:07:19.0 +0200
@@ -154,14 +154,14 @@
 * If the changes are particular to certain architectures, they should be
   listed after the functions in square brackets:
 
-	* file, another/file (func_foo) [linux, solaris]: Description of
+	* file, another/file (func_foo) [gnu-linux, solaris]: Description of
 	changes.
 
 * Subsequent changes in other files that are related to the same overall
   enhancement or bugfix should be listed concurrently, without blank
   lines.  Always start a fresh line for a new file:
 
-	* file, another/file (func_foo) [linux, solaris]: Description of
+	* file, another/file (func_foo) [gnu-linux, solaris]: Description of
 	changes.
 	* doc/foo.texi (Invoking Foo): Document.
 	* NEWS: Updated.
diff -Naur libtool.orig/libltdl/config/ltmain.m4sh libtool/libltdl/config/ltmain.m4sh
--- libtool.orig/libltdl/config/ltmain.m4sh	2011-08-31 21:50:53.0 +0200
+++ libtool/libltdl/config/ltmain.m4sh	2011-09-03 20:09:08.0 +0200
@@ -6540,7 +6540,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  darwin|gnu-linux|osf|windows|none)
 	func_arith $number_major + $number_minor
 	curr