Index: Makefile.am =================================================================== RCS file: /sources/gnash/gnash/server/Makefile.am,v retrieving revision 1.80.2.4 diff -u -3 -p -r1.80.2.4 Makefile.am --- Makefile.am 10 Nov 2006 22:01:42 -0000 1.80.2.4 +++ Makefile.am 13 Nov 2006 16:36:41 -0000 @@ -39,20 +39,22 @@ INCLUDES = \ -I$(top_srcdir)/libbase \ -I$(top_srcdir) \ $(PTHREAD_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(OGG_CFLAGS) \ - $(JPEG_CFLAGS) \ - $(SDL_CFLAGS) \ - $(OPENGL_CFLAGS) \ - $(GTK2_CFLAGS) \ - $(PANGO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(ATK_CFLAGS) \ - $(CURL_CFLAGS) \ $(DMALLOC_CFLAGS) \ $(LIBXML_CFLAGS) +# $(ZLIB_CFLAGS) \ +# $(OGG_CFLAGS) \ +# $(JPEG_CFLAGS) \ +# $(SDL_CFLAGS) \ +# $(OPENGL_CFLAGS) \ +# $(GTK2_CFLAGS) \ +# $(PANGO_CFLAGS) \ +# $(GLIB_CFLAGS) \ +# $(CAIRO_CFLAGS) \ +# $(ATK_CFLAGS) \ +# $(CURL_CFLAGS) \ +# + libgnashserver_la_SOURCES = \ as_object.cpp \ as_value.cpp \ @@ -164,9 +166,10 @@ libgnashserver_la_LIBADD = \ $(top_builddir)/libbase/libgnashbase.la \ $(top_builddir)/server/asobj/libgnashasobjs.la \ $(top_builddir)/server/parser/libgnashparser.la \ - $(ZLIB_LIBS) \ - $(LIBXML_LIBS) \ - $(OPENGL_LIBS) + $(LIBXML_LIBS) + +# $(ZLIB_LIBS) \ +# $(OPENGL_LIBS) #libserver_la_LDFLAGS = -module -avoid-version -no-undefined #libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL) Index: StreamProvider.cpp =================================================================== RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v retrieving revision 1.11.2.1 diff -u -3 -p -r1.11.2.1 StreamProvider.cpp --- StreamProvider.cpp 30 Oct 2006 14:28:48 -0000 1.11.2.1 +++ StreamProvider.cpp 13 Nov 2006 16:36:41 -0000 @@ -30,7 +30,7 @@ #include "URL.h" #include "tu_file.h" #ifdef USE_CURL -# include +//# include # include "curl_adapter.h" #include "URLAccessManager.h" #endif Index: impl.cpp =================================================================== RCS file: /sources/gnash/gnash/server/impl.cpp,v retrieving revision 1.64.2.3 diff -u -3 -p -r1.64.2.3 impl.cpp --- impl.cpp 7 Nov 2006 16:24:04 -0000 1.64.2.3 +++ impl.cpp 13 Nov 2006 16:36:41 -0000 @@ -31,7 +31,7 @@ #include #endif -#include +//#include #include "tu_file.h" #include "utility.h" @@ -49,7 +49,7 @@ #include "dlist.h" #include "timers.h" #include "image.h" -#include "jpeg.h" +//#include "jpeg.h" #include "zlib_adapter.h" #include "sprite_definition.h" #include "movie_def_impl.h" Index: movie_root.h =================================================================== RCS file: /sources/gnash/gnash/server/movie_root.h,v retrieving revision 1.21.2.1 diff -u -3 -p -r1.21.2.1 movie_root.h --- movie_root.h 30 Oct 2006 14:28:49 -0000 1.21.2.1 +++ movie_root.h 13 Nov 2006 16:36:41 -0000 @@ -27,7 +27,7 @@ #include "timers.h" // for Timer #include "fontlib.h" #include "font.h" -#include "jpeg.h" +//#include "jpeg.h" #include "tu_file.h" #include "movie_def_impl.h" #include "tu_config.h" Index: asobj/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v retrieving revision 1.12.2.2 diff -u -3 -p -r1.12.2.2 Makefile.am --- asobj/Makefile.am 10 Nov 2006 22:01:42 -0000 1.12.2.2 +++ asobj/Makefile.am 13 Nov 2006 16:36:41 -0000 @@ -35,19 +35,21 @@ INCLUDES = \ -I$(top_srcdir)/libamf \ -I$(top_srcdir) \ $(PTHREAD_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(OGG_CFLAGS) \ - $(JPEG_CFLAGS) \ - $(SDL_CFLAGS) \ - $(OPENGL_CFLAGS) \ - $(GTK2_CFLAGS) \ - $(PANGO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(ATK_CFLAGS) \ $(DMALLOC_CFLAGS) \ $(LIBXML_CFLAGS) +# $(ZLIB_CFLAGS) \ +# $(OGG_CFLAGS) \ +# $(JPEG_CFLAGS) \ +# $(SDL_CFLAGS) \ +# $(OPENGL_CFLAGS) \ +# $(GTK2_CFLAGS) \ +# $(PANGO_CFLAGS) \ +# $(GLIB_CFLAGS) \ +# $(CAIRO_CFLAGS) \ +# $(ATK_CFLAGS) \ +# + libgnashasobjs_la_SOURCES = \ Boolean.cpp \ Camera.cpp \ Index: parser/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v retrieving revision 1.10.2.2 diff -u -3 -p -r1.10.2.2 Makefile.am --- parser/Makefile.am 10 Nov 2006 22:01:42 -0000 1.10.2.2 +++ parser/Makefile.am 13 Nov 2006 16:36:41 -0000 @@ -40,18 +40,20 @@ INCLUDES = \ -I$(top_srcdir)/libamf \ -I$(top_srcdir) \ $(PTHREAD_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(OGG_CFLAGS) \ - $(JPEG_CFLAGS) \ - $(SDL_CFLAGS) \ - $(OPENGL_CFLAGS) \ - $(GTK2_CFLAGS) \ - $(PANGO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(ATK_CFLAGS) \ - $(DMALLOC_CFLAGS) \ - $(LIBXML_CFLAGS) + $(DMALLOC_CFLAGS) + +# $(LIBXML_CFLAGS) +# $(ZLIB_CFLAGS) \ +# $(OGG_CFLAGS) \ +# $(JPEG_CFLAGS) \ +# $(SDL_CFLAGS) \ +# $(OPENGL_CFLAGS) \ +# $(GTK2_CFLAGS) \ +# $(PANGO_CFLAGS) \ +# $(GLIB_CFLAGS) \ +# $(CAIRO_CFLAGS) \ +# $(ATK_CFLAGS) \ +# libgnashparser_la_SOURCES = \ action_buffer.cpp \ Index: swf/tag_loaders.cpp =================================================================== RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v retrieving revision 1.53.2.1 diff -u -3 -p -r1.53.2.1 tag_loaders.cpp --- swf/tag_loaders.cpp 30 Oct 2006 14:28:55 -0000 1.53.2.1 +++ swf/tag_loaders.cpp 13 Nov 2006 16:36:41 -0000 @@ -43,7 +43,7 @@ #include "dlist.h" #include "timers.h" #include "image.h" -#include "jpeg.h" +//#include "jpeg.h" #include "zlib_adapter.h" //#include "Sprite.h" #include "sprite_definition.h"