[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2172-g9957d02

[Sandro Santilli]

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  9957d022bfa63e87a2d5dd9719c2d0c071d977d6 (commit)
      from  e8c2a2e55939d1040e8b2099e32158cab7b32a46 (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=9957d022bfa63e87a2d5dd9719c2d0c071d977d6


commit 9957d022bfa63e87a2d5dd9719c2d0c071d977d6
Author: Sandro Santilli <address@hidden>
Date:   Tue Jan 20 22:19:44 2015 +0100

    Do not allow building a broken npapi plugin
    
    The plugin relies on boost iostream being installed, with this commit
    the presence is checked. It also fixes checks for cygnal-required libs
    which was broken by commit  8603e08253b3c60aca5c775ccf1cd576535c7cf0

diff --git a/configure.ac b/configure.ac
index 10e7b49..981a22c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2926,8 +2926,8 @@ AC_SUBST(HWACCEL_CONFIG)
 
 dnl check for missing libraries and disable them.
 if test x"$BOOST_LIBS" != x; then
-  if test x"${cygnal_missing_libs}" != x; then
-    for i in ${cygnal_missing_libs}; do
+  if test x"${missing_cygnal_libs}" != x; then
+    for i in ${missing_cygnal_libs}; do
       if test $i = serialization; then
         AC_DEFINE([BOOST_MULTI_INDEX_DISABLE_SERIALIZATION], ["1"], [if the 
library is missing, don't use it.])
       fi
@@ -3819,8 +3819,8 @@ if test x"$BOOST_LIBS" != x; then
   fi
 
   if test x"${cygnal}" = x"yes"; then
-    if test x"${cygnal_missing_libs}" != x; then
-      for i in ${cygnal_missing_libs}; do
+    if test x"${missing_cygnal_libs}" != x; then
+      for i in ${missing_cygnal_libs}; do
         PKG_ERR([No Boost $i package installed])
         PKG_SUGGEST([Install it from http://www.boost.org])
         debtmppkg="libboost-`echo ${i} | sed 's/_/-/g'`-dev"
@@ -3830,6 +3830,18 @@ if test x"$BOOST_LIBS" != x; then
     fi
   fi
 
+  if test x"${npapi}" = x"yes"; then
+    if test x"${missing_plugin_libs}" != x; then
+      for i in ${missing_plugin_libs}; do
+        PKG_ERR([No Boost $i package installed])
+        PKG_SUGGEST([Install it from http://www.boost.org])
+        debtmppkg="libboost-`echo ${i} | sed 's/_/-/g'`-dev"
+        DEB_INSTALL([$debtmppkg])
+        PKG_ALTERNATIVE([or configure with --disable-npapi])
+      done
+    fi
+  fi
+
   if test x"${missing_libs}" != x; then
     for i in ${missing_libs}; do
       PKG_ERR([No Boost $i package installed])
diff --git a/macros/boost.m4 b/macros/boost.m4
index 280c7ab..d02689f 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -168,7 +168,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
     done
   fi
 
-  if test x"${missing_libs}" != x ; then
+  if test x"${missing_libs}" != x -o x"${missing_plugin_libs}" != x -o 
x"${missing_cygnal_libs}" != x; then
     AC_MSG_WARN([Libraries ${missing_libs} ${missing_plugin_libs} 
${missing_cygnal_libs} aren't installed ])
   fi
   AC_MSG_RESULT(${ac_cv_path_boost_lib})

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

Summary of changes:
 configure.ac    |   20 ++++++++++++++++----
 macros/boost.m4 |    2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash