[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1687-g8603e08

[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  8603e08253b3c60aca5c775ccf1cd576535c7cf0 (commit)
      from  f94c5f642ae25b9a31611a7c696e6b0476f2306a (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=8603e08253b3c60aca5c775ccf1cd576535c7cf0


commit 8603e08253b3c60aca5c775ccf1cd576535c7cf0
Author: Gabriele Giacone <address@hidden>
Date:   Tue Jul 30 12:38:27 2013 +0200

    Make boost iostreams linked by npapi plugin only. Thanks bjacques.

diff --git a/macros/boost.m4 b/macros/boost.m4
index 6d58ab4..8ab371d 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -27,7 +27,8 @@ AC_DEFUN([GNASH_PATH_BOOST],
   gnash_boost_libdir=""
   missing_headers=""
   missing_libs=""
-  cygnal_missing_libs=""
+  missing_plugin_libs=""
+  missing_cygnal_libs=""
   gcc_version=""
   dirname=""
   libname=""
@@ -36,12 +37,13 @@ AC_DEFUN([GNASH_PATH_BOOST],
   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp 
multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp 
program_options/options_description.hpp iostreams/stream.hpp"
   dnl this is a list of *required* libraries. If any of these are missing, this
   dnl test will return a failure, and Gnash won't build.
-  boost_libs="thread program_options iostreams system"
+  boost_libs="thread program_options system"
+  boost_plugin_libs="iostreams"
 
   dnl this is a list of *recommended* libraries. If any of these are missing,
   dnl this test will return a warning, and Gnash will build, but testing
   dnl won't work.
-  cygnal_boost_libs="serialization date_time"
+  boost_cygnal_libs="serialization date_time"
 
   dnl this is the default list for paths to search. This gets
   dnl redefined if --with-boost-incl= is specified.
@@ -154,19 +156,28 @@ AC_DEFUN([GNASH_PATH_BOOST],
         fi
       done
     done
-    for j in ${cygnal_boost_libs}; do
+    for j in ${boost_plugin_libs}; do
+      dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} 
${dirname}/libboost_${j}*.a 2>/dev/null`"
+      if test -n "${dirs}"; then
+          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" 
-e "s:\.a::"`"
+        ac_cv_path_boost_plugin_lib="${ac_cv_path_boost_plugin_lib} 
-l${libname}"
+      else
+        missing_plugin_libs="${missing_plugin_libs} $j"
+      fi
+    done
+    for j in ${boost_cygnal_libs}; do
       dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} 
${dirname}/libboost_${j}*.a 2>/dev/null`"
       if test -n "${dirs}"; then
           libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" 
-e "s:\.a::"`"
         ac_cv_path_boost_cygnal_lib="${ac_cv_path_boost_cygnal_lib} 
-l${libname}"
       else
-        cygnal_missing_libs="${cygnal_missing_libs} $j"
+        missing_cygnal_libs="${missing_cygnal_libs} $j"
       fi
     done
   fi
 
   if test x"${missing_libs}" != x ; then
-    AC_MSG_WARN([Libraries ${missing_libs} ${cygnal_missing_libs} aren't 
installed ])
+    AC_MSG_WARN([Libraries ${missing_libs} ${missing_plugin_libs} 
${missing_cygnal_libs} aren't installed ])
   fi
   AC_MSG_RESULT(${ac_cv_path_boost_lib})
 
@@ -178,6 +189,10 @@ AC_DEFUN([GNASH_PATH_BOOST],
     BOOST_LIBS="$ac_cv_path_boost_lib"
   fi
 
+  if test x"${ac_cv_path_boost_plugin_lib}" != x; then
+    BOOST_PLUGIN_LIBS="$ac_cv_path_boost_plugin_lib"
+  fi
+
   if test x"${ac_cv_path_boost_cygnal_lib}" != x; then
     BOOST_CYGNAL_LIBS="$ac_cv_path_boost_cygnal_lib" 
   fi
@@ -188,6 +203,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
 
   AC_SUBST(BOOST_CFLAGS)
   AC_SUBST(BOOST_LIBS)
+  AC_SUBST(BOOST_PLUGIN_LIBS)
   AC_SUBST(BOOST_CYGNAL_LIBS)
 
   dnl This isn't right: you don't need boot date-time installed unless u build
diff --git a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
index 2d649c7..e101269 100644
--- a/plugin/npapi/Makefile.am
+++ b/plugin/npapi/Makefile.am
@@ -78,7 +78,7 @@ libgnashplugin_la_SOURCES  = plugin.cpp \
 
 libgnashplugin_la_LIBADD   = \
        $(GLIB_LIBS) \
-       -lboost_iostreams \
+       $(BOOST_PLUGIN_LIBS) \
        $(NULL)
 
 # Scriptable plugin support

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

Summary of changes:
 macros/boost.m4          |   28 ++++++++++++++++++++++------
 plugin/npapi/Makefile.am |    2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash