[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash gui/Makefile.am backend/Makefile.am confi...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash gui/Makefile.am backend/Makefile.am confi... |
|
Date: |
Fri, 20 Jul 2007 01:50:33 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/07/20 01:50:32
Modified files:
gui : Makefile.am
backend : Makefile.am
. : configure.ac Makefile.am ChangeLog
libbase : Makefile.am
extensions : Makefile.am
macros : x11.m4 libltdl.m4
testsuite/misc-ming.all: DefineEditTextTest.c
Log message:
* gui/Makefile.am: Use *_CONFIG variables instead of *_OPT
ones. Use BUILD_* conditionals instead of USE_GUI.
* backend/Makefile.am: Build seperate libraries for each
backend.
* configure.ac: Don't pass the data to AM_INIT_AUTOMAKE. Don't
disable static libs. Add option for dynamically loading
guis. (disabled by default for now). Don't build cygnal by
default. Remove --enable-gui and --enable-renderer with new
options, --with-gui and --with-renderer to list multiple options
for guis and renderers. Don't configure cygnal sub directories
yet.
* Makefile.am: Use *_CONFIG variables instead of *_OPT ones.
* extensions/Makefile.am: Use BUILD_* conditionals instead of
USE_GUI.
* libbase/Makefile.am: Use HAVE_SDL instead of HAS_SDL.
* macros/gtkglext.m4: Use --libs-only-l insted of --libs.
* testsuite/misc-ming.all/DefineEditTextTest.c: Include
fontlib.h.
* macros/libltdl.m4: Move the serial numbers to the top to keep
automate 1.19 happy.
* macros/x11.m4: Don't put a conditional in an if block.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.358&r2=1.359
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3769&r2=1.3770
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libltdl.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest.c?cvsroot=gnash&r1=1.18&r2=1.19
Patches:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- gui/Makefile.am 17 Jul 2007 23:32:34 -0000 1.83
+++ gui/Makefile.am 20 Jul 2007 01:50:31 -0000 1.84
@@ -15,13 +15,16 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-# $Id: Makefile.am,v 1.83 2007/07/17 23:32:34 nihilus Exp $
+AUTOMAKE_OPTIONS = -Wno-portability
-AUTOMAKE_OPTIONS =
localedir = $(datadir)/locale
+# this is where Gnash plugins get installed
+pluginsdir = $(libdir)/gnash/plugins
+
+lib_LTLIBRARIES = libgnashgui.la
+BUILT_SOURCES = klash.moc .configline
+
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
@@ -32,8 +35,8 @@
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libgeometry \
-DLOCALEDIR=\"$(localedir)\" \
+ -DPLUGINSDIR=\"$(pluginsdir)\" \
$(LIBXML_CFLAGS) \
- $(SDL_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS) \
$(PTHREAD_CFLAGS) \
@@ -55,14 +58,11 @@
$(ATK_LIBS) \
$(GLIB_LIBS) \
$(EXPAT_LIBS)
-# $(PNG_CFLAGS) \
-# $(JPEG_CFLAGS) \
-# $(MP3_CFLAGS) \
-# $(OGG_CFLAGS)
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
+ $(GLIB_LIBS) \
$(LIBLTDL) \
$(FFMPEG_LIBS) \
$(CURL_LIBS) \
@@ -72,106 +72,250 @@
$(PTHREAD_LIBS) \
$(NULL)
+GNASH_LIBS = \
+ $(top_builddir)/libamf/libgnashamf.la \
+ $(top_builddir)/backend/libgnashbackend.la \
+ $(top_builddir)/server/libgnashserver.la \
+ $(top_builddir)/libgeometry/libgnashgeo.la \
+ $(top_builddir)/libbase/libgnashbase.la
-if USE_RENDERER_OPENGL
- AM_CPPFLAGS += $(OPENGL_CFLAGS)
-if USE_GUI_GTK
- AM_LDFLAGS += $(GLEXT_LIBS) $(OPENGL_LIBS)
- AM_CPPFLAGS += $(GLEXT_CFLAGS)
- GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
-endif # USE_GUI_GTK
-if USE_GUI_AQUA
- AQUA_OPENGL_SRCS = aqua_ogl_glue.cpp aqua_ogl_glue.h
- AM_LDFLAGS += $(OPENGL_LIBS)
-endif # USE_GUI_AQUA
-if USE_GUI_SDL
- SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
-endif # USE_GUI_SDL
-if USE_GUI_KDE
- KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
- AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
- AM_LDFLAGS += $(KDE_LIBS) $(QT_LIBS)
- BUILT_SOURCES = klash.moc
-endif # USE_GUI_KDE
-else # ! USE_RENDERER_OPENGL
- GTK_OPENGL_SRCS =
- KDE_OPENGL_SRCS =
- SDL_OPENGL_SRCS =
- AQUA_OPENGL_SRCS =
-endif # ! USE_RENDERER_OPENGL
-
-if USE_RENDERER_CAIRO
- AM_LDFLAGS += $(CAIRO_LIBS)
- GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h gtk_cairo_create.h
- KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h
- SDL_CAIRO_SRCS = sdl_cairo_glue.cpp sdl_cairo_glue.h
- FLTK_CAIRO_SRCS = fltk_glue_cairo.cpp fltk_glue_cairo.h
- AM_CPPFLAGS += $(CAIRO_CFLAGS)
-else
- GTK_CAIRO_SRCS =
- KDE_CAIRO_SRCS =
- SDL_CAIRO_SRCS =
- FLTK_CAIRO_SRCS =
-endif
+# The player class has to be added to each GUI library because it
+# requires an ifdef to change between the various GUI toolkits.
+PLAYER_SRCS = Player.cpp Player.h
-if USE_RENDERER_AGG
- AM_CPPFLAGS += $(AGG_CFLAGS)
- AM_LDFLAGS += $(AGG_LIBS)
- GTK_AGG_SRCS = gtk_glue_agg.cpp gtk_glue_agg.h
- RISCOS_AGG_SRCS = riscos_glue_agg.cpp riscos_glue_agg.h
- SDL_AGG_SRCS = sdl_agg_glue.cpp sdl_agg_glue.h
- FLTK_AGG_SRCS = fltk_glue_agg.cpp fltk_glue_agg.h
- KDE_AGG_SRCS = kde_glue_agg.cpp kde_glue_agg.h
-else
- GTK_AGG_SRCS =
- RISCOS_AGG_SRCS =
- SDL_AGG_SRCS =
- FLTK_AGG_SRCS =
- KDE_AGG_SRCS =
-endif
+#
+# Build the libraries that hold the combined GUI toolkit and
+# renderer. These are built as static libraries if doing a static
+# build for debugging. Otherwise they are built as a loadable shared
+# library module so we can dlopen() them at runtime.
+#
-if USE_GUI_GTK
- AM_LDFLAGS += $(CAIRO_LIBS)
- GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
- AM_LDFLAGS += $(GTK_LIBS) $(X11_LIBS)
- AM_CPPFLAGS += $(GTK_CFLAGS)
-else
- GTK_SRCS =
-endif
+plugins_LTLIBRARIES = # set later on by conditionals
-if USE_GUI_RISCOS
- RISCOS_SRCS = riscos.cpp riscossup.h riscos_glue.h $(RISCOS_AGG_SRCS)
- AM_LDFLAGS += -lOSLib32
+# Only build loadable modules unless statically linking
+if DYNAMIC_GUI # make shared libraries suitable for dlopen().
+if ENABLE_SHARED
+ LIB_FLAGS = -module -avoid-version -no-undefined
else
- RISCOS_SRCS =
-endif
+ LIB_FLAGS = -release $(VERSION)
+endif # ENABLE_SHARED
+else # make shared libraries suitable for linking.
+ LIB_FLAGS = -release $(VERSION)
+endif # DYNAMIC_GUI
+
+# GTK2 Toolkit
+if BUILD_GTK_GUI
+if HAVE_OPENGL
+ plugins_LTLIBRARIES += libgnashgtk_gl.la
+ libgnashgtk_gl_la_CPPFLAGS = -DGUI_GTK $(AM_CPPFLAGS) \
+ $(GTK_CFLAGS) $(OPENGL_CFLAGS)
+ libgnashgtk_gl_la_SOURCES = $(PLAYER_SRCS) \
+ gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
+ gtk.cpp gtksup.h gtk_glue.h
+ libgnashgtk_gl_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashgtk_gl_la_LIBADD = \
+ $(top_builddir)/backend/libgnashogl.la libgnashgui.la $(GTK_LIBS)
+endif # HAVE_OPENGL
+if HAVE_AGG
+ plugins_LTLIBRARIES += libgnashgtk_agg.la
+ libgnashgtk_agg_la_CPPFLAGS = -DGUI_GTK $(AM_CPPFLAGS) \
+ $(GTK_CFLAGS) $(AGG_CFLAGS)
+ libgnashgtk_agg_la_SOURCES = $(PLAYER_SRCS) \
+ gtk_glue_agg.cpp gtk_glue_agg.h \
+ gtk.cpp gtksup.h gtk_glue.h
+ libgnashgtk_agg_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashgtk_agg_la_LIBADD = \
+ $(top_builddir)/backend/libgnashagg.la libgnashgui.la \
+ $(GTK_LIBS) $(AGG_LIBS)
+endif # HAVE_AGG
+if HAVE_CAIRO
+ plugins_LTLIBRARIES += libgnashgtk_cairo.la
+ libgnashgtk_cairo_la_CPPFLAGS = -DGUI_GTK $(AM_CPPFLAGS) \
+ $(GTK_CFLAGS) $(CAIRO_CFLAGS)
+ libgnashgtk_cairo_la_SOURCES = $(PLAYER_SRCS) \
+ gtk_glue_cairo.cpp gtk_glue_cairo.h \
+ gtk.cpp gtksup.h gtk_glue.h
+ libgnashgtk_cairo_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashgtk_cairo_la_LIBADD = \
+ $(top_builddir)/backend/libgnashcairo.la libgnashgui.la \
+ $(GTK_LIBS) $(CAIRO_LIBS)
+endif # HAVE_CAIRO
+endif # BUILD_GTK_GUI
+
+# KDE/QT Toolkit
+if BUILD_KDE_GUI
+if HAVE_OPENGL
+ plugins_LTLIBRARIES += libgnashkde_gl.la
+ libgnashkde_gl_la_CPPFLAGS = -DGUI_KDE $(AM_CPPFLAGS) \
+ $(OPENGL_FLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
+ libgnashkde_gl_la_SOURCES = $(PLAYER_SRCS) \
+ kde_glue_opengl.cpp kde_glue_.h \
+ kde.cpp kdesup.h kde_glue.h
+ libgnashkde_gl_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashkde_gl_la_LIBADD = libgnashgui.la \
+ $(top_builddir)/backend/libgnashogl.la \
+ $(KDE_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
+endif # HAVE_OPENGL
+if HAVE_AGG
+ plugins_LTLIBRARIES += libgnashkde_agg.la
+ libgnashkde_agg_la_CPPFLAGS = -DGUI_KDE $(AM_CPPFLAGS) \
+ $(AGG_CFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
+ libgnashkde_agg_la_SOURCES = $(PLAYER_SRCS) \
+ kde_glue_agg.cpp kde_glue_agg.h \
+ kde.cpp kdesup.h kde_glue.h
+ libgnashkde_agg_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashkde_agg_la_LIBADD = libgnashgui.la \
+ $(top_builddir)/backend/libgnashagg.la \
+ $(KDE_LIBS) $(QT_LIBS) $(AGG_LIBS)
+endif # HAVE_AGG
+endif # BUILD_KDE_GUI
+
+# SDL Toolkit
+if BUILD_SDL_GUI
+if HAVE_OPENGL
+ plugins_LTLIBRARIES += libgnashsdl_gl.la
+ libgnashsdl_gl_la_CPPFLAGS = -DGUI_SDL $(AM_CPPFLAGS) \
+ $(SDL_CFLAGS) $(OPENGL_CFLAGS)
+ libgnashsdl_gl_la_SOURCES = $(PLAYER_SRCS) \
+ sdl_ogl_glue.cpp sdl_ogl_glue.h \
+ sdl.cpp sdlsup.h sdl_glue.h
+ libgnashsdl_gl_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashsdl_gl_la_LIBADD = \
+ $(top_builddir)/backend/libgnashogl.la libgnashgui.la \
+ $(SDL_LIBS) $(OPENGL_LIBS)
+endif # HAVE_OPENGL
+if HAVE_AGG
+ plugins_LTLIBRARIES += libgnashsdl_agg.la
+ libgnashsdl_agg_la_CPPFLAGS = -DGUI_SDL $(AM_CPPFLAGS) \
+ $(SDL_CFLAGS) $(AGG_CFLAGS)
+ libgnashsdl_agg_la_SOURCES = $(PLAYER_SRCS) \
+ sdl_glue_agg.cpp sdl_glue_agg.h \
+ sdl.cpp sdlsup.h sdl_glue.h
+ libgnashsdl_agg_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashsdl_agg_la_LIBADD = \
+ $(top_builddir)/backend/libgnashagg.la libgnashgui.la \
+ $(SDL_LIBS) $(AGG_LIBS)
+endif # HAVE_AGG
+if HAVE_CAIRO
+ plugins_LTLIBRARIES += libgnashsdl_cairo.la
+ libgnashsdl_cairo_la_CPPFLAGS = -DGUI_SDL $(AM_CPPFLAGS) \
+ $(SDL_CFLAGS) $(CAIRO_CFLAGS)
+ libgnashsdl_cairo_la_SOURCES = $(PLAYER_SRCS) \
+ sdl_cairo_glue.cpp sdl_cairo_glue.h \
+ sdl.cpp sdlsup.h sdl_glue.h
+ libgnashsdl_cairo_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashsdl_cairo_la_LIBADD = \
+ $(top_builddir)/backend/libgnashcairo.la libgnashgui.la \
+ $(SDL_LIBS) $(CAIRO_LIBS)
+endif # HAVE_CAIRO
+endif # BUILD_SDL_GUI
+
+# FLTK2 Toolkit
+if BUILD_FLTK_GUI
+if HAVE_AGG
+ plugins_LTLIBRARIES += libgnashfltk_agg.la
+ libgnashfltk_agg_la_CPPFLAGS = -DGUI_FLTK $(AM_CPPFLAGS) \
+ $(FLTK2_CFLAGS) $(AGG_CFLAGS)
+ libgnashfltk_agg_la_SOURCES = $(PLAYER_SRCS) \
+ fltk_glue_agg.cpp fltk_glue_agg.h \
+ fltk.cpp fltksup.h fltk_glue.h
+ libgnashfltk_agg_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashfltk_agg_la_LIBADD = \
+ $(top_builddir)/backend/libgnashagg.la libgnashgui.la \
+ $(FLTK2_LIBS) $(AGG_LIBS) $(XFT_LIBS) $(X11_LIBS)
+endif # HAVE_AGG
+if HAVE_CAIRO
+ plugins_LTLIBRARIES += libgnashfltk_cairo.la
+ libgnashfltk_agg_la_CPPFLAGS = -DGUI_FLTK $(AM_CPPFLAGS) \
+ $(FLTK2_CFLAGS) $(CAIRO_CFLAGS)
+ libgnashfltk_cairo_la_SOURCES = $(PLAYER_SRCS) \
+ fltk_glue_cairo.cpp fltk_glue_cairo.h \
+ fltk.cpp fltksup.h fltk_glue.h
+ libgnashfltk_cairo_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashfltk_cairo_la_LIBADD = \
+ $(top_builddir)/backend/libgnashcairo.la libgnashgui.la \
+ $(FLTK2_LIBS) $(CAIRO_LIBS) $(XFT_LIBS) $(X11_LIBS)
+endif # HAVE_CAIRO
+endif # BUILD_FLTK_GUI
+
+# Framebuffer, no toolkit
+if BUILD_FB_GUI
+if HAVE_AGG
+ libgnashsdl_agg_la_CPPFLAGS = -DGUI_FB $(AM_CPPFLAGS) $(SDL_CFLAGS)
+ plugins_LTLIBRARIES += libgnashfb_agg.la
+ libgnashsdl_agg_la_SOURCES = $(PLAYER_SRCS) \
+ fb.cpp fbsup.h
+ libgnashsdl_agg_la_LDFLAGS = $(LIB_FLAGS)
+ libgnashsdl_agg_la_LIBADD = \
+ $(top_builddir)/backend/libgnashagg.la libgnashgui.la \
+ $(SDL_LIBS) $(AGG_LIBS)
+endif # HAVE_AGG
+endif # BUILD_FB_GUI
-if USE_GUI_AQUA
- AQUA_SRCS = aqua.cpp aquasup.h aqua_glue.h $(AQUA_OPENGL_SRCS)
-else
- AQUA_SRCS =
-endif
+#
+# When static linking, we have to link in the correct library. These
+# are built as static libraries by the above section,
+#
-if USE_GUI_SDL
- SDL_SRCS = sdl.cpp sdlsup.h sdl_glue.h $(SDL_CAIRO_SRCS) $(SDL_OPENGL_SRCS)
$(SDL_AGG_SRCS)
-else
- SDL_SRCS =
-endif
+#
+# Setup the GUIs that have OpenGL support
+#
+if STATIC_GUI
+if BUILD_OGL_RENDERER
+if BUILD_GTK_GUI
+ GNASH_LIBS += libgnashgtk_gl.la $(GTK_LIBS) $(OPENGL_LIBS)
+endif # BUILD_GTK_GUI
+if BUILD_AQUA_GUI
+ GNASH_LIBS += libgnashaqua_gl.la $(AQUA_LIBS) $(OPENGL_LIBS)
+endif # BUILD_AQUA_GUI
+if BUILD_SDL_GUI
+ GNASH_LIBS += libgnashsdl_gl.la $(SDL_LIBS) $(OPENGL_LIBS)
+endif # BUILD_SDL_GUI
+if BUILD_KDE_GUI
+ GNASH_LIBS += libgnashkde_gl.la $(KDE_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
+endif # BUILD_KDE_GUI
+endif # BUILD_OPENGL_RENDERER
-if USE_GUI_KDE
- KDE_SRCS = kde.cpp kdesup.h kde_glue.h klash.moc $(KDE_CAIRO_SRCS)
$(KDE_OPENGL_SRCS) $(KDE_AGG_SRCS)
- AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
- AM_LDFLAGS += $(KDE_LIBS) $(QT_LIBS)
-else
- KDE_SRCS =
-endif
+#
+# Setup the GUIs that have Cairo support
+#
+if BUILD_CAIRO_RENDERER
+if BUILD_GTK_GUI
+ GNASH_LIBS += libgnashgtk_cairo.la $(GTK_LIBS) $(CAIRO_LIBS)
+endif # BUILD_GTK_GUI
+if BUILD_SDL_GUI
+ GNASH_LIBS += libgnashsdl_cairo.la $(SDL_LIBS) $(CAIRO_LIBS)
+endif # BUILD_SDL
+if BUILD_FLTK_GUI
+ GNASH_LIBS += libgnashfltk_cairo.la $(FLTK2_LIBS) $(CAIRO_LIBS)
$(XFT_LIBS) $(X11_LIBS)
+endif # BUILD_FLTK_GUI
+endif # BUILD_CAIRO_RENDERER
-if USE_GUI_FB
- FB_SRCS = fb.cpp fbsup.h
- AM_CPPFLAGS += $(AGG_CFLAGS)
-else
- FB_SRCS =
-endif
+#
+# Setup the GUIs that have AntiGrain (AGG) support
+#
+if BUILD_AGG_RENDERER
+if BUILD_GTK_GUI
+ GNASH_LIBS += libgnashgtk_agg.la $(AGG_LIBS) $(GTK_LIBS)
+endif # BUILD_GTK_GUI
+if BUILD_AQUA_GUI
+ GNASH_LIBS += libgnashaqua_agg.la $(AQUA_LIBS) $(AGG_LIBS)
+endif # BUILD_AQUA_GUI
+if BUILD_SDL_GUI
+ GNASH_LIBS += libgnashsdl_agg.la $(SDL_LIBS) $(AGG_LIBS)
+endif # BUILD_SDL_GUI
+if BUILD_FLTK_GUI
+ GNASH_LIBS += libgnashfltk_agg.la $(FLTK2_LIBS) $(AGG_LIBS) $(XFT_LIBS)
$(X11_LIBS)
+endif # BUILD_FLTK_GUI
+if BUILD_KDE_GUI
+ GNASH_LIBS += libgnashkde_agg.la $(KDE_LIBS) $(QT_LIBS) $(AGG_LIBS)
+endif # BUILD_KDE_GUI
+if BUILD_RISCOS_GUI
+ GNASH_LIBS += libgnashriscos_agg.la $(RISCOS_LIBS) $(AGG_LIBS)
+ AM_LDFLAGS += -lOSLib32
+endif # BUILD_RISCOS_GUI
+endif # BUILD_AGG_RENDERER
+endif # STATIC_GUI
if USE_SOUND_SDL
if USE_FFMPEG_ENGINE
@@ -188,13 +332,13 @@
AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
endif
-if USE_GUI_FLTK
- FLTK_SRCS = fltk.cpp fltksup.h $(FLTK_AGG_SRCS) $(FLTK_CAIRO_SRCS)
- AM_CPPFLAGS += $(FLTK2_CFLAGS) $(X11_CFLAGS)
- AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
-else
- FLTK_SRCS =
-endif
+# if USE_GUI_FLTK
+# FLTK_SRCS = fltk.cpp fltksup.h $(FLTK_AGG_SRCS) $(FLTK_CAIRO_SRCS)
+# AM_CPPFLAGS += $(FLTK2_CFLAGS) $(X11_CFLAGS)
+# AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
+# else
+# FLTK_SRCS =
+# endif
AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
@@ -208,16 +352,7 @@
#dist_images_DATA = images/gnash_G_v3.ico
imagesdir = $(pkgdatadir)
-lib_LTLIBRARIES = libgnashgui.la libgnashplayer.la
libgnashgui_la_SOURCES = \
- $(SDL_SRCS) \
- $(FLTK_SRCS) \
- $(GTK_SRCS) \
- $(GTK2_SRCS) \
- $(KDE_SRCS) \
- $(FB_SRCS) \
- $(AQUA_SRCS) \
- $(RISCOS_SRCS) \
gui.cpp gui.h \
NullGui.cpp \
NullGui.h
@@ -230,63 +365,19 @@
# is LDFLAGS still needed when AM_LDFLAGS is defined already ?
libgnashgui_la_LDFLAGS = \
-release $(VERSION) \
- -no-undefined \
- -export-dynamic \
$(AM_LDFLAGS)
-if USE_GUI_KDE
-bin_PROGRAMS = gnash # klash
-else
bin_PROGRAMS = gnash
-endif
-
-GNASH_LIBS = \
- libgnashgui.la \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/backend/libgnashbackend.la \
- $(top_builddir)/server/libgnashserver.la \
- $(top_builddir)/libgeometry/libgnashgeo.la \
- $(top_builddir)/libbase/libgnashbase.la \
- libgnashplayer.la \
- libgnashgui.la
-
-libgnashplayer_la_SOURCES = \
- Player.cpp Player.h
-
-libgnashplayer_la_LIBADD = \
- $(top_builddir)/server/libgnashserver.la \
- $(top_builddir)/backend/libgnashbackend.la \
- libgnashgui.la
-
-libgnashplayer_la_LDFLAGS = \
- -release $(VERSION) \
- -no-undefined \
- -export-dynamic \
- $(AM_LDFLAGS)
gnash_SOURCES = gnash.cpp
# export our symbols so they can be used by Gnash plugins
gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
-gnash_DEPENDENCIES = $(GNASH_LIBS) .configline
+gnash_DEPENDENCIES = libgnashgui.la .configline
gnash_LDADD = \
+ libgnashgui.la \
$(MYSQL_LIBS) \
- $(GNASH_LIBS)
-# $(LIBLTDL) "-dlopen" self "-dlopen"
-
-#klash_SOURCES = gnash.cpp
-#klash_CPPFLAGS = \
-# $(KDE_INCLS) \
-# -DUSE_KDE \
-# $(AM_CPPFLAGS)
-# export our symbols so they can be used by Gnash plugins
-#klash_LDFLAGS = -export-dynamic
-#klash_LDADD = \
-# $(LIB_KDECORE) \
-# $(LIB_KDEUI) \
-# $(GNASH_LIBS)
-
-#klash_DEPENDENCIES = \
-# $(GNASH_LIBS) .configline
+ $(GNASH_LIBS) \
+ $(AM_LDFLAGS)
# $(LIBLTDL) "-dlopen" self "-dlopen"
CLEANFILES = klash.moc .configline
@@ -316,3 +407,10 @@
clean-hook:
-rm -f core.* $(CLEANFILES)
+if DYNAMIC_GUI
+install-pluginsLTLIBRARIES: $(plugins_LTLIBRARIES)
+ test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs)
"$(DESTDIR)$(plugindir)"
+ for i in $(plugins_LTLIBRARIES); do \
+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$i
"$(DESTDIR)$(plugindir)/$$i" ; \
+ done
+endif
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- backend/Makefile.am 6 Jul 2007 08:27:19 -0000 1.56
+++ backend/Makefile.am 20 Jul 2007 01:50:31 -0000 1.57
@@ -22,6 +22,9 @@
#AM_CPPFLAGS = # -Wall
+# this is where Gnash plugins get installed
+pluginsdir = $(libdir)/gnash/plugins
+
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
libgnashbackend_LIBS = \
@@ -56,6 +59,9 @@
$(JPEG_CFLAGS) \
$(OGG_CFLAGS) \
$(BOOST_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(AGG_CFLAGS) \
+ $(CAIRO_CFLAGS) \
$(NULL)
noinst_HEADERS = \
@@ -72,30 +78,11 @@
# bin_PROGRAMS = gnash
-#noinst_LTLIBRARIES = libgbackend.la
lib_LTLIBRARIES = libgnashbackend.la
-RENDER_SOURCES = render_handler_tri.cpp
+# RENDER_SOURCES = render_handler_tri.cpp
SOUND_SOURCES = sound_handler.cpp
-if USE_RENDERER_AGG
-RENDER_SOURCES += render_handler_agg.cpp
-libgnashbackend_LIBS += $(AGG_LIBS)
-AM_CPPFLAGS += $(AGG_CFLAGS)
-endif
-
-if USE_RENDERER_CAIRO
-RENDER_SOURCES += render_handler_cairo.cpp
-libgnashbackend_LIBS += $(CAIRO_LIBS)
-AM_CPPFLAGS += $(CAIRO_CFLAGS)
-endif
-
-if USE_RENDERER_OPENGL
-RENDER_SOURCES += render_handler_ogl.cpp
-libgnashbackend_LIBS += $(OPENGL_LIBS) # $(GLEXT_LIBS)
-AM_CPPFLAGS += $(OPENGL_CFLAGS) # $(GLEXT_CFLAGS)
-endif
-
if USE_SOUND_GST
SOUND_SOURCES += sound_handler_gst.cpp sound_handler_gst.h
libgnashbackend_LIBS += $(GSTREAMER_LIBS)
@@ -121,12 +108,36 @@
$(top_builddir)/server/libgnashserver.la \
$(libgnashbackend_LIBS)
-libgnashbackend_la_SOURCES = \
- $(RENDER_SOURCES) \
- $(SOUND_SOURCES)
+libgnashbackend_la_SOURCES = $(SOUND_SOURCES)
libgnashbackend_la_LDFLAGS = -release $(VERSION)
+noinst_LTLIBRARIES = # set later on by conditionals
+if HAVE_OPENGL
+noinst_LTLIBRARIES += libgnashogl.la
+#plugins_LTLIBRARIES += libgnashogl.la
+libgnashogl_la_SOURCES = render_handler_tri.cpp render_handler_ogl.cpp
+#libgnashogl_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnashogl_la_LDFLAGS =
+endif
+
+if HAVE_AGG
+noinst_LTLIBRARIES += libgnashagg.la
+#plugins_LTLIBRARIES += libgnashagg.la
+libgnashagg_la_SOURCES = render_handler_tri.cpp render_handler_agg.cpp
+#libgnashagg_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnashagg_la_LDFLAGS =
+libgnashagg_la_LIBADD = $(AGG_LIBS)
+endif
+
+if HAVE_CAIRO
+noinst_LTLIBRARIES += libgnashcairo.la
+# plugins_LTLIBRARIES += libgnashcairo.la
+libgnashcairo_la_SOURCES = render_handler_tri.cpp render_handler_cairo.cpp
+#libgnashcairo_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnashcairo_la_LDFLAGS =
+endif
+
# Rebuild with GCC 4.x Mudflap support
mudflap:
@echo "Rebuilding with GCC Mudflap support"
@@ -134,3 +145,9 @@
clean-hook:
-rm -f core.*
+
+# install-pluginsLTLIBRARIES: $(plugins_LTLIBRARIES)
+# test -d "$(DESTDIR)$(pluginsdir)" || $(mkinstalldirs)
"$(DESTDIR)$(pluginsdir)"
+# for i in $(plugins_LTLIBRARIES); do \
+# $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$i
"$(DESTDIR)$(pluginsdir)/$$i" ; \
+# done
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- configure.ac 19 Jul 2007 14:44:28 -0000 1.358
+++ configure.ac 20 Jul 2007 01:50:31 -0000 1.359
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.358 2007/07/19 14:44:28 strk Exp $
+dnl $Id: configure.ac,v 1.359 2007/07/20 01:50:31 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -49,11 +49,12 @@
BUILDDATE="`date +%Y%m%d`"
dnl These are required by automake
-AM_INIT_AUTOMAKE(gnash, "cvs$BUILDDATE")
+dnl AM_INIT_AUTOMAKE(gnash, "cvs$BUILDDATE")
+AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
-AC_DISABLE_STATIC dnl Disable building static libs.
+dnl AC_DISABLE_STATIC dnl Disable building static libs.
AM_GNU_GETTEXT([external])
AM_CONDITIONAL(HAS_GETTEXT, test x$ac_cv_path_XGETTEXT != x)
@@ -141,6 +142,8 @@
cross_compiling=yes
fi
+dnl Don't add the GUI menu. Some educational systems think this adds
+dnl clutter and confusion, like on the OLPC.
AC_ARG_ENABLE(menus,
AC_HELP_STRING([--disable-menus],[Disable the GUI menus]),
[case "${enableval}" in
@@ -154,6 +157,21 @@
fi
AM_CONDITIONAL(MENUS, test x$menus = xyes)
+dnl Enable building the gui support even when statically
+dnl linking. Normally this is only disabled when building a statically
+dnl linked gnash executable.
+AC_ARG_ENABLE(dynamic-gui,
+ AC_HELP_STRING([--enable-dynamic-gui],[Enable building dynamically loadable
GUIs and renderers ]),
+[case "${enableval}" in
+ yes) dynamic_gui=yes ;;
+ no) dynamic_gui=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-dynamic-gui option])
;;
+esac],dynamic_gui=no)
+if test x"${dynamic_gui}" = x"yes"; then
+ AC_DEFINE([USE_DYNAMIC_GUI], [], [Dynamically loadable GUI and renderer
support])
+fi
+AM_CONDITIONAL(DYNAMIC_GUI, test x${dynamic_gui} = xyes)
+
dnl Write the file to disk in the plugin, if specified.
AC_ARG_ENABLE(write,
AC_HELP_STRING([--enable-write], [Makes the Mozilla plugin write the
currently playing SWF movie to /tmp.]),
@@ -174,7 +192,7 @@
yes) cygnal=yes ;;
no) cygnal=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for disable-cygnal option]) ;;
-esac],cygnal=yes)
+esac],cygnal=no)
AM_CONDITIONAL(CYGNAL, test x$cygnal = xyes)
@@ -211,59 +229,124 @@
*) AC_MSG_ERROR([bad value ${enableval} for --disable-klash option]) ;;
esac],klash=yes)
-AC_ARG_ENABLE(gui,
- AC_HELP_STRING([--enable-gui=TOOLKIT], [Specify GUI toolkit: GTK, FLTK,
RISCOS, AQUA (OS X), FB (framebuffer), KDE or SDL[[GTK]] ]),
- [case "${enableval}" in
- gtk|GTK) gui=gtk ;;
- sdl|SDL) gui=sdl ;;
- aqua|AQUA) gui=aqua ;;
- kde|KDE) gui=kde ;;
- fb|FB) gui=fb ;;
- fltk|FLTK) gui=fltk ;;
- riscos|RISCOS) gui=riscos ;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given]) ;;
- esac],
- [gui=gtk]
+addgui=none
+build_fb=no
+build_fltk=no
+build_kde=no
+build_gtk=no
+build_sdl=no
+build_riscos=no
+build_aqua=no
+AC_ARG_WITH(gui,
+ AC_HELP_STRING([--with-gui=], [Use the specified GUI toolkit
(default=gtk,kde)]),
+ if test -n ${withval}; then
+ addgui="${withval}"
+ withval=`echo ${withval} | tr '\054' ' ' `
+ fi
+ while test -n "${withval}" ; do
+ val=`echo ${withval} | cut -d ' ' -f 1`
+ [case "${val}" in
+ gtk|GTK|gtk2|GTK2)
+ build_gtk=yes
+ ;;
+ kde|KDE)
+ build_kde=yes
+ ;;
+ qt|QT)
+ build_qt=yes
+ ;;
+ sdl|SDL)
+ build_sdl=yes
+ ;;
+ aqua|AQUA|Aqua)
+ build_aqua=yes
+ ;;
+ riscos|RISCOS|RiscOS)
+ build_riscos=yes
+ ;;
+ fltk|FLTK|fltk2|FLTK2)
+ build_fltk=yes
+ ;;
+ fb|FB)
+ build_fb=yes
+ ;;
+ all|ALL)
+ build_fb=yes
+ build_fltk=yes
+ build_kde=yes
+ build_gtk=yes
+ build_sdl=yes
+dnl build_riscos=yes
+ ;;
+ *) AC_MSG_ERROR([invalid gui ${withval} given (accept:
gtk|kde|fltk|sdl|riscos|aqua|fb)])
+ ;;
+ esac]
+ withval=`echo ${withval} | cut -d ' ' -f 2-6`
+ if test x$val = x$withval; then
+ break;
+ fi
+ done
)
-dnl if test x"$klash" = xyes -a x"$gui" != xkde; then
-dnl AC_MSG_ERROR([You must use the kde GUI ( --enable-gui=KDE ) if you
enable klash.])
-dnl fi
+if test x$addgui = xnone; then
+ build_gtk=yes
+ build_kde=yes
+dnl addgui="gtk,kde"
+fi
-AC_ARG_ENABLE(renderer,
- AC_HELP_STRING([--enable-renderer=engine], [Specify rendering engine:
OpenGL, Agg or Cairo (experimental) [[OpenGL]] ]),
- [case "${enableval}" in
- opengl|OpenGL) renderer=opengl ;;
- cairo|Cairo) renderer=cairo ;;
- agg|Agg|AGG) renderer=agg ;;
- *) AC_MSG_ERROR([invalid renderer ${enableval} given]) ;;
- esac],
- [renderer=opengl]
+add_renderer=none
+build_ogl=no
+build_agg=no
+build_cairo=no
+AC_ARG_WITH(renderer,
+ AC_HELP_STRING([--with-renderer=], [Use the specified GUI toolkit
(default=ogl,agg)]),
+ if test -n ${withval}; then
+ add_renderer="${withval}"
+ withval=`echo ${withval} | tr '\054' ' ' `
+ fi
+ while test -n "${withval}" ; do
+ val=`echo ${withval} | cut -d ' ' -f 1`
+ [case "${val}" in
+ ogl|OGL|gl|GL|opengl|OPENGL|OpenGL)
+ build_ogl=yes
+ ;;
+ agg|AGG|Agg)
+ build_agg=yes
+ ;;
+ cairo|CAIRO|Cairo)
+ build_cairo=yes
+ ;;
+ all|ALL|All)
+ build_ogl=yes
+ build_agg=yes
+ build_cairo=yes
+ ;;
+ *) AC_MSG_ERROR([invalid renderer ${withval} given (accept:
ogl,agg,cairo)])
+ ;;
+ esac]
+ withval=`echo ${withval} | cut -d ' ' -f 2-6`
+ if test x$val = x$withval; then
+ break;
+ fi
+ done
)
-if test x$renderer = xopengl; then
- if test x"$gui" = xfb -o x"$gui" = xfltk; then
- AC_MSG_ERROR([OpenGL renderer is not supported by the $gui gui. Try using
AGG ( --enable-renderer=AGG ).]);
- fi
- AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
+if test x$add_renderer = xnone; then
+ build_ogl=yes
+ build_agg=yes
+dnl add_renderer="ogl,agg"
fi
-AM_CONDITIONAL(USE_RENDERER_OPENGL, test x$renderer = xopengl)
-if test x$renderer = xcairo; then
- if test x"$gui" = xfb; then
- AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
+if test x$build_ogl = xyes; then
+ if test x$build_fb = xyes -o x$build_fltk = xyes; then
+ AC_MSG_ERROR([OpenGL renderer is not supported by the this gui. Try using
AGG ( --enable-renderer=AGG ).]);
fi
- AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
+ AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
fi
-AM_CONDITIONAL(USE_RENDERER_CAIRO, test x$renderer = xcairo)
-if test x$renderer = xagg; then
- if test x"$gui" != xfb -a x"$gui" != xgtk -a x"$gui" != xsdl -a x"$gui" !=
xriscos -a x"$gui" != xfltk -a x"$gui" != xkde; then
- AC_MSG_ERROR([agg renderer is only supported by fb, gtk, riscos, sdl, fltk
and kde GUIs]);
- fi
+if test x$build_agg = xyes; then
AC_DEFINE([RENDERER_AGG], [], [Use AntiGrain renderer])
fi
-AM_CONDITIONAL(USE_RENDERER_AGG, test x$renderer = xagg)
dnl 16 bit: RGB555, RGB565
dnl 24 bit: RGB24, BGR24
@@ -308,8 +391,8 @@
)
if test x$pixelformat = xall; then
- if test x$renderer = xagg; then
- if test x"$gui" = x"gtk"; then
+ if test x$build_agg = xyes; then
+ if test x$build_gtk = xyes; then
AC_DEFINE(PIXELFORMAT_RGB24, [1], [RGB24 pixel format])
pixelformat="RGB24"
else
@@ -443,6 +526,99 @@
AC_PROG_INSTALL
AM_COMPILER_LIB
+AC_LIBLTDL_INSTALLABLE
+AC_LIBTOOL_DLOPEN
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+AC_C_CONST
+AC_C_INLINE
+AC_SUBST([LIBTOOL_DEPS])
+AC_LIB_LTDL
+
+AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
+AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
+AM_CONDITIONAL(STATIC_GUI, test x"${dynamic_gui}" = xno -o x"${enable_shared}"
= xno)
+dnl build a statically linked executable
+if test x"${enable_shared}" = xno; then
+ g=`echo $addgui | grep -c '\,'`
+ r=`echo $add_renderer | grep -c '\,'`
+ if test $g -gt 0 -o $r -gt 0 ; then
+ AC_MSG_ERROR([When statically linking, you must pick only one GUI toolkit
and one renderer])
+ fi
+ dnl If statically linking, and no gui is specified, force gtk
+ if test x$addgui = xnone; then
+ build_gtk=yes
+ build_kde=no
+ addgui=gtk
+ AC_MSG_NOTICE([Defaulting to GTK as the GUI, use --with-gui= to change])
+ fi
+ dnl If statically linking, and no renderer is specified, force opengl
+ if test x$add_renderer = xnone; then
+ build_agg=no
+ build_ogl=yes
+ add_renderer=ogl
+ AC_MSG_NOTICE([Defaulting to OpenGL as the renderer, use --with-renderer=
to change])
+ fi
+else dnl building a dynamically linked executable without loadable GUI plugins
+ dnl If not dynamic loading, and no gui is specified, force gtk
+ if test x"${dynamic_gui}" = xno; then
+ if test x$addgui = xnone; then
+ build_gtk=yes
+ build_kde=no
+ addgui=gtk
+ AC_MSG_NOTICE([Defaulting to GTK as the GUI, use --with-gui= to change])
+ fi
+ dnl If not dynamic loading, and no renderer is specified, force opengl
+ if test x$add_renderer = xnone; then
+ build_agg=no
+ build_ogl=yes
+ add_renderer=ogl
+ AC_MSG_NOTICE([Defaulting to OpenGL as the renderer, use
--with-renderer= to change])
+ fi
+ else
+ dnl If dynamically loading and no gui is specified, force gtk and kde
+ if test x$addgui = xnone; then
+ build_gtk=yes
+ build_kde=yes
+ addgui="gtk,kde"
+ AC_MSG_NOTICE([Defaulting to GTK and KDE as the GUIs, use --with-gui= to
change])
+ fi
+ dnl If dynamically loading and no renderer is specified, force opengl and
agg
+ if test x$add_renderer = xnone; then
+ build_ogl=yes
+ build_agg=yes
+ add_renderer="ogl,agg"
+ AC_MSG_NOTICE([Defaulting to OpenGL and AGG as the renderers, use
--with-renderer= to change])
+ fi
+ fi
+fi
+
+AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
+AM_CONDITIONAL(BUILD_KDE_GUI, [ test x$build_kde = xyes ])
+dnl AM_CONDITIONAL(BUILD_QT_GUI, [ test x$build_qt = xyes ])
+AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
+AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
+AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
+AM_CONDITIONAL(BUILD_AQUA_GUI, [ test x$build_aqua = xyes ])
+AM_CONDITIONAL(BUILD_RISCOS_GUI, [ test x$build_riscos = xyes ])
+
+AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes ])
+AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg = xyes ])
+AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x$build_cairo = xyes ])
+
+dnl AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has
lt_dlmutex_register]),
+dnl AC_DEFINE(LT_DLMUTEX, 0, [doesn't
have lt_dlmutex_register]) )
+
+DLOPEN="-dlopen"
+DLPREOPEN="-dlpreopen"
+AC_SUBST(DLOPEN)
+AC_SUBST(DLPREOPEN)
+
+dnl dnl Substitute INCLTDL and LIBLTDL in the Makefiles
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(LIBTOOL_DEPS)
+
dnl Darwin uses libtool instead of ar to produce libraries. We determine which
one
dnl we have here now. For some reason on Darwin, we don't get the
dnl count from grep via stdin correctly. Writing a temp file does the
@@ -506,7 +682,6 @@
AC_CHECK_FUNCS(mallinfo)
PKG_PROG_PKG_CONFIG
-dnl LIBS+="-L/usr/lib64"
AC_PATH_TOOL([AUTOTRACE], [autotrace])
AC_HEADER_DIRENT
@@ -546,19 +721,23 @@
LIBS=$save_LIBS
;;
esac
-dnl AC_PATH_XTRA
-GNASH_PATH_X11
AC_CHECK_HEADERS(malloc.h)
AC_CHECK_HEADERS(getopt.h)
AC_CHECK_HEADERS(libgen.h)
+AC_CHECK_LIB(m, sqrt)
-dnl seems unused
+dnl don't look for X11 when using a raw framebuffer for the GUI
+if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o
x$build_sdl = xyes; then
+dnl AC_PATH_XTRA
dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
dnl AC_CHECK_LIB(gmp, _gmp_get_memory_functions)
-AC_CHECK_LIB(m, sqrt)
-AC_CHECK_LIB(Xi, XInput_find_display)
-AC_CHECK_LIB(X11, XDisableAccessControl)
+ GNASH_PATH_X11
+ AC_CHECK_LIB(Xi, XInput_find_display)
+ AC_CHECK_LIB(X11, XDisableAccessControl)
+fi
+AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
+
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open shm_unlink)
AC_TRY_COMPILE([#include <strings.h>], [
@@ -594,8 +773,7 @@
AC_LANG_PUSH(C++)
AC_CACHE_CHECK([whether $CXX implements __PRETTY_FUNCTION__],
ac_cv_implements___PRETTY_FUNCTION__, [
- AC_TRY_LINK([
-#include <cstdio>
+ AC_TRY_LINK([#include <cstdio>
],
[ std::printf("%s", __PRETTY_FUNCTION__); ],
[ ac_cv_implements___PRETTY_FUNCTION__="yes" ],
@@ -607,8 +785,7 @@
fi
AC_CACHE_CHECK([whether $CXX implements __FUNCTION__],
ac_cv_implements___FUNCTION__, [
- AC_TRY_LINK([
-#include <cstdio>
+ AC_TRY_LINK([#include <cstdio>
],
[ std::printf("%s", __FUNCTION__); ],
[ ac_cv_implements___FUNCTION__="yes" ],
@@ -620,8 +797,7 @@
fi
AC_CACHE_CHECK([whether $CXX implements __func__], ac_cv_implements___func__, [
- AC_TRY_LINK([
-#include <cstdio>
+ AC_TRY_LINK([#include <cstdio>
],
[ std::printf("%s", __func__); ],
[ ac_cv_implements___func__="yes" ],
@@ -671,7 +847,7 @@
#include <stdio.h>
#include <time.h>
extern long timezone;
-],
+ ],
[ printf("%ld", timezone); ],
[ ac_cv_long_timezone="yes" ],
[ ac_cv_long_timezone="no" ]
@@ -681,7 +857,6 @@
AC_DEFINE(HAVE_LONG_TIMEZONE, [1], [extern timezone is a long integer,
not a function])
fi
-
AC_CHECK_FUNCS(sysconf)
AC_CHECK_FUNCS(shmget shmat shmdt mmap)
AC_CHECK_FUNCS(memmove)
@@ -717,7 +892,9 @@
GNASH_PKG_FIND(freetype2, [freetype/freetype.h], [freetype2 font library],
FT_Load_Char)
GNASH_PKG_FIND(fontconfig, [fontconfig/fontconfig.h], [fontconfig library],
FcFontMatch)
-AC_PATH_MING
+if test x$cross_compiling = xno; then
+ AC_PATH_MING
+fi
AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
AM_CONDITIONAL(MAKESWF_SUPPORTS_PREBUILT_CLIPS,
[ test x"$MAKESWF" != x && test $MING_VERSION_CODE -ge 00040002 ])
@@ -726,33 +903,36 @@
AM_CONDITIONAL(MING_SUPPORTS_REPLACE_TAG,
[ test x"$MAKESWF" != x && test $MING_VERSION_CODE -ge 00040005 ])
-AC_ARG_WITH([swfdec_testsuite],
+if test x$cross_compiling = xno; then
+ AC_ARG_WITH([swfdec_testsuite],
AC_HELP_STRING([--with-swfdec-testsuite],
[directory where swfdec testsuite (the 'test' dir) is]),
SWFDEC_TESTSUITE=${withval})
-AC_SUBST(SWFDEC_TESTSUITE)
+ AC_SUBST(SWFDEC_TESTSUITE)
+fi
AM_CONDITIONAL(ENABLE_SWFDEC_TESTSUITE, [ test x"$SWFDEC_TESTSUITE" != x ])
dnl
-dnl See if we can use the swfmill based testsuite
+dnl See if we can use the swfmill and mtasc based testsuites
dnl
-AC_PATH_PROG(SWFMILL, swfmill)
+if test x$cross_compiling = xno; then
+ AC_PATH_PROG(SWFMILL, swfmill)
+ AC_PATH_MTASC
+fi
AM_CONDITIONAL(ENABLE_SWFMILL, [ test x"$SWFMILL" != x ])
+AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
AC_PATH_PROG(DOXYGEN, doxygen)
AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
-AC_PATH_MTASC
-AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
-
dnl currently unused
dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
-if test x"$gui" = xsdl -o x"$media_handler" = xffmpeg -o x"$media_handler" =
xmad; then
+if test x$build_sdl = xyes -o x"$media_handler" = xffmpeg -o x"$media_handler"
= xmad; then
GNASH_PATH_SDL
fi
-AM_CONDITIONAL(HAS_SDL, [ test x$has_SDL = xyes ])
+AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
GNASH_PATH_BOOST
GNASH_PATH_LIBXML
@@ -774,7 +954,7 @@
fi
dnl # Check KDE if kde gui or klash were requested
-if test x"$gui" = xkde -o x$klash = xyes; then
+if test x$build_kde = xyes -o x$klash = xyes -o x$plugin = xno; then
kde=yes
qt=yes
GNASH_PATH_KDE
@@ -801,27 +981,27 @@
AC_SUBST(KDE_CFLAGS)
AC_SUBST(KDE_LIBS)
-if test x$renderer = xopengl; then
+if test x$build_ogl = xyes; then
GNASH_PATH_OPENGL
fi
-AM_CONDITIONAL(opengl, [test x$opengl = xyes])
-
dnl Need GLIB for both GTK and GST
-if test x${gui} = "xgtk" -o x${media_handler} = "xgst"; then
+if test x$build_gtk = xyes -o x${media_handler} = "xgst"; then
GNASH_PATH_GLIB
fi
AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
-if test x$gui = xgtk; then
- if test x$renderer = xopengl; then
+if test x$build_ogl = xyes -a x$build_gtk = xyes; then
GNASH_PATH_GLEXT
- fi
+fi
+if test x$build_gtk = xyes; then
GNASH_PATH_GTK2
GNASH_PATH_PANGO
GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init,
[1.0])
+fi
+if test x$build_gtk = xyes; then
AC_ARG_ENABLE(ghelp,
AC_HELP_STRING([--enable-ghelp], [Enable support for the GNOME help
system]),
[case "${enableval}" in
@@ -843,9 +1023,8 @@
fi
fi
AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
-AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
-if test x"$gui" = x"fltk"; then
+if test x$build_fltk = xyes; then
GNASH_PKG_FIND(Xft, [Xft.h], [xft library], XftGlyphRender)
fi
@@ -865,34 +1044,15 @@
AM_CONDITIONAL(HAVE_GLEXT, [test x$glext = xyes])
dnl We don't have GTKGLExt, so default to SDL, and don't build the Firefox
plugin
-if test x$glext = xno -a x$renderer = xopengl; then
- if test x$gtk2 = xyes -a x$gui = xgtk; then
+if test x$glext = xno -a x$build_ogl = xyes; then
+ if test x$gtk2 = xyes -a x$build_gtk = xyes; then
AC_ERROR([You have GTK installed, but not GtkGLExt. You need GtkGLExt to
use the OpenGL renderer. Attempting to build SDL version])
fi
gui=sdl
plugin=no
AC_MSG_WARN([GTK2 specified for the GUI, but GtkGlExt is not present. Trying
SDL instead.])
fi
-
AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
-AM_CONDITIONAL(USE_GUI_GTK, test x$gui = xgtk)
-AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
-AM_CONDITIONAL(USE_GUI_AQUA, test x$gui = xaqua)
-AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
-AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
-AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
-AM_CONDITIONAL(USE_GUI_RISCOS, test x$gui = xriscos)
-
-case "${gui}" in
- gtk) AC_DEFINE([GUI_GTK], [1], [Use GTK gui toolkit]) ;;
- sdl) AC_DEFINE([GUI_SDL], [1], [Use SDL gui toolkit]) ;;
- aqua) AC_DEFINE([GUI_AQUA],[1], [Use AQUA (OS X) gui toolkit]) ;;
- kde) AC_DEFINE([GUI_KDE], [1], [Use KDE gui toolkit]) ;;
- fltk) AC_DEFINE([GUI_FLTK], [1], [Use FLTK gui toolkit]) ;;
- fb) AC_DEFINE([GUI_FB], [1], [Use Framebuffer, no gui toolkit]) ;;
- riscos) AC_DEFINE([GUI_RISCOS], [1], [Use RISC OS gui toolkit]) ;;
- *)
-esac
if test x"$media_handler" = x"ffmpeg"; then
GNASH_PATH_FFMPEG
@@ -930,7 +1090,6 @@
fi
fi
-
if test x"$media_handler" = x"mad"; then
dnl Will set MAD_LIBS and MAD_CFLAGS.
dnl Handles --with-mad-incl and --with-mad-lib
@@ -944,6 +1103,20 @@
fi
fi
+if test x$build_cairo = xyes; then
+ GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
+dnl if test x"${CAIRO_CFLAGS}" != x; then
+dnl CAIRO_CFLAGS=`echo ${CAIRO_CFLAGS} | sed -e 's/ *//'`
+dnl CAIRO_CFLAGS="${CAIRO_CFLAGS} ${CAIRO_CFLAGS}/cairo"
+dnl fi
+ if test x$build_fb = xyes; then
+ AC_MSG_ERROR([cairo renderer is not supported by fb gui]);
+ fi
+ AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
+fi
+
+AM_CONDITIONAL(HAVE_CAIRO, [test x"${CAIRO_LIBS}" != x])
+
dnl I'm kinda lazy, get rid of this later... //Markus
AM_CONDITIONAL(HAVE_MAD, test x"$media_handler" = xmad)
@@ -951,6 +1124,7 @@
AM_CONDITIONAL(USE_SOUND_SDL, test x"$media_handler" = xmad -o
x"$media_handler" = xffmpeg)
AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x"$media_handler" = xffmpeg)
AM_CONDITIONAL(USE_MAD_ENGINE, test x"$media_handler" = xmad)
+AM_CONDITIONAL(HAVE_OPENGL, test x"${OPENGL_LIBS}" != x)
dnl AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
@@ -970,50 +1144,23 @@
dnl I'm kinda lazy, get rid of this later... //Markus
AM_CONDITIONAL(HAVE_GST, test x$media_handler = xgst)
-if test x$gui = xfltk; then
+if test x$build_fltk = xyes; then
GNASH_PKG_FIND(fltk2, [fltk/FL_API.h], [Fast Light Toolkit], fl_window_flush)
fi
-AM_CONDITIONAL(HAS_FLTK2, [ test x$has_fltk2 = xyes ])
+AM_CONDITIONAL(HAVE_FLTK2, [ test x$has_fltk2 = xyes ])
AM_CONDITIONAL(HAS_XFT, [ test x$has_xft = xyes ])
-
-if test x$renderer = xagg; then
+if test x$build_agg = xyes; then
GNASH_PATH_AGG
fi
-if test x$renderer = xcairo -o x$gui = xgtk; then
- dnl Cairo renderer and GTK gui always need Cairo
- GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
-fi
-
GNASH_DOCBOOK
AM_CONDITIONAL(DOCBOOK, test x$docbook = xyes)
+AM_CONDITIONAL(HAVE_AGG, [test x"${AGG_LIBS}" != x])
GNASH_PATH_CURL
-AC_LIBLTDL_INSTALLABLE
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_C_CONST
-AC_C_INLINE
-AC_SUBST([LIBTOOL_DEPS])
-AC_LIB_LTDL
-
-dnl AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has
lt_dlmutex_register]),
-dnl AC_DEFINE(LT_DLMUTEX, 0, [doesn't
have lt_dlmutex_register]) )
-
-DLOPEN="-dlopen"
-DLPREOPEN="-dlpreopen"
-AC_SUBST(DLOPEN)
-AC_SUBST(DLPREOPEN)
-
-dnl dnl Substitute INCLTDL and LIBLTDL in the Makefiles
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_SUBST(LIBTOOL_DEPS)
-
dnl Define winsock if we're on windows. We could do something complicated,
dnl but since AC_EXEEXT does it for us, we'll do this the easy way.
if test x"$EXEEXT" = "exe"; then
@@ -1077,7 +1224,7 @@
[strict=no]
)
-if test x"$strict" = x"yes" -a x"$renderer" = x"agg"; then
+if test x"$strict" = x"yes" -a x$build_agg = xyes; then
AC_MSG_ERROR([agg renderer will fail with --enable-strict.]);
fi
@@ -1131,11 +1278,11 @@
dnl Define convienience constants so Gnash can print out the
dnl default configuration of the build.
-RENDERER_CONFIG=$renderer
+RENDERER_CONFIG=${add_renderer}
AC_SUBST(RENDERER_CONFIG)
-GUI_CONFIG=$gui
+GUI_CONFIG=${addgui}
AC_SUBST(GUI_CONFIG)
-MEDIA_CONFIG=$media_handler
+MEDIA_CONFIG=${media_handler}
AC_SUBST(MEDIA_CONFIG)
dnl AC_CONFIG_LINKS(doc/C/images)
@@ -1177,11 +1324,11 @@
plugin/Makefile
plugin/klash/Makefile
cygnal/Makefile
-cygnal/ACT/Makefile
-cygnal/IO/Makefile
-cygnal/HTTP/Makefile
-cygnal/Net/Makefile
-cygnal/unit_tests/Makefile
+dnl cygnal/ACT/Makefile
+dnl cygnal/IO/Makefile
+dnl cygnal/HTTP/Makefile
+dnl cygnal/Net/Makefile
+dnl cygnal/unit_tests/Makefile
)
###
@@ -1222,6 +1369,12 @@
echo " Konqueror plugin disabled."
fi
+if test x"${dynamic_gui}" = x"yes"; then
+ echo " Loadable GUI & renderer enabled (default). Use
--disable-dynamic-gui to disable"
+else
+ echo " Loadable GUI & renderer disabled."
+fi
+
if test x"$ghelp" = x"yes"; then
echo " GNOME help enabled"
else
@@ -1250,7 +1403,7 @@
echo " Top level for cross compiling support files is:
$with_top_level"
fi
-if test x"$gui" = xgtk -a x"$pixelformat" = xrgb565; then
+if test x$build_gtk = xyes -a x$pixelformat = xrgb565; then
echo " WARNING: Pixel format RGB565 selected in combination with the"
echo " GTK GUI. Only a hacked GTK will work (e.g. on the
OLPC)."
fi
@@ -1258,9 +1411,8 @@
if test x"$extensions_list" != x; then
echo " Building extensions: ${extensions_list}"
fi
-
-echo " Renderer engine: "$renderer
-echo " GUI: "$gui
+echo " GUI toolkits supported: ${addgui}"
+echo " Renderers supported: ${add_renderer}"
echo " Media handler: "$media_handler
if test x"$media_handler" = xffmpeg -o x"$media_handler" = xmad; then
echo " Using SDL for sound handling"
@@ -1301,7 +1453,7 @@
echo " KDE flags are: $KDE_CFLAGS"
echo " KDE libs are: $KDE_LIBS"
else
- if test x$gui = xkde -o x$klash = xyes ; then
+ if test x$build_kde = xyes -o x$klash = xyes ; then
echo " ERROR: No KDE development package installed!"
echo " Reconfigure with --disable-klash and/or"
echo " change to a different gui with --enable-gui=..."
@@ -1315,7 +1467,7 @@
echo " QT flags are: $QT_CFLAGS"
echo " QT libs are: $QT_LIBS"
else
- if test x$gui = xkde -o x$klash = xyes ; then
+ if test x$build_kde = xyes -o x$klash = xyes ; then
if test x"$has_kde" != xyes; then
# We have already moaned about KDE absence, so presumably they'll get
# QT-dev when they install KDE-dev
@@ -1328,8 +1480,8 @@
if test x$klash = xyes; then
echo " or reconfigure with --disable-klash"
fi
- if test x$gui = xkde; then
- echo " or change to a different gui with
--enable-gui=..."
+ if test x$build_kde = xyes; then
+ echo " or change to a different gui with
--with-gui=..."
fi
fi
nogo=true
@@ -1395,7 +1547,7 @@
fi
dnl GLEXT is only needed for GTK/OpenGL
-if test x"$gui" = x"gtk" -a x"$renderer" = xopengl ; then
+if test x$build_gtk = xyes -a x$build_ogl = xyes ; then
if test x"$GLEXT_LIBS" != x; then
if test x"$GLEXT_CFLAGS" != x; then
echo " GtkGLExt flags are: $GLEXT_CFLAGS"
@@ -1404,8 +1556,8 @@
fi
echo " GtkGLExt libs are: $GLEXT_LIBS"
else
- if test x"$gui" = x"gtk"; then
- if test x"$renderer" = x"opengl"; then
+ if test x$build_gtk = xyes; then
+ if test x$build_ogl = xyes; then
echo " ERROR: No GtkGLExt development package installed!"
echo " It is needed to build the GTK/OpenGL GUI/renderer
combination."
echo " Either install it from
http://gtkglext.sourceforge.net";
@@ -1418,8 +1570,7 @@
fi
fi
-if test x"$gui" = x"gtk"; then
-
+if test x$build_gtk = xyes; then #{
if test x"$GTK2_LIBS" != x; then
if test x"$GTK2_CFLAGS" != x; then
echo " GTK2 flags are: $GTK2_CFLAGS"
@@ -1554,7 +1705,7 @@
fi
fi
-if test "$renderer" = "cairo"; then
+if test x$build_cairo = xyes; then
if test x"$CAIRO_LIBS" != x; then
if test x"$CAIRO_CFLAGS" != x; then
echo " Cairo flags are: $CAIRO_CFLAGS"
@@ -1573,7 +1724,7 @@
fi
fi
-if test x$gui = xfltk; then
+if test x$build_fltk = xyes; then
if test x"$FLTK2_LIBS" != x; then
if test x"$FLTK2_CFLAGS" != x; then
echo " FLTK flags are: $FLTK2_CFLAGS"
@@ -1592,7 +1743,7 @@
fi
fi
-if test x"$gui" = x"fltk"; then
+if test x$build_fltk = xyes; then
if test x"$XFT_LIBS" != x; then
if test x"$XFT_CFLAGS" != x; then
echo " Xft flags are: $XFT_CFLAGS"
@@ -1611,7 +1762,7 @@
# See whether SDL is required
need_sdl=false
-test x"$gui" = x"sdl" && need_sdl=true
+test x$build_sdl = xyes && need_sdl=true
test x"$media_handler" = x"ffmpeg" && need_sdl=true
test x"$media_handler" = x"mad" && need_sdl=true
@@ -1624,7 +1775,7 @@
echo " Install it from
http://www.libsdl.org/download-1.2.php";
echo " or .deb users: apt-get install libsdl1.2-dev"
echo " or .rpm users: yum install SDL-devel"
- [ x"$gui" == x"sdl" ] &&
+ [ x$build_sdl == xyes ] &&
echo " or select a different GUI with --enable-gui= "
[ x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad" ] &&
echo " or use --enable-media=gst"
@@ -1689,7 +1840,7 @@
echo " or .rpm users: yum install curl-devel"
fi
-if test x$renderer = xagg; then
+if test x$build_agg = xyes; then
echo " AGG Pixel format is: $pixelformat"
if test x"${agg25}" = xyes; then
if test x"$AGG_LIBS" != x; then
@@ -1740,7 +1891,9 @@
nogo=true
fi
-if test x"$MING_LIBS" != x; then
+dnl don't look for the flash compilers when cross compiling.
+if test x$cross_compiling = xno; then
+ if test x"$MING_LIBS" != x; then
echo " MING version code is $MING_VERSION_CODE"
echo " MING flags are $MING_CFLAGS"
echo " MING libs are $MING_LIBS"
@@ -1750,28 +1903,29 @@
echo " installed to run most of the tests in Gnash
testsuite."
echo " Install it from http://ming.sourceforge.net";
echo " or .deb users: apt-get install libming-dev"
-fi
+ fi
-if test x"$SWFDEC_TESTSUITE" != x; then
+ if test x"$SWFDEC_TESTSUITE" != x; then
echo " SWFDEC testsuite dir is $SWFDEC_TESTSUITE"
-fi
+ fi
-if test x"$MTASC" != x; then
+ if test x"$MTASC" != x; then
echo " MTASC is $MTASC"
echo " MTASC CLASSPATH is $MTASC_CLASSPATH"
-else
+ else
echo " WARNING: You need to have the MTASC compiler packages
installed"
echo " to run some of the tests in Gnash testsuite."
echo " You can install it from http://mtasc.org";
echo " or .deb users: apt-get install mtasc"
-fi
+ fi
-if test x"$SWFMILL" != x; then
+ if test x"$SWFMILL" != x; then
echo " SWFMILL is $SWFMILL"
-else
+ else
echo " WARNING: You need to have the 'swfmill' tool installed"
echo " to run some of the tests in Gnash testsuite."
echo " You can install it from
http://iterative.org/swfmill/";
+ fi
fi
if test x"$Z_LIBS" != x; then
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- Makefile.am 1 Jul 2007 10:53:46 -0000 1.79
+++ Makefile.am 20 Jul 2007 01:50:31 -0000 1.80
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.79 2007/07/01 10:53:46 bjacques Exp $
+# $Id: Makefile.am,v 1.80 2007/07/20 01:50:31 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -100,38 +100,6 @@
# Set a few variables to what features we selected so we can dump it with the
# test of the config
-if USE_SOUND_GST
- MEDIA_OPT=gst
-endif
-
-if USE_MAD_ENGINE
- MEDIA_OPT=mad
-endif
-if USE_FFMPEG_ENGINE
- MEDIA_OPT=ffmpeg
-endif
-
-if USE_GUI_GTK
- GUI_OPT=gtk2
-endif
-if USE_GUI_SDL
- GUI_OPT=sdl
-endif
-if USE_GUI_KDE
- GUI_OPT=kde
-endif
-if USE_GUI_FLTK
- GUI_OPT=fltk2
-endif
-if USE_RENDERER_OPENGL
- RENDER_OPT=opengl
-endif
-if USE_RENDERER_CAIRO
- RENDER_OPT=cairo
-endif
-if USE_RENDERER_AGG
- RENDER_OPT=agg
-endif
dumpconfig:
@echo ""
@@ -168,13 +136,13 @@
@echo " QT_CFLAGS is $(QT_CFLAGS)"
@echo " QT_LIBS is $(QT_LIBS)"
endif
-if USE_GUI_FLTK
+if BUILD_FLTK_GUI
@echo " FLTK2_CFLAGS is $(FLTK2_CFLAGS)"
@echo " FLTK2_LIBS is $(FLTK2_LIBS)"
@echo " XFT_CFLAGS is $(XFT_CFLAGS)"
@echo " XFT_LIBS is $(XFT_LIBS)"
endif
-if USE_GUI_GTK
+if BUILD_GTK_GUI
@echo " GTK2_CFLAGS is $(GTK2_CFLAGS)"
@echo " GTK2_LIBS is $(GTK2_LIBS)"
@echo " PANGO_CFLAGS is $(PANGO_CFLAGS)"
@@ -234,13 +202,13 @@
@echo "Graphics support..."
@echo " CAIRO_CFLAGS is $(CAIRO_CFLAGS)"
@echo " CAIRO_LIBS is $(CAIRO_LIBS)"
-if USE_RENDERER_OPENGL
+if BUILD_OGL_RENDERER
@echo " GLEXT_CFLAGS is $(GLEXT_CFLAGS)"
@echo " GLEXT_LIBS is $(GLEXT_LIBS)"
@echo " OPENGL_CFLAGS is $(OPENGL_CFLAGS)"
@echo " OPENGL_LIBS is $(OPENGL_LIBS)"
endif
-if USE_RENDERER_AGG
+if BUILD_AGG_RENDERER
@echo " AGG_CFLAGS is $(AGG_CFLAGS)"
@echo " AGG_LIBS is $(AGG_LIBS)"
endif
@@ -249,10 +217,10 @@
@echo "legit value"
@echo ""
@echo "Configurable options are:"
- @echo "Media handler: $(MEDIA_OPT)"
- @echo "Renderer engine: $(RENDER_OPT)"
- @echo "GUI: $(GUI_OPT)"
- @echo "Extensions: $(EXTENSIONS_LIST)"
+ @echo "Media handler: $(MEDIA_CONFIG)"
+ @echo "Renderer engine: $(RENDERER_CONFIG)"
+ @echo "GUI: $(GUI_CONFIG)"
+# @echo "Extensions: "
check: check-recursive anal
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3769
retrieving revision 1.3770
diff -u -b -r1.3769 -r1.3770
--- ChangeLog 19 Jul 2007 15:57:18 -0000 1.3769
+++ ChangeLog 20 Jul 2007 01:50:31 -0000 1.3770
@@ -1,3 +1,41 @@
+2007-07-19 Rob Savoye <address@hidden>
+
+ * gui/Makefile.am: Use *_CONFIG variables instead of *_OPT
+ ones. Use BUILD_* conditionals instead of USE_GUI.
+ * backend/Makefile.am: Build seperate libraries for each backend.
+ * configure.ac: Don't pass the data to AM_INIT_AUTOMAKE. Don't
+ disable static libs. Add option for dynamically loading
+ guis. (disabled by default for now). Don't build cygnal by
+ default. Remove --enable-gui and --enable-renderer with new
+ options, --with-gui and --with-renderer to list multiple options
+ for guis and renderers. Don't configure cygnal sub directories yet.
+ * Makefile.am: Use *_CONFIG variables instead of *_OPT ones.
+ * extensions/Makefile.am: Use BUILD_* conditionals instead of
+ USE_GUI.
+ * libbase/Makefile.am: Use HAVE_SDL instead of HAS_SDL.
+ * macros/gtkglext.m4: Use --libs-only-l insted of --libs.
+ * testsuite/misc-ming.all/DefineEditTextTest.c: Include fontlib.h.
+ * macros/libltdl.m4: Move the serial numbers to the top to keep
+ automate 1.19 happy.
+ * macros/x11.m4: Don't put a conditional in an if block.
+
+2007-07-15 Rob Savoye <address@hidden>
+
+ * po/Makefile.am: Add -Wno-portability to AUTOMAKE_OPTIONS to
+ stop complaints we don't care about.
+ * gui/Makefile.am: Add -Wno-portability to AUTOMAKE_OPTIONS to
+ stop complaints we don't care about.
+ * testsuite/misc-ming.all/Makefile.am: Add -Wno-portability to
+ AUTOMAKE_OPTIONS to stop complaints we don't care about.
+ * testsuite/misc-swfmill.all/Makefile.am: Add -Wno-portability to
+ AUTOMAKE_OPTIONS to stop complaints we don't care about.
+ * testsuite/swfdec/Makefile.am: Add -Wno-portability to
+ AUTOMAKE_OPTIONS to stop complaints we don't care about.
+
+2007-07-14 Rob Savoye <address@hidden>
+
+ * configure.ac: Add new Cygnal directories.
+
2007-07-19 Sandro Santilli <address@hidden>
* testsuite/actionscript.all/TextField.as: more successes.
@@ -90,6 +128,7 @@
server/asobj/{Sound, Netstream}Ffmpeg.h, gui/gnash.cpp: Fix for
linking.
+>>>>>>> 1.3749
2007-07-17 Zou Lunkai <address@hidden>
* testsuite/actionscript.all/MovieClip.as: more tests, all passed.
@@ -110,6 +149,7 @@
handling cleanups, for better management of key listeners. change
key listeners container from std::vector to std::set. Correct indent.
+>>>>>>> 1.3745
2007-07-14 Rob Savoye <address@hidden>
* configure.ac: Add new Cygnal directories.
@@ -240,6 +280,7 @@
* testsuite/actionscript.all/Makefile.am: activate enumerate.as and
case.as.
+>>>>>>> 1.3741
2007-07-11 Sandro Santilli <address@hidden>
* server/edit_text_character.cpp (remove the "default" font logic,
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- libbase/Makefile.am 1 Jul 2007 10:54:07 -0000 1.76
+++ libbase/Makefile.am 20 Jul 2007 01:50:32 -0000 1.77
@@ -70,7 +70,7 @@
$(PTHREAD_LIBS) \
$(NULL)
-if HAS_SDL
+if HAVE_SDL
SDL_FILE = tu_file_SDL.cpp
libgnashbase_la_LIBADD += $(SDL_LIBS)
else
Index: extensions/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- extensions/Makefile.am 1 Jul 2007 10:53:58 -0000 1.8
+++ extensions/Makefile.am 20 Jul 2007 01:50:32 -0000 1.9
@@ -32,7 +32,7 @@
endif
if BUILD_GTK_EXT
-if USE_GUI_GTK
+if BUILD_GTK_GUI
OTHER_DIRS += gtk2
endif
endif
Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/x11.m4 1 Jul 2007 10:54:14 -0000 1.12
+++ macros/x11.m4 20 Jul 2007 01:50:32 -0000 1.13
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: x11.m4,v 1.12 2007/07/01 10:54:14 bjacques Exp $
+dnl $Id: x11.m4,v 1.13 2007/07/20 01:50:32 rsavoye Exp $
AC_DEFUN([GNASH_PATH_X11],
[
@@ -121,8 +121,6 @@
x11=yes
fi
- AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
-
if test "x$x11" = xyes; then
AC_DEFINE(HAVE_X11, [1], [X11 headers and libraries])
fi
Index: macros/libltdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libltdl.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/libltdl.m4 1 Jul 2007 10:54:13 -0000 1.3
+++ macros/libltdl.m4 20 Jul 2007 01:50:32 -0000 1.4
@@ -9,6 +9,7 @@
# serial 48 AC_PROG_LIBTOOL
+# serial 7 AC_LIB_LTDL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
# -----------------------------------------------------------
@@ -6419,8 +6420,6 @@
## unlimited permission to copy and/or distribute it, with or without
## modifications, as long as this notice is preserved.
-# serial 7 AC_LIB_LTDL
-
# AC_WITH_LTDL
# ------------
# Clients of libltdl can use this macro to allow the installer to
Index: testsuite/misc-ming.all/DefineEditTextTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextTest.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/misc-ming.all/DefineEditTextTest.c 18 Jul 2007 05:20:43
-0000 1.18
+++ testsuite/misc-ming.all/DefineEditTextTest.c 20 Jul 2007 01:50:32
-0000 1.19
@@ -33,6 +33,7 @@
#include <ming.h>
#include "ming_utils.h"
+#include "fontlib.h"
#define OUTPUT_VERSION 7
#define OUTPUT_FILENAME "DefineEditTextTest.swf"
- [Gnash-commit] gnash gui/Makefile.am backend/Makefile.am confi...,
Rob Savoye <=