Support for mingw DLLs.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 944f2a2ebd3f484447093bcd33d2ff75adebc381..f3c708078ec524234848b19fca4794598f7bbb86 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-03  Bruno Haible  <bruno@clisp.org>
+
+       * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Locate mingw shared libraries
+       correctly.
+
 2006-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
        * getloadavg.m4 (gl_GETLOADAVG): Use CONFIGURING_GETLOADAVG,
@@ -52,6 +57,7 @@
 
        * inttypes.m4 (gl_INTTYPES_H): Don't test for the existence of SCNX*
        macros.
+       Reported by Eric Blake.
 
 2006-08-22  Eric Blake  <ebb9@byu.net>
 

diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 92929193f197e91f16a110021afb0f665d7867a9..a196556c24be2a5c44d5f887901ee57f4876c217 100644 (file)
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 8 (gettext-0.15)
+# lib-link.m4 serial 9 (gettext-0.15.1)
 dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -198,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -220,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi