[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac gui/Makefile.am gu...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac gui/Makefile.am gu... |
|
Date: |
Sun, 15 Oct 2006 14:26:05 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/10/15 14:26:05
Modified files:
. : ChangeLog configure.ac
gui : Makefile.am gui.cpp
macros : agg.m4 atk.m4 boost.m4 cairo.m4 curl.m4
dmalloc.m4 docbook.m4 ffmpeg.m4 firefox.m4
fltk.m4 ghelp.m4 glib.m4 gstreamer.m4 gtk2.m4
gtkglext.m4 jpeg.m4 libXML.m4 mad.m4 ming.m4
ogg.m4 opengl.m4 pango.m4 png.m4 sdl.m4
vorbis.m4 xft.m4 zlib.m4
server : action.cpp
Log message:
* configure.ac: Print KDE configuration flags when using KDE.
* gui/Makefile.am: Correct the order of KDE linker flags.
* gui/gui.cpp: Fix a typo.
* macros/docbook.m4: Substitute variables used in Makefiles, so they
can be used by `make'.
* server/action.cpp: Remove unused GUI code.
* configure.ac, macros: Implement all configuration option
descriptions using AC_HELP_STRING for a pretty alignment.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1218&r2=1.1219
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/dmalloc.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/docbook.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/fltk.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ghelp.m4?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mad.m4?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/png.m4?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/vorbis.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/xft.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/zlib.m4?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.102&r2=1.103
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1218
retrieving revision 1.1219
diff -u -b -r1.1218 -r1.1219
--- ChangeLog 15 Oct 2006 09:45:08 -0000 1.1218
+++ ChangeLog 15 Oct 2006 14:26:04 -0000 1.1219
@@ -1,3 +1,14 @@
+2006-10-15 Bastiaan Jacques <address@hidden>
+
+ * configure.ac: Print KDE configuration flags when using KDE.
+ * gui/Makefile.am: Correct the order of KDE linker flags.
+ * gui/gui.cpp: Fix a typo.
+ * macros/docbook.m4: Substitute variables used in Makefiles, so they
+ can be used by `make'.
+ * server/action.cpp: Remove unused GUI code.
+ * configure.ac, macros: Implement all configuration option
+ descriptions using AC_HELP_STRING for a pretty alignment.
+
2006-10-15 Markus Gothe <address@hidden>
* backend/render_handler_agg.h: Chmod -x.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- configure.ac 14 Oct 2006 00:05:51 -0000 1.157
+++ configure.ac 15 Oct 2006 14:26:04 -0000 1.158
@@ -33,7 +33,7 @@
dnl also makes it possible to release a modified version which carries
dnl forward this exception.
-dnl $Id: configure.ac,v 1.157 2006/10/14 00:05:51 rsavoye Exp $
+dnl $Id: configure.ac,v 1.158 2006/10/15 14:26:04 bjacques Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.1-cvs)
@@ -59,7 +59,7 @@
AC_DISABLE_STATIC dnl Disable building static libs.
dnl Add KFLASH support, if specified.
-AC_ARG_ENABLE(klash, [ --enable-klash Enable support for Konqueror
plugin],
+AC_ARG_ENABLE(klash, AC_HELP_STRING([--enable-klash], [Enable support for
Konqueror plugin]),
[case "${enableval}" in
yes) klash=yes ;;
no) klash=no ;;
@@ -67,7 +67,7 @@
esac],klash=no)
AM_CONDITIONAL(KLASH, test x$klash = xyes)
-AC_ARG_ENABLE(fork, [ --disable-fork Use a thread instead forking
the standalone player.],
+AC_ARG_ENABLE(fork, AC_HELP_STRING([--disable-fork],[Use a thread instead
forking the standalone player.]),
[case "${enableval}" in
yes) fork=yes ;;
no) fork=no ;;
@@ -79,7 +79,7 @@
fi
dnl Write the file to disk in the plugin, if specified.
-AC_ARG_ENABLE(write, [ --enable-write Use a thread instead writeing
the standalone player.],
+AC_ARG_ENABLE(write, AC_HELP_STRING([--enable-write], [Use a thread instead
writeing the standalone player.]),
[case "${enableval}" in
yes) write=yes ;;
no) write=no ;;
@@ -91,7 +91,7 @@
fi
dnl Add XML support, if specified.
-AC_ARG_ENABLE(xml, [ --disable-xml Disable support for XML and
XMLSocket],
+AC_ARG_ENABLE(xml, AC_HELP_STRING([--disable-xml], [Disable support for XML
and XMLSocket]),
[case "${enableval}" in
yes) xml=yes ;;
no) xml=no ;;
@@ -101,7 +101,7 @@
AM_CONDITIONAL(XML, test x$xml = xyes)
dnl Fix the Intel 810 LOD bias problem
-AC_ARG_ENABLE(i810-lod-bias, [ --enable-i810-lod-bias Enable fix for Intel
810 LOD bias problem],
+AC_ARG_ENABLE(i810-lod-bias, AC_HELP_STRING([--enable-i810-lod-bias], [Enable
fix for Intel 810 LOD bias problem]),
[case "${enableval}" in
yes) i810lodbias=yes ;;
no) i810lodbias=no ;;
@@ -113,7 +113,7 @@
fi
dnl Install the headers to make Gnash an SDK
-AC_ARG_ENABLE(sdkinstall, [ --enable-sdk-install Enable installing the
libraries and headers as an SDK],
+AC_ARG_ENABLE(sdkinstall, AC_HELP_STRING([--enable-sdk-install], [Enable
installing the libraries and headers as an SDK]),
[case "${enableval}" in
yes) sdkinstall=yes ;;
no) sdkinstall=no ;;
@@ -123,7 +123,7 @@
AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
dnl Add methods to enable testing
-AC_ARG_ENABLE(testing, [ --enable-testing Enable testing specific
methods],
+AC_ARG_ENABLE(testing, AC_HELP_STRING([--enable-testing], [Enable testing
specific methods]),
[case "${enableval}" in
yes) testing=yes ;;
no) testing=no ;;
@@ -150,12 +150,7 @@
AC_ARG_ENABLE(
gui,
- [ --enable-gui=flavor Specify gui flavor:
- GTK
- FB (framebuffer)
- KDE
-dnl FLTK
- SDL ],
+ AC_HELP_STRING([--enable-gui=TOOLKIT], [Specify GUI toolkit: GTK, FB
(framebuffer), KDE or SDL [[GTK]] ]),
[case "${enableval}" in
gtk|GTK) gui=gtk ;;
sdl|SDL) gui=sdl ;;
@@ -188,10 +183,7 @@
AC_ARG_ENABLE(
renderer,
- [ --enable-renderer=engine Specify rendering engine:
- OpenGL (default)
- Agg (experimental)
- Cairo (experimental)],
+ AC_HELP_STRING([--enable-renderer=engine], [Specify rendering engine: OpenGL,
Agg (experimental) or Cairo (experimental) [[OpenGL]] ]),
[case "${enableval}" in
opengl|OpenGL) renderer=opengl ;;
cairo|Cairo) renderer=cairo ;;
@@ -231,9 +223,7 @@
AC_ARG_ENABLE(
sound,
- [ --enable-sound=handler Enable sound support using the specified handler:
- GST (Gstreamer)
- SDL (SDL)],
+ AC_HELP_STRING([--enable-sound=handler], [Enable sound support using the
specified handler: SDL or GST (Gstreamer) [[SDL]] ]),
[case "${enableval}" in
GST|gst) sound_handler=gst ;;
sdl|SDL) sound_handler=sdl ;;
@@ -256,9 +246,7 @@
AC_ARG_WITH(
mp3-decoder,
- [ --with-mp3-decoder=handler Use the specified mp3 decoder::
- ffmpeg
- mad (libmad)],
+ AC_HELP_STRING([--with-mp3-decoder=DECODER], [Use the specified mp3 decoder:
ffmpeg or mad (libmad) [[none]]]),
[case "${withval}" in
ffmpeg|FFMPEG) mp3_decoder=ffmpeg ;;
mad|MAD) mp3_decoder=mad ;;
@@ -287,7 +275,7 @@
dnl Use the Dom parser from libxml2, not the xmlReader one
dnl The default is to use the Dom parser
-AC_ARG_ENABLE(dom, [ --enable-dom Enable support for Dom parser],
+AC_ARG_ENABLE(dom, AC_HELP_STRING([--enable-dom], [Enable support for Dom
parser]),
[case "${enableval}" in
yes) dom=yes ;;
no) dom=no ;;
@@ -299,7 +287,7 @@
fi
dnl Use an xmlReader parser, instead of the DOM one
-AC_ARG_ENABLE(reader, [ --enable-xmlreader Enable support for xmlReader
parser],
+AC_ARG_ENABLE(reader, AC_HELP_STRING([--enable-xmlreader], [Enable support for
xmlReader parser]),
[case "${enableval}" in
yes) reader=yes ;;
no) reader=no ;;
@@ -357,7 +345,7 @@
dnl !! a specialized macros/plugin.m4
dnl
AC_ARG_ENABLE(plugin,
- [ --enable-plugin Enable plugins build],
+ AC_HELP_STRING([--enable-plugin], [Enable plugins build]),
[case "${enableval}" in
yes) plugin=yes ;;
no) plugin=no ;;
@@ -805,6 +793,11 @@
fi
fi
+if test x$renderer = xkde -o x$gui = xkde -o x$klash = xyes ; then
+ echo " KDE flags are: $KDE_INCLUDES"
+ echo " KDE libs are: $KDE_LDFLAGS"
+fi
+
if test x"${png}" != x ; then
if test x"${PNG_CFLAGS}" != x ; then
echo " PNG flags are: $PNG_CFLAGS"
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- gui/Makefile.am 15 Oct 2006 09:11:20 -0000 1.34
+++ gui/Makefile.am 15 Oct 2006 14:26:05 -0000 1.35
@@ -35,7 +35,7 @@
# forward this exception.
#
-# $Id: Makefile.am,v 1.34 2006/10/15 09:11:20 nihilus Exp $
+# $Id: Makefile.am,v 1.35 2006/10/15 14:26:05 bjacques Exp $
AUTOMAKE_OPTIONS =
@@ -80,9 +80,9 @@
if USE_GUI_KDE
KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
AM_LDFLAGS += \
+ $(KDE_LDFLAGS) \
$(LIB_KDECORE) \
- $(LIB_KDEUI) \
- $(KDE_LDFLAGS)
+ $(LIB_KDEUI)
endif # USE_GUI_KDE
else # ! USE_RENDERER_OPENGL
GTK_OPENGL_SRCS =
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gui/gui.cpp 13 Oct 2006 14:51:00 -0000 1.26
+++ gui/gui.cpp 15 Oct 2006 14:26:05 -0000 1.27
@@ -133,7 +133,7 @@
// set new size ?
_width = width;
- _height = _height;
+ _height = height;
//log_msg("new size (in twips) is: %dx%d", _width*20, _height*20);
}
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- macros/agg.m4 12 Oct 2006 20:45:25 -0000 1.13
+++ macros/agg.m4 15 Oct 2006 14:26:05 -0000 1.14
@@ -35,14 +35,14 @@
dnl
dnl
-dnl $Id: agg.m4,v 1.13 2006/10/12 20:45:25 nihilus Exp $
+dnl $Id: agg.m4,v 1.14 2006/10/15 14:26:05 bjacques Exp $
dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
dnl but not in AGG 2.3. As we need AGG 2.4, we use this as
AC_DEFUN([GNASH_PATH_AGG],
[
dnl Lool for the header
- AC_ARG_WITH(agg_incl, [ --with-agg-incl directory where AGG headers
are], with_agg_incl=${withval})
+ AC_ARG_WITH(agg_incl, AC_HELP_STRING([--with-agg-incl], [directory where AGG
headers are]), with_agg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_agg_incl,[
if test x"${with_agg_incl}" != x ; then
if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
@@ -93,7 +93,7 @@
dnl Look for the library
- AC_ARG_WITH(agg_lib, [ --with-agg-lib directory where AGG libraries
are], with_agg_lib=${withval})
+ AC_ARG_WITH(agg_lib, AC_HELP_STRING([--with-agg-lib], [directory where AGG
libraries are]), with_agg_lib=${withval})
AC_CACHE_VAL(ac_cv_path_agg_lib,[
if test x"${with_agg_lib}" != x ; then
if test -f ${with_agg_lib}/libagg.a -o -f ${with_agg_lib}/libagg.so; then
Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/atk.m4 13 Oct 2006 09:37:27 -0000 1.20
+++ macros/atk.m4 15 Oct 2006 14:26:05 -0000 1.21
@@ -35,12 +35,12 @@
dnl
dnl
-dnl $Id: atk.m4,v 1.20 2006/10/13 09:37:27 strk Exp $
+dnl $Id: atk.m4,v 1.21 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_ATK],
[
dnl Look for the header
- AC_ARG_WITH(atk_incl, [ --with-atk-incl directory where libatk
header is], with_atk_incl=${withval})
+ AC_ARG_WITH(atk_incl, AC_HELP_STRING([--with-atk-incl], [directory where
libatk header is]), with_atk_incl=${withval})
AC_CACHE_VAL(ac_cv_path_atk_incl,[
if test x"${with_atk_incl}" != x ; then
if test -f ${with_atk_incl}/atk/atk.h ; then
@@ -119,7 +119,7 @@
fi #}
dnl Look for the library
- AC_ARG_WITH(atk_lib, [ --with-atk-lib directory where atk library
is], with_atk_lib=${withval})
+ AC_ARG_WITH(atk_lib, AC_HELP_STRING([--with-atk-lib], [directory where atk
library is]), with_atk_lib=${withval})
AC_CACHE_VAL(ac_cv_path_atk_lib,[
if test x"${with_atk_lib}" != x ; then
libname=atkatk-x11-${gnash_atk_version}
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/boost.m4 14 Oct 2006 00:25:29 -0000 1.19
+++ macros/boost.m4 15 Oct 2006 14:26:05 -0000 1.20
@@ -35,7 +35,7 @@
dnl
dnl
-dnl $Id: boost.m4,v 1.19 2006/10/14 00:25:29 rsavoye Exp $
+dnl $Id: boost.m4,v 1.20 2006/10/15 14:26:05 bjacques Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -44,7 +44,7 @@
AC_DEFUN([GNASH_PATH_BOOST],
[
dnl Lool for the header
- AC_ARG_WITH(boost_incl, [ --with-boost-incl directory where boost
headers are], with_boost_incl=${withval})
+ AC_ARG_WITH(boost_incl, AC_HELP_STRING([--with-boost-incl], [directory where
boost headers are]), with_boost_incl=${withval})
AC_CACHE_VAL(ac_cv_path_boost_incl,[
if test x"${with_boost_incl}" != x ; then
if test -f ${with_boost_incl}/boost/detail/lightweight_mutex.hpp ; then
@@ -103,7 +103,7 @@
AC_SUBST(BOOST_CFLAGS)
dnl Look for the library
- AC_ARG_WITH(boost_lib, [ --with-boost-lib directory where boost
libraries are], with_boost_lib=${withval})
+ AC_ARG_WITH(boost_lib, AC_HELP_STRING([--with-boost-lib], [directory where
boost libraries are]), with_boost_lib=${withval})
AC_CACHE_VAL(ac_cv_path_boost_lib,[
if test x"${with_boost_lib}" != x ; then
ac_cv_path_boost_lib=`(cd ${with_boost_lib}; pwd)`
Index: macros/cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/cairo.m4 10 Oct 2006 22:23:15 -0000 1.9
+++ macros/cairo.m4 15 Oct 2006 14:26:05 -0000 1.10
@@ -35,12 +35,12 @@
dnl
dnl
-dnl $Id: cairo.m4,v 1.9 2006/10/10 22:23:15 nihilus Exp $
+dnl $Id: cairo.m4,v 1.10 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_CAIRO],
[
dnl Look for the header
- AC_ARG_WITH(cairo_incl, [ --with-cairo_incl directory where
libcairo header is], with_cairo_incl=${withval})
+ AC_ARG_WITH(cairo_incl, AC_HELP_STRING([--with-cairo_incl], [directory where
libcairo header is]), with_cairo_incl=${withval})
AC_CACHE_VAL(ac_cv_path_cairo_incl,[
if test x"${with_cairo_incl}" != x ; then
if test -f ${with_cairo_incl}/cairo.h ; then
@@ -85,7 +85,7 @@
dnl Look for the library
- AC_ARG_WITH(cairo_lib, [ --with-cairo-lib directory where cairo
library is], with_cairo_lib=${withval})
+ AC_ARG_WITH(cairo_lib, AC_HELP_STRING([--with-cairo-lib], [directory where
cairo library is]), with_cairo_lib=${withval})
AC_CACHE_VAL(ac_cv_path_cairo_lib,[
if test x"${with_cairo_lib}" != x ; then
if test -f ${with_cairo_lib}/libcairo.a -o -f
${with_cairo_lib}/libcairo.so; then
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- macros/curl.m4 11 Oct 2006 21:48:43 -0000 1.7
+++ macros/curl.m4 15 Oct 2006 14:26:05 -0000 1.8
@@ -35,12 +35,12 @@
dnl
dnl
-dnl $Id: curl.m4,v 1.7 2006/10/11 21:48:43 strk Exp $
+dnl $Id: curl.m4,v 1.8 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
dnl Look for the header
- AC_ARG_WITH(curl_incl, [ --with-curl-incl directory where libcurl
header is (w/out the curl/ prefix)], with_curl_incl=${withval})
+ AC_ARG_WITH(curl_incl, AC_HELP_STRING([--with-curl-incl], [directory where
libcurl header is (w/out the curl/ prefix)]), with_curl_incl=${withval})
AC_CACHE_VAL(ac_cv_path_curl_incl,[
if test x"${with_curl_incl}" != x ; then
if test -f ${with_curl_incl}/curl/curl.h ; then
@@ -100,7 +100,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(curl_lib, [ --with-curl-lib directory where curl
library is], with_curl_lib=${withval})
+ AC_ARG_WITH(curl_lib, AC_HELP_STRING([--with-curl-lib], [directory where
curl library is]), with_curl_lib=${withval})
AC_CACHE_VAL(ac_cv_path_curl_lib,[
if test x"${with_curl_lib}" != x ; then # {
if test -f ${with_curl_lib}/libcurl.a -o -f ${with_curl_lib}/libcurl.so;
then # {
Index: macros/dmalloc.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/dmalloc.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/dmalloc.m4 24 Apr 2006 23:05:55 -0000 1.6
+++ macros/dmalloc.m4 15 Oct 2006 14:26:05 -0000 1.7
@@ -37,7 +37,7 @@
AC_DEFUN([GNASH_PATH_DMALLOC],
[
- AC_ARG_ENABLE(dmalloc, [ --enable-dmalloc Enable support for
dmalloc],
+ AC_ARG_ENABLE(dmalloc, AC_HELP_STRING([--enable-dmalloc], [Enable support
for dmalloc]),
[case "${enableval}" in
yes) dmalloc=yes ;;
no) dmalloc=no ;;
@@ -46,7 +46,7 @@
if test x"$dmalloc" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(dmalloc_incl, [ --with-dmalloc-incl directory where
libdmalloc header is], with_dmalloc_incl=${withval})
+ AC_ARG_WITH(dmalloc_incl, AC_HELP_STRING([--with-dmalloc-incl], [directory
where libdmalloc header is]), with_dmalloc_incl=${withval})
AC_CACHE_VAL(ac_cv_path_dmalloc_incl,[
if test x"${with_dmalloc_incl}" != x ; then
if test -f ${with_dmalloc_incl}/dmalloc.h ; then
@@ -93,7 +93,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(dmalloc_lib, [ --with-dmalloc-lib directory where
dmalloc library is], with_dmalloc_lib=${withval})
+ AC_ARG_WITH(dmalloc_lib, AC_HELP_STRING([--with-dmalloc-lib], [directory
where dmalloc library is]), with_dmalloc_lib=${withval})
AC_CACHE_VAL(ac_cv_path_dmalloc_lib,[
if test x"${with_dmalloc_lib}" != x ; then
if test -f ${with_dmalloc_lib}/libdmalloc.a -o -f
${with_dmalloc_lib}/libdmalloc.so; then
Index: macros/docbook.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/docbook.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/docbook.m4 30 Aug 2006 16:01:08 -0000 1.17
+++ macros/docbook.m4 15 Oct 2006 14:26:05 -0000 1.18
@@ -37,7 +37,7 @@
AC_DEFUN([GNASH_DOCBOOK], [
- AC_ARG_ENABLE(docbook, [ --disable-docbook Disable support for
building documentation],
+ AC_ARG_ENABLE(docbook, AC_HELP_STRING([--disable-docbook], [Disable support
for building documentation]),
[case "${enableval}" in
yes) docbook=yes ;;
no) docbook=no ;;
@@ -46,7 +46,7 @@
if test x"$docbook" = x"yes"; then
docbook_styles=
- AC_ARG_WITH(docbook_styles, [ --with-docbook-styles directory where
Docbook stylesheets are], with_docbook_styles=${withval})
+ AC_ARG_WITH(docbook_styles, AC_HELP_STRING([--with-docbook-styles],
[directory where Docbook stylesheets are]), with_docbook_styles=${withval})
if test x"${with_docbook_styles}" != x ; then
if test -f ${with_docbook_styles}/html/docbook.xsl ; then
docbook_styles=`(cd ${with_docbook_styles}; pwd)`
@@ -160,5 +160,10 @@
dnl AM_CONDITIONAL(NEW_DOCBOOK2X, [test "$db2x_version" = "0.8.5"])
AC_SUBST(docbook_styles)
+ AC_SUBST(XSLTPROC)
+ AC_SUBST(DB2X_XSLTPROC)
+ AC_SUBST(DB2X_TEXIXML)
+ AC_SUBST(PDFXMLTEX)
+ AC_SUBST(FOP)
])
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/ffmpeg.m4 10 Oct 2006 09:06:52 -0000 1.16
+++ macros/ffmpeg.m4 15 Oct 2006 14:26:05 -0000 1.17
@@ -39,12 +39,12 @@
dnl date-time, filesystem. graph. iostreams, program options, python,
dnl regex, serialization, signals, unit test, thead, and wave.
-dnl $Id: ffmpeg.m4,v 1.16 2006/10/10 09:06:52 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.17 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
dnl Lool for the header
- AC_ARG_WITH(ffmpeg_incl, [ --with-ffmpeg-incl directory where ffmpeg
headers are], with_ffmpeg_incl=${withval})
+ AC_ARG_WITH(ffmpeg_incl, AC_HELP_STRING([--with-ffmpeg-incl], [directory
where ffmpeg headers are]), with_ffmpeg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
if test x"${with_ffmpeg_incl}" != x ; then
if test -f ${with_ffmpeg_incl}/avcodec.h ; then
@@ -80,7 +80,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(ffmpeg_lib, [ --with-ffmpeg-lib directory where ffmpeg
libraries are], with_ffmpeg_lib=${withval})
+ AC_ARG_WITH(ffmpeg_lib, AC_HELP_STRING([--with-ffmpeg-lib], [directory where
ffmpeg libraries are]), with_ffmpeg_lib=${withval})
AC_CACHE_VAL(ac_cv_path_ffmpeg_lib,[
if test x"${with_ffmpeg_lib}" != x ; then
if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f
${with_ffmpeg_lib}/libavcodec.so; then
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/firefox.m4 18 May 2006 16:42:52 -0000 1.17
+++ macros/firefox.m4 15 Oct 2006 14:26:05 -0000 1.18
@@ -57,7 +57,7 @@
if test x"${plugin}" = x"yes"; then
FIREFOX_PLUGINS=""
- AC_ARG_WITH(plugindir, [ --with-plugindir=DIR Directory to install
Firefox plugin in],
+ AC_ARG_WITH(plugindir, AC_HELP_STRING([--with-plugindir=DIR], [Directory
to install Firefox plugin in]),
[FIREFOX_PLUGINS=$withval]
)
@@ -84,8 +84,8 @@
dnl
dnl This enables or disables the support to make Gnash function as a
dnl Mozilla or Firefox plugin.
- AC_ARG_ENABLE(plugin, [ --enable-plugin-full Enable
-support for being a plugin using Firefox development packages],
+ AC_ARG_ENABLE(plugin, AC_HELP_STRING([--enable-plugin-full], [Enable
+support for being a plugin using Firefox development packages]),
[case "${enableval}" in
yes) plugin=yes ;;
no) plugin=no ;;
@@ -95,16 +95,16 @@
if test x"$plugin" = x"yes"; then
AC_DEFINE([PLUGIN_SUPPORT], [], [Build plugin support for Mozilla/Firefox])
- AC_ARG_WITH(firefox,[ --with-firefox=PFX Prefix where firefox is
installed (optional)],
+ AC_ARG_WITH(firefox, AC_HELP_STRING([--with-firefox=PFX], [Prefix where
firefox is installed (optional)]),
[firefox_prefix=$withval], [firefox_prefix=""]
)
- AC_ARG_WITH(firefox-libraries,[ --with-firefox-libraries=DIR Directory
where firefox library is installed (optional)],
+ AC_ARG_WITH(firefox-libraries,
AC_HELP_STRING([--with-firefox-libraries=DIR], [Directory where firefox library
is installed (optional)]),
[firefox_libraries=$withval], [firefox_libraries=""]
)
- AC_ARG_WITH(firefox-includes,[ --with-firefox-includes=DIR Directory
where firefox header files are installed (optional)],
+ AC_ARG_WITH(firefox-includes,AC_HELP_STRING([--with-firefox-includes=DIR],
[Directory where firefox header files are installed (optional)]),
[firefox_includes=$withval], [firefox_includes=""]
)
- AC_ARG_WITH(plugin-dir, [ --with-plugin-dir=DIR Mozilla plugin
dir],
+ AC_ARG_WITH(plugin-dir, AC_HELP_STRING([--with-plugin-dir=DIR], [Mozilla
plugin dir]),
[FIREFOX_PLUGINS=$withval]
)
Index: macros/fltk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/fltk.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/fltk.m4 24 Apr 2006 23:05:55 -0000 1.3
+++ macros/fltk.m4 15 Oct 2006 14:26:05 -0000 1.4
@@ -37,7 +37,7 @@
AC_DEFUN([GNASH_PATH_FLTK],
[
- AC_ARG_ENABLE(fltk, [ --enable-fltk Enable support for fltk
images],
+ AC_ARG_ENABLE(fltk, AC_HELP_STRING([--enable-fltk], [Enable support for
FLTK]),
[case "${enableval}" in
yes) fltk=yes ;;
no) fltk=no ;;
@@ -46,7 +46,7 @@
if test x"$fltk" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(fltk_incl, [ --with-fltk-incl directory where libfltk
header is], with_fltk_incl=${withval})
+ AC_ARG_WITH(fltk_incl, AC_HELP_STRING([--with-fltk-incl], [directory where
libfltk header is]), with_fltk_incl=${withval})
AC_CACHE_VAL(ac_cv_path_fltk_incl, [
AC_MSG_CHECKING([for fltk.h header in specified directory])
if test x"${with_fltk_incl}" != x ; then
@@ -91,7 +91,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(fltk_lib, [ --with-fltk-lib directory where fltk
library is], with_fltk_lib=${withval})
+ AC_ARG_WITH(fltk_lib, AC_HELP_STRING([--with-fltk-lib], [directory where
fltk library is]), with_fltk_lib=${withval})
AC_CACHE_VAL(ac_cv_path_fltk_lib,[
if test x"${with_fltk_lib}" != x ; then
AC_MSG_CHECKING([for libfltk library in specified directory])
Index: macros/ghelp.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ghelp.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/ghelp.m4 24 Apr 2006 23:05:55 -0000 1.9
+++ macros/ghelp.m4 15 Oct 2006 14:26:05 -0000 1.10
@@ -37,7 +37,7 @@
AC_DEFUN([GNASH_PATH_GHELP],
[
- AC_ARG_ENABLE(ghelp, [ --enable-ghelp Enable support for the
GNOME help system],
+ AC_ARG_ENABLE(ghelp, AC_HELP_STRING([--enable-ghelp], [Enable support for
the GNOME help system]),
[case "${enableval}" in
yes) ghelp=yes ;;
no) ghelp=no ;;
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/glib.m4 10 Oct 2006 21:06:28 -0000 1.16
+++ macros/glib.m4 15 Oct 2006 14:26:05 -0000 1.17
@@ -35,12 +35,12 @@
dnl
dnl
-dnl $Id: glib.m4,v 1.16 2006/10/10 21:06:28 nihilus Exp $
+dnl $Id: glib.m4,v 1.17 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
dnl Look for the header
- AC_ARG_WITH(glib_incl, [ --with-glib-incl directory where libglib
header is], with_glib_incl=${withval})
+ AC_ARG_WITH(glib_incl, AC_HELP_STRING([--with-glib-incl], [directory where
libglib header is]), with_glib_incl=${withval})
AC_CACHE_VAL(ac_cv_path_glib_incl,[
if test x"${with_glib_incl}" != x ; then
if test -f ${with_glib_incl}/glib.h ; then
@@ -104,7 +104,7 @@
AC_MSG_RESULT(${ac_cv_path_glib_incl})
dnl Look for the library
- AC_ARG_WITH(glib_lib, [ --with-glib-lib directory where glib
library is], with_glib_lib=${withval})
+ AC_ARG_WITH(glib_lib, AC_HELP_STRING([--with-glib-lib], [directory where
glib library is]), with_glib_lib=${withval})
AC_CACHE_VAL(ac_cv_path_glib_lib,[
if test x"${with_glib_lib}" != x ; then
if test -f ${with_glib_lib}/libglib-${gnash_glib_version}.a -o -f
${with_glib_lib}/libglib-${gnash_glib_version}.so; then
Index: macros/gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/gstreamer.m4 9 Oct 2006 14:44:48 -0000 1.20
+++ macros/gstreamer.m4 15 Oct 2006 14:26:05 -0000 1.21
@@ -35,12 +35,12 @@
dnl
dnl
-dnl $Id: gstreamer.m4,v 1.20 2006/10/09 14:44:48 strk Exp $
+dnl $Id: gstreamer.m4,v 1.21 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_GSTREAMER],
[
dnl Look for the header
- AC_ARG_WITH(gst_incl, [ --with-gst-incl directory where
libgstreamer header is], with_gstreamer_incl=${withval})
+ AC_ARG_WITH(gst_incl, AC_HELP_STRING([--with-gst-incl], [directory where
libgstreamer header is]), with_gstreamer_incl=${withval})
AC_CACHE_VAL(ac_cv_path_gstreamer_incl,[
if test x"${with_gstreamer_incl}" != x ; then
if test -f ${with_gstreamer_incl}/gst/gst.h ; then
@@ -90,7 +90,7 @@
dnl Look for the library
- AC_ARG_WITH(gst_lib, [ --with-gst-lib directory where gstreamer
library is], with_gstreamer_lib=${withval})
+ AC_ARG_WITH(gst_lib, AC_HELP_STRING([--with-gst-lib], [directory where
gstreamer library is]), with_gstreamer_lib=${withval})
AC_CACHE_VAL(ac_cv_path_gstreamer_lib,[
if test x"${with_gstreamer_lib}" != x ; then
if test -f ${with_gstreamer_lib}/libgstreamer-0.10.so; then
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/gtk2.m4 11 Oct 2006 11:03:58 -0000 1.28
+++ macros/gtk2.m4 15 Oct 2006 14:26:05 -0000 1.29
@@ -35,14 +35,14 @@
dnl
dnl
-dnl $Id: gtk2.m4,v 1.28 2006/10/11 11:03:58 nihilus Exp $
+dnl $Id: gtk2.m4,v 1.29 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
gnash_gtk2_version=""
gnash_gtk2_topdir=""
dnl Look for the header
- AC_ARG_WITH(gtk2_incl, [ --with-gtk2-incl directory where libgtk2
header is], with_gtk2_incl=${withval})
+ AC_ARG_WITH(gtk2_incl, AC_HELP_STRING([--with-gtk2-incl], [directory where
libgtk2 header is]), with_gtk2_incl=${withval})
AC_CACHE_VAL(ac_cv_path_gtk2_incl,[
if test x"${with_gtk2_incl}" != x ; then
if test -f ${with_gtk2_incl}/gtk/gtk.h; then
@@ -113,7 +113,7 @@
dnl Look for the library
AC_ARG_WITH(gtk2_lib,
- [ --with-gtk2-lib directory where gtk2 library is],
+ AC_HELP_STRING([--with-gtk2-lib], [directory where gtk2 library is]),
with_gtk2_lib=${withval})
dnl disabled as semantic is not really clear to me:
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/gtkglext.m4 11 Oct 2006 16:04:26 -0000 1.25
+++ macros/gtkglext.m4 15 Oct 2006 14:26:05 -0000 1.26
@@ -35,11 +35,11 @@
dnl
dnl
-dnl: $Id: gtkglext.m4,v 1.25 2006/10/11 16:04:26 strk Exp $
+dnl: $Id: gtkglext.m4,v 1.26 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
- AC_ARG_ENABLE(glext, [ --disable-glext Disable support for GTK
OpenGL extension],
+ AC_ARG_ENABLE(glext, AC_HELP_STRING([--disable-glext], [Disable support for
GTK OpenGL extension]),
[case "${enableval}" in
yes) glext=yes ;;
no) glext=no ;;
@@ -52,7 +52,7 @@
if test x"$glext" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(glext_incl, [ --with-glext-incl directory where
libglext header is], with_glext_incl=${withval})
+ AC_ARG_WITH(glext_incl, AC_HELP_STRING([--with-glext-incl], [directory
where libglext header is]), with_glext_incl=${withval})
AC_CACHE_VAL(ac_cv_path_glext_incl,[
if test x"${with_glext_incl}" != x ; then
@@ -121,7 +121,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(glext_lib, [ --with-glext-lib directory where
gtkglext library is], with_glext_lib=${withval})
+ AC_ARG_WITH(glext_lib, AC_HELP_STRING([--with-glext-lib], [directory
where gtkglext library is]), with_glext_lib=${withval})
AC_CACHE_VAL(ac_cv_path_glext_lib,[
if test x"${with_glext_lib}" != x ; then
if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a
-o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.so; then
Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- macros/jpeg.m4 13 Oct 2006 01:07:36 -0000 1.15
+++ macros/jpeg.m4 15 Oct 2006 14:26:05 -0000 1.16
@@ -35,11 +35,11 @@
dnl
dnl
-dnl $Id: jpeg.m4,v 1.15 2006/10/13 01:07:36 nihilus Exp $
+dnl $Id: jpeg.m4,v 1.16 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_JPEG],
[
- AC_ARG_ENABLE(jpeg, [ --enable-jpeg Enable support for jpeg
images],
+ AC_ARG_ENABLE(jpeg, AC_HELP_STRING([--enable-jpeg], [Enable support for jpeg
images]),
[case "${enableval}" in
yes) jpeg=yes ;;
no) jpeg=no ;;
@@ -48,7 +48,7 @@
if test x"$jpeg" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(jpeg_incl, [ --with-jpeg-incl directory where libjpeg
header is], with_jpeg_incl=${withval})
+ AC_ARG_WITH(jpeg_incl, AC_HELP_STRING([--with-jpeg-incl], [Directory where
libjpeg header is]), with_jpeg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_jpeg_incl,[
if test x"${with_jpeg_incl}" != x ; then
if test -f ${with_jpeg_incl}/jpeglib.h ; then
@@ -94,7 +94,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(jpeg_lib, [ --with-jpeg-lib directory where jpeg
library is], with_jpeg_lib=${withval})
+ AC_ARG_WITH(jpeg_lib, AC_HELP_STRING([--with-jpeg-lib], [directory where
jpeg library is]), with_jpeg_lib=${withval})
AC_CACHE_VAL(ac_cv_path_jpeg_lib,[
if test x"${with_jpeg_lib}" != x ; then
if test -f ${with_jpeg_lib}/libjpeg.a -o -f
${with_jpeg_lib}/libjpeg.so; then
Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/libXML.m4 9 Oct 2006 04:39:06 -0000 1.20
+++ macros/libXML.m4 15 Oct 2006 14:26:05 -0000 1.21
@@ -39,9 +39,9 @@
[dnl
dnl Get the cflags and libraries
dnl
-AC_ARG_WITH(libxml,[ --with-libxml=PFX Prefix where libxml is installed
(optional)], libxml_prefix="$withval", libxml_prefix="")
-AC_ARG_WITH(libxml-libraries,[ --with-libxml-libraries=DIR Directory where
libxml library is installed (optional)], libxml_libraries="$withval",
libxml_libraries="")
-AC_ARG_WITH(libxml-includes,[ --with-libxml-includes=DIR Directory where
libxml header files are installed (optional)], libxml_includes="$withval",
libxml_includes="")
+AC_ARG_WITH(libxml, AC_HELP_STRING([--with-libxml=PFX], [Prefix where libxml
is installed (optional)]), libxml_prefix="$withval", libxml_prefix="")
+AC_ARG_WITH(libxml-libraries, AC_HELP_STRING([--with-libxml-libraries=DIR],
[Directory where libxml library is installed (optional)]),
libxml_libraries="$withval", libxml_libraries="")
+AC_ARG_WITH(libxml-includes, AC_HELP_STRING([--with-libxml-includes=DIR],
[Directory where libxml header files are installed (optional)]),
libxml_includes="$withval", libxml_includes="")
dnl AC_ARG_ENABLE(libxmltest, [ --disable-libxmltest Do not try to
compile and run a test libxml program],, enable_libxmltest=yes)
if test "x$libxml_libraries" != "x" ; then
Index: macros/mad.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mad.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- macros/mad.m4 9 Oct 2006 20:49:04 -0000 1.13
+++ macros/mad.m4 15 Oct 2006 14:26:05 -0000 1.14
@@ -38,7 +38,7 @@
AC_DEFUN([GNASH_PATH_MAD],
[
dnl Look for the header
- AC_ARG_WITH(mad_incl, [ --with-mad_incl directory where libmad
header is], with_mad_incl=${withval})
+ AC_ARG_WITH(mad_incl, AC_HELP_STRING([--with-mad_incl], [directory where
libmad header is]), with_mad_incl=${withval})
AC_CACHE_VAL(ac_cv_path_mad_incl,[
if test x"${with_mad_incl}" != x ; then
if test -f ${with_mad_incl}/mad.h ; then
@@ -85,7 +85,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(mad_lib, [ --with-mad-lib directory where mad library
is], with_mad_lib=${withval})
+ AC_ARG_WITH(mad_lib, AC_HELP_STRING([--with-mad-lib], [directory where mad
library is]), with_mad_lib=${withval})
AC_CACHE_VAL(ac_cv_path_mad_lib,[
if test x"${with_mad_lib}" != x ; then
if test -f ${with_mad_lib}/libmad.a -o -f ${with_mad_lib}/libmad.so;
then
Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/ming.m4 24 Apr 2006 23:05:55 -0000 1.6
+++ macros/ming.m4 15 Oct 2006 14:26:05 -0000 1.7
@@ -57,7 +57,7 @@
MING_CFLAGS=""
MING_LIBS=""
- AC_ARG_WITH(ming,[ --with-ming=[<ming-config>] Use ming to build
tests],
+ AC_ARG_WITH(ming, AC_HELP_STRING([--with-ming=[<ming-config>]], [Use
ming to build tests]),
[
case "${withval}" in
yes|no)
Index: macros/ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- macros/ogg.m4 13 Oct 2006 23:13:15 -0000 1.18
+++ macros/ogg.m4 15 Oct 2006 14:26:05 -0000 1.19
@@ -35,11 +35,11 @@
dnl
dnl
-dnl $Id: ogg.m4,v 1.18 2006/10/13 23:13:15 nihilus Exp $
+dnl $Id: ogg.m4,v 1.19 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_OGG],
[
- AC_ARG_ENABLE(ogg, [ --enable-ogg Enable support for playing
oggs],
+ AC_ARG_ENABLE(ogg, AC_HELP_STRING([--enable-ogg], [Enable support for
playing oggs]),
[case "${enableval}" in
yes) ogg=yes ;;
no) ogg=no ;;
@@ -48,7 +48,7 @@
if test x"$ogg" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(ogg_incl, [ --with-ogg_incl directory where libogg
header is], with_ogg_incl=${withval})
+ AC_ARG_WITH(ogg_incl, AC_HELP_STRING([--with-ogg_incl], [directory where
libogg header is]), with_ogg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_ogg_incl,[
if test x"${with_ogg_incl}" != x ; then
if test -f "${with_ogg_incl}/ogg.h" ; then
@@ -98,7 +98,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(ogg_lib, [ --with-ogg-lib directory where ogg
library is], with_ogg_lib=${withval})
+ AC_ARG_WITH(ogg_lib, AC_HELP_STRING([--with-ogg-lib], [directory where
ogg library is]), with_ogg_lib=${withval})
AC_CACHE_VAL(ac_cv_path_ogg_lib,[
if test x"${with_ogg_lib}" != x ; then
if test -f "${with_ogg_lib}/libogg.a" -o -f
"${with_ogg_lib}/libogg.so"; then
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/opengl.m4 13 Oct 2006 00:18:17 -0000 1.24
+++ macros/opengl.m4 15 Oct 2006 14:26:05 -0000 1.25
@@ -46,7 +46,7 @@
opengl=yes
if test x"$opengl" = x"yes"; then
dnl Look for the headers.
- AC_ARG_WITH(opengl_includes, [ --with-opengl-includes directory where
OpenGL headers are], with_opengl_includes=${withval})
+ AC_ARG_WITH(opengl_includes, AC_HELP_STRING([--with-opengl-includes],
[directory where OpenGL headers are]), with_opengl_includes=${withval})
AC_CACHE_VAL(ac_cv_path_opengl_includes,[
if test x"${with_opengl_includes}" != x ; then
if test -f ${with_opengl_includes}/GL/gl.h -a -f
${with_opengl_includes}/GL/glu.h ; then
@@ -95,7 +95,7 @@
fi
dnl Look for the libraries.
- AC_ARG_WITH(opengl_lib, [ --with-opengl-lib directory where OpenGL
libraries are], with_opengl_lib=${withval})
+ AC_ARG_WITH(opengl_lib, AC_HELP_STRING([--with-opengl-lib], [directory
where OpenGL libraries are]), with_opengl_lib=${withval})
AC_CACHE_VAL(ac_cv_path_opengl_lib,[
if test x"${with_opengl_lib}" != x ; then
if test -f ${with_opengl_lib}/libGL.a -o -f ${with_opengl_lib}/libGL.so;
then
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/pango.m4 9 Oct 2006 16:11:27 -0000 1.17
+++ macros/pango.m4 15 Oct 2006 14:26:05 -0000 1.18
@@ -35,12 +35,12 @@
dnl
dnl
-dnl $Id: pango.m4,v 1.17 2006/10/09 16:11:27 nihilus Exp $
+dnl $Id: pango.m4,v 1.18 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
dnl Look for the header
- AC_ARG_WITH(pango_incl, [ --with-pango-incl directory where libpango
header is], with_pango_incl=${withval})
+ AC_ARG_WITH(pango_incl, AC_HELP_STRING([--with-pango-incl], [directory where
libpango header is]), with_pango_incl=${withval})
AC_CACHE_VAL(ac_cv_path_pango_incl,[
if test x"${with_pango_incl}" != x ; then
if test -f ${with_pango_incl}/pango/pango.h ; then
@@ -106,7 +106,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(pango_lib, [ --with-pango-lib directory where pango
library is], with_pango_lib=${withval})
+ AC_ARG_WITH(pango_lib, AC_HELP_STRING([--with-pango-lib], [directory where
pango library is]), with_pango_lib=${withval})
AC_CACHE_VAL(ac_cv_path_pango_lib,[
if test x"${with_pango_lib}" != x ; then
if test -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.a
-o -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.so; then
Index: macros/png.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/png.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- macros/png.m4 13 Oct 2006 01:07:36 -0000 1.15
+++ macros/png.m4 15 Oct 2006 14:26:05 -0000 1.16
@@ -35,11 +35,11 @@
dnl
dnl
-dnl $Id: png.m4,v 1.15 2006/10/13 01:07:36 nihilus Exp $
+dnl $Id: png.m4,v 1.16 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_PNG],
[
- AC_ARG_ENABLE(png, [ --enable-png Enable support for png images],
+ AC_ARG_ENABLE(png, AC_HELP_STRING([--enable-png], [Enable support for png
images]),
[case "${enableval}" in
yes) png=yes ;;
no) png=no ;;
@@ -48,7 +48,7 @@
if test x"$png" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(png_incl, [ --with-png-incl directory where libpng
header is], with_png_incl=${withval})
+ AC_ARG_WITH(png_incl, AC_HELP_STRING([--with-png-incl], [directory where
libpng header is]), with_png_incl=${withval})
AC_CACHE_VAL(ac_cv_path_png_incl, [
if test x"${with_png_incl}" != x ; then
if test -f ${with_png_incl}/png.h ; then
@@ -104,7 +104,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(png_lib, [ --with-png-lib directory where png
library is], with_png_lib=${withval})
+ AC_ARG_WITH(png_lib, AC_HELP_STRING([--with-png-lib], [directory where
png library is]), with_png_lib=${withval})
AC_CACHE_VAL(ac_cv_path_png_lib,[
if test x"${with_png_lib}" != x ; then
AC_MSG_CHECKING([for libpng library in specified directory])
Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/sdl.m4 10 Oct 2006 21:48:18 -0000 1.26
+++ macros/sdl.m4 15 Oct 2006 14:26:05 -0000 1.27
@@ -35,13 +35,13 @@
dnl
dnl
-dnl $Id: sdl.m4,v 1.26 2006/10/10 21:48:18 nihilus Exp $
+dnl $Id: sdl.m4,v 1.27 2006/10/15 14:26:05 bjacques Exp $
AC_DEFUN([GNASH_PATH_SDL],
[dnl
has_sdl=no
dnl Lool for the header
- AC_ARG_WITH(sdl_incl, [ --with-sdl-incl directory where sdl header is],
with_sdl_incl=${withval})
+ AC_ARG_WITH(sdl_incl, AC_HELP_STRING([--with-sdl-incl], [directory where sdl
header is]), with_sdl_incl=${withval})
AC_CACHE_VAL(ac_cv_path_sdl_incl,[
if test x"${with_sdl_incl}" != x ; then
if test -f ${with_sdl_incl}/SDL.h ; then
@@ -120,7 +120,7 @@
AC_MSG_RESULT(${ac_cv_path_sdl_incl})
dnl Look for the library
- AC_ARG_WITH(sdl_lib, [ --with-sdl-lib directory where sdl library is],
with_sdl_lib=${withval})
+ AC_ARG_WITH(sdl_lib, AC_HELP_STRING([--with-sdl-lib], [directory where sdl
library is]), with_sdl_lib=${withval})
dnl AC_MSG_CHECKING([for sdl library])
AC_CACHE_VAL(ac_cv_path_sdl_lib,[
if test x"${with_sdl_lib}" != x ; then
Index: macros/vorbis.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/vorbis.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/vorbis.m4 1 Feb 2006 23:58:31 -0000 1.2
+++ macros/vorbis.m4 15 Oct 2006 14:26:05 -0000 1.3
@@ -10,10 +10,10 @@
[dnl
dnl Get the cflags and libraries
dnl
-AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed
(optional)], vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where
libvorbis library is installed (optional)], vorbis_libraries="$withval",
vorbis_libraries="")
-AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where
libvorbis header files are installed (optional)], vorbis_includes="$withval",
vorbis_includes="")
-AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile
and run a test Vorbis program],, enable_vorbistest=yes)
+AC_ARG_WITH(vorbis, AC_HELP_STRING([--with-vorbis=PFX], [Prefix where
libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
+AC_ARG_WITH(vorbis-libraries, AC_HELP_STRING([--with-vorbis-libraries=DIR],
[Directory where libvorbis library is installed (optional)]),
vorbis_libraries="$withval", vorbis_libraries="")
+AC_ARG_WITH(vorbis-includes, AC_HELP_STRING([--with-vorbis-includes=DIR],
[Directory where libvorbis header files are installed (optional)]),
vorbis_includes="$withval", vorbis_includes="")
+AC_ARG_ENABLE(vorbistest, AC_HELP_STRING([--disable-vorbistest], [Do not try
to compile and run a test Vorbis program]),, enable_vorbistest=yes)
if test "x$vorbis_libraries" != "x" ; then
VORBIS_LIBS="-L$vorbis_libraries"
Index: macros/xft.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/xft.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/xft.m4 24 Apr 2006 23:05:55 -0000 1.2
+++ macros/xft.m4 15 Oct 2006 14:26:05 -0000 1.3
@@ -39,7 +39,7 @@
[
if test x"$fltk" = x"yes"; then
dnl Look for the header
- AC_ARG_WITH(xft_incl, [ --with-xft-incl directory where libxft
header is], with_xft_incl=${withval})
+ AC_ARG_WITH(xft_incl, AC_HELP_STRING([--with-xft-incl], [directory where
libxft header is]), with_xft_incl=${withval})
AC_CACHE_VAL(ac_cv_path_xft_incl, [
AC_MSG_CHECKING([for xft.h header in specified directory])
if test x"${with_xft_incl}" != x ; then
@@ -82,7 +82,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(xft_lib, [ --with-xft-lib directory where xft
library is], with_xft_lib=${withval})
+ AC_ARG_WITH(xft_lib, AC_HELP_STRING([--with-xft-lib], [directory where
xft library is]), with_xft_lib=${withval})
AC_CACHE_VAL(ac_cv_path_xft_lib,[
if test x"${with_xft_lib}" != x ; then
AC_MSG_CHECKING([for libxft library in specified directory])
Index: macros/zlib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/zlib.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/zlib.m4 10 Oct 2006 14:18:35 -0000 1.10
+++ macros/zlib.m4 15 Oct 2006 14:26:05 -0000 1.11
@@ -38,7 +38,7 @@
AC_DEFUN([GNASH_PATH_ZLIB],
[
dnl Lool for the header
- AC_ARG_WITH(zlib_incl, [ --with-zlib-incl directory where zlib
header is], with_zlib_incl=${withval})
+ AC_ARG_WITH(zlib_incl, AC_HELP_STRING([--with-zlib-incl], [directory where
zlib header is]), with_zlib_incl=${withval})
AC_CACHE_VAL(ac_cv_path_zlib_incl,[
if test x"${with_zlib_incl}" != x ; then
if test -f ${with_zlib_incl}/zlib.h ; then
@@ -83,7 +83,7 @@
fi
dnl Look for the library
- AC_ARG_WITH(zlib_lib, [ --with-zlib-lib directory where zlib
library is], with_zlib_lib=${withval})
+ AC_ARG_WITH(zlib_lib, AC_HELP_STRING([--with-zlib-lib], [directory where
zlib library is]), with_zlib_lib=${withval})
AC_MSG_CHECKING([for zlib library])
AC_CACHE_VAL(ac_cv_path_zlib_lib,[
if test x"${with_zlib_lib}" != x ; then
Index: server/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/action.cpp 20 Sep 2006 17:11:09 -0000 1.102
+++ server/action.cpp 15 Oct 2006 14:26:05 -0000 1.103
@@ -77,17 +77,6 @@
#include "as_environment.h"
#include "fn_call.h"
-#ifndef GUI_GTK
-int windowid = 0;
-#else
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-extern "C" {
-#include <gtk/gtk.h>
-}
-GdkNativeWindow windowid = 0;
-#endif
-
using namespace gnash;
using namespace SWF;
- [Gnash-commit] gnash ChangeLog configure.ac gui/Makefile.am gu...,
Bastiaan Jacques <=