Hi Stepan, Roger,
* Stepan Kasal wrote on Tue, Sep 06, 2005 at 09:34:19AM CEST:
> Roger Cornelius has reported the following bug on bug-autoconf@gnu.org;
> I'm forwarding it to bug-libtool list.
>
> I have verified that the same bug is still present in CVS HEAD.
>
> As you surely notice, the patch cannot be applied as is: it would move
> the pattern "sysv4*uw2*" before the more specific "sysv4.2uw2*".
And I even looked over it and thought I had it all sorted out!
(I could blame it on missing coffee)
> But I'm sure the correction is obvious (for you, not for me ;-).
Well, to fix this goof-up of mine, I have now also applied the patches
below to CVS HEAD and branch-1-5, respectively (shown with a bit more
context to clarify what happened).
Thanks, Stepan, for mentioning this. I'm sorry I didn't see it right
away.
Cheers,
Ralf
* libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD) [ sysv4*uw2*,
sysv4.2uw2* ]: Fix my last checkin to really match the more special
case before the general case.
Reported by Stepan Kasal <[EMAIL PROTECTED]>.
Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.14
diff -u -U5 -r1.14 libtool.m4
--- libltdl/m4/libtool.m4 6 Sep 2005 08:18:10 -0000 1.14
+++ libltdl/m4/libtool.m4 6 Sep 2005 08:54:59 -0000
@@ -2815,11 +2815,11 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]*)
lt_cv_deplibs_check_method=pass_all
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in
@@ -2841,10 +2841,14 @@
;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac
+ ;;
+
+sysv4*uw2* | unixware7*)
+ lt_cv_deplibs_check_method=pass_all
;;
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
* libtool.m4 (AC_DEPLIBS_CHECK_METHOD) [ sysv4*uw2*,
sysv4.2uw2* ]: Fix my last checkin to really match the more special
case before the general case.
Reported by Stepan Kasal <[EMAIL PROTECTED]>.
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.107
diff -u -U5 -r1.314.2.107 libtool.m4
--- libtool.m4 6 Sep 2005 08:18:34 -0000 1.314.2.107
+++ libtool.m4 6 Sep 2005 08:55:49 -0000
@@ -2312,11 +2312,11 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]*)
lt_cv_deplibs_check_method=pass_all
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in
@@ -2338,10 +2338,14 @@
;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac
+ ;;
+
+sysv4*uw2* | unixware7*)
+ lt_cv_deplibs_check_method=pass_all
;;
esac
])
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
