[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1280-g23b5ee4

[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  23b5ee46323b8460dbbb90d676c2f0ba30e789d6 (commit)
       via  51d52b1e307969159add8d5a52d7ec0a9f42c1ae (commit)
      from  e43fcace72d8de544a72ce33ee531f800dbe4ceb (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=23b5ee46323b8460dbbb90d676c2f0ba30e789d6


commit 23b5ee46323b8460dbbb90d676c2f0ba30e789d6
Author: Gabriele Giacone <address@hidden>
Date:   Wed Dec 7 00:34:53 2011 +0100

    Add multiarch paths on dpkg systems only.

diff --git a/configure.ac b/configure.ac
index ab9e940..77ca58b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,10 +503,12 @@ if test x$cross_compiling = xyes; then
   npapi=no
 else
   AC_MSG_NOTICE([Configuring Gnash for native compilation])
-  export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
   export incllist="`eval cat ${srcdir}/macros/incllist`"
   libslist="`cat ${srcdir}/macros/libslist`"
-  export libslist="${libslist} /lib/${DEB_HOST_MULTIARCH} 
/usr/lib/${DEB_HOST_MULTIARCH}"
+  if test -f /usr/bin/dpkg-architecture; then
+    export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
+    export libslist="${libslist} /lib/${DEB_HOST_MULTIARCH} 
/usr/lib/${DEB_HOST_MULTIARCH}"
+  fi
   export pathlist=$PATH
 fi
 

http://git.savannah.gnu.org/cgit//commit/?id=51d52b1e307969159add8d5a52d7ec0a9f42c1ae


commit 51d52b1e307969159add8d5a52d7ec0a9f42c1ae
Author: Gabriele Giacone <address@hidden>
Date:   Wed Dec 7 00:27:48 2011 +0100

    Fix boost::iostreams headers detection on openbsd.

diff --git a/macros/boost.m4 b/macros/boost.m4
index c672870..845aaae 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -34,7 +34,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
   libname=""
   dnl this is a list of *required* headers. If any of these are missing, this
   dnl test will return a failure, and Gnash won't build.
-  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 boost/iostreams/stream.hpp"
+  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"

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

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


hooks/post-receive
-- 
Gnash