[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2132-gfb38a90

[Gabriele Giacone]

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  fb38a90ab0fd40661786c41a8ed92dab696a1192 (commit)
      from  ba505c9266bd3d2f4990eeb1fc56a8bac360402a (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=fb38a90ab0fd40661786c41a8ed92dab696a1192


commit fb38a90ab0fd40661786c41a8ed92dab696a1192
Author: Michał Górny <address@hidden>
Date:   Thu Sep 15 12:59:55 2011 +0200

    Support building against NPAPI-SDK as well.

diff --git a/macros/npapi.m4 b/macros/npapi.m4
index 7356fb6..2e0147a 100644
--- a/macros/npapi.m4
+++ b/macros/npapi.m4
@@ -34,7 +34,11 @@ AC_DEFUN([GNASH_PATH_NPAPI],
 
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_npapi_incl}" = x; then
-      $PKG_CONFIG --exists mozilla-plugin && NPAPI_CFLAGS="`$PKG_CONFIG 
--cflags mozilla-plugin`"
+      if $PKG_CONFIG --exists npapi-sdk; then
+        NPAPI_CFLAGS="`$PKG_CONFIG --cflags npapi-sdk`"
+      elif $PKG_CONFIG --exists mozilla-plugin; then
+        NPAPI_CFLAGS="`$PKG_CONFIG --cflags mozilla-plugin`"
+      fi
     fi
   fi
 

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

Summary of changes:
 macros/npapi.m4 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash