CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 07/10/17 21:30:26
Modified files:
. : ChangeLog configure.ac
macros : boost.m4
Log message:
* configure: Always print BOOST_{CFLAGS, LIBS}
* macros/boost.m4: Detect boost correctly by two steps. Added
GXX.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4624&r2=1.4625
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.429&r2=1.430
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.65&r2=1.66
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4624
retrieving revision 1.4625
diff -u -b -r1.4624 -r1.4625
--- ChangeLog 17 Oct 2007 21:09:55 -0000 1.4624
+++ ChangeLog 17 Oct 2007 21:30:25 -0000 1.4625
@@ -15,6 +15,8 @@
2007-10-17 Markus Gothe <[EMAIL PROTECTED]>
* server/asobj/NetStream.h: MIPSPro work-around.
+ * configure: Always print BOOST_{CFLAGS, LIBS}
+ * macros/boost.m4: Detect boost correctly by two steps. Added GXX.
2007-10-16 Sandro Santilli <[EMAIL PROTECTED]>
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -b -r1.429 -r1.430
--- configure.ac 17 Oct 2007 17:05:55 -0000 1.429
+++ configure.ac 17 Oct 2007 21:30:25 -0000 1.430
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.429 2007/10/17 17:05:55 strk Exp $
+dnl $Id: configure.ac,v 1.430 2007/10/17 21:30:25 nihilus Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -2078,10 +2078,10 @@
if test x"$BOOST_LIBS" != x; then
dnl Only cygnal requires date_time at present, so it's OK if either
dnl you don't want cygnal or do have date_time installed.
- if test x"$cygnal" = xno; then
+ dnl if test x"$cygnal" = xno; then
echo " BOOST flags are: $BOOST_CFLAGS"
echo " BOOST libs are: $BOOST_LIBS"
- fi
+ dnl fi
if test x"${missing_headers}" != x; then
for i in ${missing_headers}; do
# They have some boost libs but no date_time and want to compile cygnal.
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- macros/boost.m4 13 Oct 2007 23:24:07 -0000 1.65
+++ macros/boost.m4 17 Oct 2007 21:30:26 -0000 1.66
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: boost.m4,v 1.65 2007/10/13 23:24:07 rsavoye Exp $
+dnl $Id: boost.m4,v 1.66 2007/10/17 21:30:26 nihilus Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -42,7 +42,7 @@
dnl redefined if --with-boost-incl= is specified.
newlist=$incllist
- dnl Lool for the header
+ dnl Look for the header
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)`
@@ -51,7 +51,9 @@
fi
dnl munge the GCC version number, which Boost uses to label it's libraries.
+ if test x"${GXX}" = xyes; then
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
@@ -71,11 +73,16 @@
dirs=`ls -dr $i/boost* 2>/dev/null`
if test -n "${dirs}"; then
gnash_boost_topdir=`(cd ${dirs}; 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 -a ! -f
${gnash_boost_topdir}/$k; then
+ if test ! -f ${gnash_boost_topdir}/boost/$k; then
+ if test ! -f ${gnash_boost_subdir}/boost/$k; then
missing_headers="${missing_headers} $k"
+ else
+ gnash_boost_topdir=${gnash_boost_subdir}
+ fi
fi
done
if test x"${missing_headers}" = x ; then
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
