[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1504-gfe0264b

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  fe0264b1a53ac012f243e320c05aa7a6155110ad (commit)
      from  a2e9c6ca82c7ccfe1bd3d8d76c2c3aa4189f4d41 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=fe0264b1a53ac012f243e320c05aa7a6155110ad


commit fe0264b1a53ac012f243e320c05aa7a6155110ad
Author: Rob Savoye <address@hidden>
Date:   Fri Aug 17 10:07:02 2012 -0600

    also look for the library name without converting to lower case. Fixes 
#37112

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 9998e9a..0840ef2 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -167,14 +167,22 @@ if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = 
"xyes"; then
   AC_CACHE_VAL(ac_cv_path_$1_lib,[
   if test x"${with_$1_lib}" != x ; then
     AC_MSG_CHECKING([for lib$1 library in specified directory])
+    dnl look for the library with the lower case name
     if test -f ${with_$1_lib}/lib$name.a -o -f 
${with_$1_lib}/lib$name.${shlibext}; then
       tmp="`(cd ${with_$1_lib}; pwd)`"
       ac_cv_path_$1_lib="-L${tmp} -l$name"
       AC_MSG_RESULT([yes])
-          else
-      AC_MSG_ERROR([${with_$1_lib} directory doesn't contain library $name.])
-      AC_MSG_RESULT([no])
-          fi
+    else
+      dnl look for the library with the unchanged case name
+      if test x"${ac_cv_path_$1_lib}" = x -a -f ${with_$1_lib}/lib$1.a -o -f 
${with_$1_lib}/lib$1.${shlibext}; then
+        tmp="`(cd ${with_$1_lib}; pwd)`"
+        ac_cv_path_$1_lib="-L${tmp} -l$1"
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_ERROR([${with_$1_lib} directory doesn't contain library $name.])
+        AC_MSG_RESULT([no])
+      fi
+    fi
   fi
   ])
 

-----------------------------------------------------------------------

Summary of changes:
 macros/gnashpkgtool.m4 |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash