[Gnash-commit] gnash ChangeLog configure.ac libbase/string_tab...

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/04/01 16:55:11

Modified files:
        .              : ChangeLog configure.ac 
        libbase        : string_table.cpp 
        server         : asClass.cpp namedStrings.cpp 

Log message:
        Made boost-serialization optional again.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6137&r2=1.6138
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.505&r2=1.506
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/string_table.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asClass.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/namedStrings.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6137
retrieving revision 1.6138
diff -u -b -r1.6137 -r1.6138
--- ChangeLog   1 Apr 2008 13:32:51 -0000       1.6137
+++ ChangeLog   1 Apr 2008 16:55:10 -0000       1.6138
@@ -1,3 +1,7 @@
+2008-04-01 Russ Nelson <address@hidden>
+
+       * Made boost-serialization optional again.
+
 2008-04-01 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp: register natives.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -b -r1.505 -r1.506
--- configure.ac        30 Mar 2008 18:24:10 -0000      1.505
+++ configure.ac        1 Apr 2008 16:55:10 -0000       1.506
@@ -1907,6 +1907,19 @@
 AC_SUBST(RENDERER_LIBS)
 AC_SUBST(RENDERER_CONFIG)
 
+
+dnl check for missing libraries and disable them.
+if test x"$BOOST_LIBS" != x; then
+  if test x"${extra_missing_libs}" != x; then
+    for i in ${extra_missing_libs}; do
+      if test $i = serialization; then
+        AC_DEFINE([BOOST_MULTI_INDEX_DISABLE_SERIALIZATION], ["1"], [if the 
library is missing, don't use it.])
+      fi
+    done
+  fi
+fi
+
+
 SUPPORTED_GUIS=
 if test x$build_qtopia = xyes; then
   SUPPORTED_GUIS="${SUPPORTED_GUIS},qtopia"

Index: libbase/string_table.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/string_table.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/string_table.cpp    6 Feb 2008 10:18:30 -0000       1.7
+++ libbase/string_table.cpp    1 Apr 2008 16:55:10 -0000       1.8
@@ -16,6 +16,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
 #include "string_table.h"
 #include <boost/algorithm/string/case_conv.hpp>
 

Index: server/asClass.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asClass.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asClass.cpp  24 Jan 2008 03:41:59 -0000      1.5
+++ server/asClass.cpp  1 Apr 2008 16:55:11 -0000       1.6
@@ -15,6 +15,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
 #include "asClass.h"
 #include "as_object.h"
 #include "ClassHierarchy.h"

Index: server/namedStrings.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/namedStrings.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/namedStrings.cpp     31 Mar 2008 23:48:32 -0000      1.13
+++ server/namedStrings.cpp     1 Apr 2008 16:55:11 -0000       1.14
@@ -18,6 +18,10 @@
 // A file to contain all of the different strings for which we want compile 
time
 // known string table keys.
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
 #include "namedStrings.h"
 #include "string_table.h"