[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2179-g094dc45 |
Date: |
Sun, 01 Feb 2015 23:31:34 +0000 |
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 094dc45b2dc1005b41243722042a4ecca8cf535e (commit)
from 4a9aa741130b8b482e066abc1b80240605408f9b (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=094dc45b2dc1005b41243722042a4ecca8cf535e
commit 094dc45b2dc1005b41243722042a4ecca8cf535e
Author: Bastiaan Jacques <address@hidden>
Date: Mon Feb 2 00:29:39 2015 +0100
Drop defunct code unused since e6a1acfef2, which also resolves Savannah
#33904.
diff --git a/macros/boost.m4 b/macros/boost.m4
index d02689f..188a806 100644
--- a/macros/boost.m4
+++ b/macros/boost.m4
@@ -22,7 +22,6 @@ dnl regex, serialization, signals, unit test, thead, and wave.
AC_DEFUN([GNASH_PATH_BOOST],
[
dnl start variables with a known value
- gnash_boost_version=""
gnash_boost_topdir=""
gnash_boost_libdir=""
missing_headers=""
@@ -53,7 +52,6 @@ AC_DEFUN([GNASH_PATH_BOOST],
AC_ARG_WITH(boost_incl, AC_HELP_STRING([--with-boost-incl], [directory where
boost headers are]), with_boost_incl=${withval})
if test x"${with_boost_incl}" != x ; then
gnash_boost_topdir="`(cd ${with_boost_incl}; pwd)`"
- gnash_boost_version="`echo ${gnash_boost_topdir} | sed -e 's:.*boost-::'`"
newlist=${gnash_boost_topdir}
fi
@@ -62,19 +60,6 @@ AC_DEFUN([GNASH_PATH_BOOST],
gcc_version="`${CXX} --version | head -1 | cut -d ' ' -f 3 | cut -d '.'
-f 1-2 | tr -d '.'`"
fi
- if test x"${gnash_boost_topdir}" = x; then
- dnl Attempt to find the top level directory, which unfortunately has a
- dnl version number attached. At least on Debian based systems, this
- dnl doesn't seem to get a directory that is unversioned.
- if test x$cross_compiling = xno; then
- if test x"$PKG_CONFIG" != x; then
- AC_MSG_CHECKING([for the Boost Version])
- $PKG_CONFIG --exists boost && gnash_boost_version="`$PKG_CONFIG
--modversion boost | cut -d "." -f 1 | awk '{print $'0'".0"}'`"
- AC_MSG_RESULT(${gnash_boost_version})
- fi
- fi
- fi
-
AC_MSG_CHECKING([for boost header])
for i in $newlist; do
gnash_boost_topdir=/usr/include/boost
@@ -83,7 +68,6 @@ AC_DEFUN([GNASH_PATH_BOOST],
if test -n "$u" -a -d "$u" -a x"$u" != x"/usr/include/boost"; then
gnash_boost_topdir="`(cd $u; pwd)`"
gnash_boost_subdir="`dirname ${gnash_boost_topdir}`"
- gnash_boost_version="`echo ${gnash_boost_topdir} | sed -e
's:.*boost-::'`"
dnl Fix for packaging systems not adding extra fluff to the path-name.
for k in ${boost_headers}; do
if test ! -f ${gnash_boost_topdir}/boost/$k; then
-----------------------------------------------------------------------
Summary of changes:
macros/boost.m4 | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2179-g094dc45,
Bastiaan Jacques <=