[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac ChangeLog macros/boost.m4
From: |
Chad Musick |
Subject: |
[Gnash-commit] gnash configure.ac ChangeLog macros/boost.m4 |
Date: |
Sun, 23 Sep 2007 22:09:14 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Chad Musick <cmusick> 07/09/23 22:09:14
Modified files:
. : configure.ac ChangeLog
macros : boost.m4
Log message:
Adding boost serialization library to required libraries.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.421&r2=1.422
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4381&r2=1.4382
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.54&r2=1.55
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -b -r1.421 -r1.422
--- configure.ac 19 Sep 2007 02:17:37 -0000 1.421
+++ configure.ac 23 Sep 2007 22:09:14 -0000 1.422
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.421 2007/09/19 02:17:37 nihilus Exp $
+dnl $Id: configure.ac,v 1.422 2007/09/23 22:09:14 cmusick Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -2052,6 +2052,13 @@
nogo=true
fi
+ if test x"$boost_serialization" != xyes; then
+ echo " ERROR: The BOOST serialization package is needed to
compile gnash."
+ echo " Install it from http://boost.org"
+ echo " or .deb users: apt-get install
libboost-serialization-dev"
+ nogo=true
+ fi
+
# Only cygnal requires date_time at present, so it's OK if either
# you don't want cygnal or do have date_time installed.
if test x"$cygnal" = xno -o x"$boost_date_time" = xyes; then
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4381
retrieving revision 1.4382
diff -u -b -r1.4381 -r1.4382
--- ChangeLog 23 Sep 2007 08:48:16 -0000 1.4381
+++ ChangeLog 23 Sep 2007 22:09:14 -0000 1.4382
@@ -1,3 +1,8 @@
+2007-09-24 Chad Musick <address@hidden>
+
+ * configure.ac: Add requirement of boost serialization library
+ * macros/boost.m4: Add requirement of boost serialization library
+
2007-09-23 Chad Musick <address@hidden>
* server/namedStrings.cpp,.h: New files. Move pre-load string
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- macros/boost.m4 11 Sep 2007 00:17:43 -0000 1.54
+++ macros/boost.m4 23 Sep 2007 22:09:14 -0000 1.55
@@ -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.54 2007/09/11 00:17:43 rsavoye Exp $
+dnl $Id: boost.m4,v 1.55 2007/09/23 22:09:14 cmusick Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -95,9 +95,10 @@
dnl attributes.
boost_date_time="no"
boost_thread="no"
+ boost_serialization="no"
AC_MSG_CHECKING([for Boost libraries])
for i in $libslist; do
- if test x${boost_date_time} = xyes -a x${boost_thread} = xyes; then
+ if test x${boost_date_time} = xyes -a x${boost_thread} = xyes -a
x${boost_serialization} = xyes; then
break;
fi
dirs=`ls -dr $i/libboost_date_time*.${shlibext}
$i/libboost_date_time*.${shlibext}.* $i/libboost_date_time*.a 2>/dev/null`
@@ -136,6 +137,23 @@
break
fi
done
+
+ dnl now look for the Boost Serialization library
+ dirs=`ls -dr $i/libboost_serialization*.${shlibext}
$i/libboost_serialization*.${shlibext}.* $i/libboost_serialization*.a
2>/dev/null`
+ for libname in $dirs; do
+ if test x"${boost_serialization}" = xno; then
+ lfile=`basename ${libname} | eval sed -e 's:^lib::' -e 's:.a$::' -e
's:\.${shlibext}.*::'`
+ ldir=`dirname ${libname}`
+ if test -f ${ldir}/lib${lfile}-mt.${shlibext}; then
+ lfile="${lfile}-mt"
+ fi
+ boost_serialization=yes
+ ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+ break
+ else
+ break
+ fi
+ done
done
AC_MSG_RESULT(${ac_cv_path_boost_lib})
@@ -152,7 +170,7 @@
# This isn't right: you don't need boot date-time installed unless u build
# cygnal, and it is sometimes a separate package from Boost core and thread.
# TODO: why is this needed, lack of boost being a fatal error?
- AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes && test
x${boost_thread} = xyes])
+ AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes && test
x${boost_thread} = xyes && test x${boost_serialization} = xyes])
])
# Local Variables:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash configure.ac ChangeLog macros/boost.m4,
Chad Musick <=