[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash macros/boost.m4 ChangeLog
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash macros/boost.m4 ChangeLog |
Date: |
Sun, 11 Mar 2007 05:17:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/03/11 05:17:15
Modified files:
macros : boost.m4
. : ChangeLog
Log message:
More tweaks to get rid of duplicate entries.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2603&r2=1.2604
Patches:
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- macros/boost.m4 11 Mar 2007 00:15:55 -0000 1.34
+++ macros/boost.m4 11 Mar 2007 05:17:14 -0000 1.35
@@ -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.34 2007/03/11 00:15:55 rsavoye Exp $
+dnl $Id: boost.m4,v 1.35 2007/03/11 05:17:14 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -74,14 +74,12 @@
AC_MSG_CHECKING([for boost header])
AC_MSG_RESULT(${ac_cv_path_boost_incl})
- BOOST_CFLAGS="$ac_cv_path_boost_incl"
- AC_SUBST(BOOST_CFLAGS)
dnl Look for the library
AC_ARG_WITH(boost_lib, AC_HELP_STRING([--with-boost-lib], [directory where
boost libraries are]), with_boost_lib=${withval})
AC_CACHE_VAL(ac_cv_path_boost_lib, [
if test x"${with_boost_lib}" != x ; then
- ac_cv_path_boost_lib=`(cd ${with_boost_lib}; pwd)`
+ ac_cv_path_boost_lib="-L`(cd ${with_boost_lib}; pwd)`"
fi
])
@@ -103,10 +101,10 @@
for libname in ${boostnames}; do
if test -f $i/lib${libname}.a -o -f $i/lib${libname}.so; then
if test x"$i" != x"/usr/lib"; then
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -L$i -l${libname}"
+ ac_cv_path_boost_lib="-L$i -l${libname}"
break
else
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${libname}"
+ ac_cv_path_boost_lib="-l${libname}"
break
fi
fi
@@ -120,9 +118,9 @@
for k in ${boostnames}; do
if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f
${ac_cv_path_boost_lib}/lib${k}.so; then
if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib}
-L${ac_cv_path_boost_lib} -l${k}"
+ ac_cv_path_boost_lib="L${ac_cv_path_boost_lib} -l${k}"
else
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${k}"
+ ac_cv_path_boost_lib="-l${k}"
fi
fi
done
@@ -133,48 +131,36 @@
dnl The naming convention is the same as for threads. -mt is the
dnl preferance, followed by -gcc-mt, followed by -gcc.
- boostnames="boost_date_time_mt boost_date_time-gcc-mt boost_date_time-gcc
boost_date_time-mt boost_date_time"
+ boostnames="boost_date_time-gcc-mt boost_date_time-mt boost_date_time-gcc
boost_date_time-mt boost_date_time"
+ boost_date_time=no
if test x"${ac_cv_path_boost_lib}" != x; then
AC_MSG_CHECKING([for Boost's date time libraries])
for i in $libslist; do
+ if test x${boost_date_time} = xyes; then
+ break;
+ fi
for libname in ${boostnames}; do
if test -f $i/lib${libname}.a -o -f $i/lib${libname}.so; then
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -L$i -l${libname}"
- break;
- else
+ boost_date_time=yes
ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${libname}"
break;
fi
- fi
done
done
AC_MSG_RESULT(${ac_cv_path_boost_lib})
- else
- for k in ${boostnames}; do
- if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f
${ac_cv_path_boost_lib}/lib${k}.so; then
- if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib}
-L${ac_cv_path_boost_lib} -l${k}"
- break;
- else
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${k}"
- break;
- fi
- fi
- done
- fi
- if test x"${ac_cv_path_boost_lib}" = x; then
- AC_SEARCH_LIBS(boost::date_time::nth_as_str, ${boostnames},
[ac_cv_path_boost_lib="${LIBS}"], , -lpthread)
fi
AC_LANG_POP(C++)
dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.
LIBS="$save_LIBS"
- BOOST_LIBS="$ac_cv_path_boost_lib"
+ BOOST_CFLAGS="$ac_cv_path_boost_incl"
+ AC_SUBST(BOOST_CFLAGS)
+
+ BOOST_LIBS="$ac_cv_path_boost_lib"
AC_SUBST(BOOST_LIBS)
- AM_CONDITIONAL(HAVE_BOOST, [test x${ac_cv_path_boost_incl} != x])
+ AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes])
])
# Local Variables:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2603
retrieving revision 1.2604
diff -u -b -r1.2603 -r1.2604
--- ChangeLog 11 Mar 2007 00:15:55 -0000 1.2603
+++ ChangeLog 11 Mar 2007 05:17:14 -0000 1.2604
@@ -8,21 +8,19 @@
2007-03-10 Sandro Santilli <address@hidden>
* testsuite/actionscript.all/Makefile.am:
- Import Dejagnu.swf from the same dir the SWF
- is in, to work around player8+ lame
- security model.
- * server/array.{cpp,h}: provide an override
- for Object.toString().
+ Import Dejagnu.swf from the same dir the SWF is in, to work
+ around player8+ lame security model.
+ * server/array.{cpp,h}: provide an override for
+ Object.toString().
* testsuite/swfdec/PASSING: array.swf now passes.
2007-03-10 Sandro Santilli <address@hidden>
* testsuite/swfdec/PASSING: expect 5 more successes.
- * testsuite/swfdec/swfdec_gnash_tester: allow 11 advances
- rather then 10 (this is likely due to Gnash current
- additional advance required for proper construction
- of initial stage). Makes 5 more tests from the swfdec
- testsuite pass (including gotoframe!!).
+ * testsuite/swfdec/swfdec_gnash_tester: allow 11 advances rather
+ then 10 (this is likely due to Gnash current additional advance
+ required for proper construction of initial stage). Makes 5 more
+ tests from the swfdec testsuite pass (including gotoframe!!).
* server/sprite_instance.cpp (add_display_object):
Only syntetize instance names for sprite instances
(fixes swfdec's names.swf testcase).