[Gnash-commit] gnash libbase/tu_config.h server/swf/tag_loader...

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/02 17:11:43

Modified files:
        libbase        : tu_config.h 
        server/swf     : tag_loaders.cpp 
        .              : ChangeLog 

Log message:
                * libbase/tu_config.h,server/swf/tag_loaders.cpp: Allow 
compilation
                  without zlib, auto-switching TU_CONFIG_LINK_TO_ZLIB on 
HAVE_ZLIB_H
                  (works with agg-fb; gtk etc require zlib in their own right)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_config.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3066&r2=1.3067

Patches:
Index: libbase/tu_config.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_config.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libbase/tu_config.h 2 May 2007 10:30:08 -0000       1.13
+++ libbase/tu_config.h 2 May 2007 17:11:42 -0000       1.14
@@ -39,7 +39,11 @@
 // build.  Be aware of what you're doing -- it may break features that
 // you need!
 #ifndef TU_CONFIG_LINK_TO_ZLIB
-#define TU_CONFIG_LINK_TO_ZLIB 1
+# ifdef HAVE_ZLIB_H
+#  define TU_CONFIG_LINK_TO_ZLIB 1
+# else
+#  define TU_CONFIG_LINK_TO_ZLIB 0
+# endif
 #endif
 
 // define TU_CONFIG_LINK_TO_LIBPNG to 0 to exclude libpng code from

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/swf/tag_loaders.cpp  2 May 2007 10:30:09 -0000       1.94
+++ server/swf/tag_loaders.cpp  2 May 2007 17:11:42 -0000       1.95
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.94 2007/05/02 10:30:09 martinwguy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.95 2007/05/02 17:11:42 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,7 +57,9 @@
 #include "sound_definition.h"
 #include "PlaceObject2Tag.h"
 
+#if TU_CONFIG_LINK_TO_ZLIB
 #include <zlib.h>
+#endif
 
 namespace gnash {
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3066
retrieving revision 1.3067
diff -u -b -r1.3066 -r1.3067
--- ChangeLog   2 May 2007 17:06:00 -0000       1.3066
+++ ChangeLog   2 May 2007 17:11:42 -0000       1.3067
@@ -30,6 +30,9 @@
          remove TU_CONFIG_LINK_TO_JPEGLIB
        * Revert attempt to use endian.hpp. It broke someone's build. QED.
        * gui/fb.cpp: Fix compiler warnings
+       * libbase/tu_config.h,server/swf/tag_loaders.cpp: Allow compilation
+         without zlib, auto-switching TU_CONFIG_LINK_TO_ZLIB on HAVE_ZLIB_H
+         (works with agg-fb; gtk etc require zlib in their own right)
 
 2007-05-02 Sandro Santilli <address@hidden>