Hello,
Here is a patch for make distcheck against the release branch. It
includes the change from --with-extensions to --enable-extensions.
--
Pat
? gnash-0.8.3-rc2
? libltdl
? gui/Info.plist
? libmedia/.deps
? libnet/.deps
? libnet/Makefile
? libnet/Makefile.in
? po/update-po
? pythonmodule/.deps
? testsuite/misc-swfmill.all/.deps
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.529.2.7
diff -u -3 -p -r1.529.2.7 configure.ac
--- configure.ac 9 Jun 2008 20:27:54 -0000 1.529.2.7
+++ configure.ac 10 Jun 2008 01:05:31 -0000
@@ -759,20 +759,20 @@ ext_dbus=no
ext_metome=no
ext_all=no
ext_launcher=no
-AC_ARG_WITH(extensions,
- AC_HELP_STRING([--with-extensions=], [Specify which extensions to build]),
- if test -n ${withval}; then
- if test "x${withval}" != "xno"; then
- extlist="${withval}"
- withval=`echo ${withval} | tr '\054' ' ' `
+AC_ARG_ENABLE(extensions,
+ AC_HELP_STRING([--enable-extensions=], [Specify which extensions to build]),
+ if test -n ${enableval}; then
+ if test "x${enableval}" != "xno"; then
+ extlist="${enableval}"
+ enableval=`echo ${enableval} | tr '\054' ' ' `
else
extlist=""
- withval=""
+ enableval=""
fi
fi
nextensions=0
- while test -n "${withval}" ; do
- val=`echo ${withval} | cut -d ' ' -f 1`
+ while test -n "${enableval}" ; do
+ val=`echo ${enableval} | cut -d ' ' -f 1`
extensions_list="${extensions_list} ${val}"
[case "${val}" in
dejagnu|DEJAGNU|dj|DJ)
@@ -831,11 +831,11 @@ AC_ARG_WITH(extensions,
ext_all=yes
nextensions=9
;;
- *) AC_MSG_ERROR([invalid extension specified: ${withval} given (accept:
MYSQL|DEJAGNU|FILEIO|GTK|LIRC|DBUS|METOME|ALL)])
+ *) AC_MSG_ERROR([invalid extension specified: ${enableval} given
(accept: MYSQL|DEJAGNU|FILEIO|GTK|LIRC|DBUS|METOME|ALL)])
;;
esac]
- withval=`echo ${withval} | cut -d ' ' -f 2-6`
- if test "x$val" = "x$withval"; then
+ enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
+ if test "x$val" = "x$enableval"; then
break;
fi
done
Index: extensions/dbus/dbus_ext.h
===================================================================
RCS file: /sources/gnash/gnash/extensions/dbus/dbus_ext.h,v
retrieving revision 1.1
diff -u -3 -p -r1.1 dbus_ext.h
--- extensions/dbus/dbus_ext.h 27 Sep 2007 00:29:31 -0000 1.1
+++ extensions/dbus/dbus_ext.h 10 Jun 2008 01:05:31 -0000
@@ -19,7 +19,7 @@
#define __DBUS_PLUGIN_H__
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
#endif
#include <memory> // for auto_ptr
Index: extensions/fileio/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/fileio/Makefile.am,v
retrieving revision 1.10
diff -u -3 -p -r1.10 Makefile.am
--- extensions/fileio/Makefile.am 22 Feb 2008 16:13:21 -0000 1.10
+++ extensions/fileio/Makefile.am 10 Jun 2008 01:05:31 -0000
@@ -57,7 +57,10 @@ CLEANFILES = \
test.swf.frame0.pp \
test.swf \
test \
- logfile
+ logfile \
+ testrun.log \
+ testrun.sum \
+ site.exp.bak
install-pluginsLTLIBRARIES: $(plugins_LTLIBRARIES)
test -d "$(DESTDIR)$(pluginsdir)" || $(mkinstalldirs)
"$(DESTDIR)$(pluginsdir)"
Index: extensions/lirc/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/lirc/Makefile.am,v
retrieving revision 1.4
diff -u -3 -p -r1.4 Makefile.am
--- extensions/lirc/Makefile.am 21 Jan 2008 23:29:09 -0000 1.4
+++ extensions/lirc/Makefile.am 10 Jun 2008 01:05:31 -0000
@@ -27,6 +27,7 @@ INCLUDES = -I$(srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/vm \
-I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libnet \
$(BOOST_CFLAGS) \
$(INCLTDL)
Index: extensions/lirc/lirc_ext.h
===================================================================
RCS file: /sources/gnash/gnash/extensions/lirc/lirc_ext.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 lirc_ext.h
--- extensions/lirc/lirc_ext.h 21 Jan 2008 23:29:09 -0000 1.2
+++ extensions/lirc/lirc_ext.h 10 Jun 2008 01:05:31 -0000
@@ -1,5 +1,5 @@
//
-/ Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Index: extensions/mysql/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/Makefile.am,v
retrieving revision 1.6
diff -u -3 -p -r1.6 Makefile.am
--- extensions/mysql/Makefile.am 21 Jan 2008 23:29:09 -0000 1.6
+++ extensions/mysql/Makefile.am 10 Jun 2008 01:05:31 -0000
@@ -27,6 +27,7 @@ AM_CPPFLAGS = -I$(srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/vm \
-I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libltdl \
$(MYSQL_CFLAGS)
AM_LDFLAGS = \
Index: libbase/lirc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/lirc.h,v
retrieving revision 1.5
diff -u -3 -p -r1.5 lirc.h
--- libbase/lirc.h 27 Mar 2008 16:12:35 -0000 1.5
+++ libbase/lirc.h 10 Jun 2008 01:05:31 -0000
@@ -21,6 +21,7 @@
#include "dsodefs.h"
#include "gnash.h"
#include "network.h"
+#include "GnashKey.h"
namespace gnash {
Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.21
diff -u -3 -p -r1.21 Makefile.am
--- server/vm/Makefile.am 28 Mar 2008 21:30:23 -0000 1.21
+++ server/vm/Makefile.am 10 Jun 2008 01:05:31 -0000
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgeometry \
-I$(top_srcdir)/libamf \
-I$(top_srcdir)/libmedia \
+ -I$(top_srcdir)/libltdl \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(PTHREAD_CFLAGS) \
_______________________________________________
Gnash-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-dev
