Mercurial > hg > octave-kai > gnulib-hg
changeset 7249:981631cda9ef
Support for mingw DLLs.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 04 Sep 2006 11:54:06 +0000 |
| parents | edd0f5855283 |
| children | b188d0ecb399 |
| files | m4/ChangeLog m4/lib-link.m4 |
| diffstat | 2 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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 @@ 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 @@ 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