aboutsummaryrefslogtreecommitdiffstats
path: root/aclocal.m4
diff options
context:
space:
mode:
authormichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2007-01-14 06:51:20 +0000
committermichael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2007-01-14 06:51:20 +0000
commit48364cbf8a8884388c3c0a8b4d0fe0bfea9fb1e9 (patch)
tree90a203523180f00ba638d6c1c9f4523ffe5ca2ed /aclocal.m4
parent8c30e45b24af21f3c4b147a06d9c367d30f62286 (diff)
downloadlcd4linux-48364cbf8a8884388c3c0a8b4d0fe0bfea9fb1e9.tar.gz
switch from CVS to SVN
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@724 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m424
1 files changed, 19 insertions, 5 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 0bd7b2f..1b32358 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -224,7 +224,7 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
AC_LIB_PROG_LD_GNU
])
-# lib-link.m4 serial 8 (gettext-0.15)
+# lib-link.m4 serial 9 (gettext-0.16)
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,
@@ -424,9 +424,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
@@ -446,9 +453,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