[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-330-g461caa3 |
|
Date: |
Wed, 23 Mar 2011 21:59:10 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 461caa30664c45e57ab0f81ed2f7952db00f9ac7 (commit)
via ab3f49cfaae3aaccf377c726c71386a97e237f08 (commit)
via 062a4cc22e6072a3599853aabf14f272c5c44cbc (commit)
from 16c7b1809affcfe849de4d5b8695f4962fcf11b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=461caa30664c45e57ab0f81ed2f7952db00f9ac7
commit 461caa30664c45e57ab0f81ed2f7952db00f9ac7
Author: Bastiaan Jacques <address@hidden>
Date: Wed Mar 23 22:35:54 2011 +0100
Wrap AC_LANG_SOURCE in square brackets to stop recent automake complaining.
See
http://www.flameeyes.eu/autotools-mythbuster/forwardporting/autoconf.html
diff --git a/configure.ac b/configure.ac
index 8b4ec7b..a334239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2496,12 +2496,12 @@ if test x"$enable_visibility" != x"no"; then
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wall -Werror"
AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
void __attribute__ ((visibility("default"))) test_default (void) {}
void __attribute__ ((visibility("hidden"))) test_hidden (void) {}
int main (int argc, char **argv) { test_default (); test_hidden ();
return 0; }
- ]),
+ ])],
[
AC_DEFINE([HAVE_GNUC_VISIBILITY], [1], [Define this for GCC-visibility.])
AC_MSG_RESULT([yes])
diff --git a/macros/npapi.m4 b/macros/npapi.m4
index e27cf8a..e3bde2f 100644
--- a/macros/npapi.m4
+++ b/macros/npapi.m4
@@ -86,14 +86,14 @@ AC_DEFUN([GNASH_PATH_NPAPI],
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $NPAPI_CFLAGS"
AC_MSG_CHECKING([whether NPString has member UTF8Length])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include "npapi.h"
#include "npruntime.h"
int main(int argc, char* argv[]){
NPString str;
uint32_t len = str.UTF8Length;
return 0;
- }]),
+ }])],
[AC_DEFINE([NPAPI_VERSION],[192],[Define that we have NPAPI
present in version 1.9.2 and newer])
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
http://git.savannah.gnu.org/cgit//commit/?id=ab3f49cfaae3aaccf377c726c71386a97e237f08
commit ab3f49cfaae3aaccf377c726c71386a97e237f08
Author: Bastiaan Jacques <address@hidden>
Date: Wed Mar 23 22:27:13 2011 +0100
Remove library flags presumably added to workaround typos from
automake scripts in extensions/.
diff --git a/gui/Makefile.am b/gui/Makefile.am
index b5b4f90..f739e4d 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -115,8 +115,6 @@ AM_LDFLAGS = \
$(CURL_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
- $(LIRC_LIBS) \
- $(MYSQL_LIBS) \
$(INTLLIBS) \
$(TS_LIBS) \
$(BOOST_LIBS) \
diff --git a/gui/aos4/aos4.am b/gui/aos4/aos4.am
index 781c217..17a2053 100644
--- a/gui/aos4/aos4.am
+++ b/gui/aos4/aos4.am
@@ -35,7 +35,6 @@ aos4_gnash_LDFLAGS = -export-dynamic
#aos4_gnash_DEPENDENCIES = .configline
aos4_gnash_LDADD = \
$(top_builddir)/librender/libgnashrender.la \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS) \
$(AOS4_LIBS)
diff --git a/gui/aqua/aqua.am b/gui/aqua/aqua.am
index c179a07..8315fb5 100644
--- a/gui/aqua/aqua.am
+++ b/gui/aqua/aqua.am
@@ -25,7 +25,6 @@ aqua_gnash_SOURCES = $(GUI_SRCS) aqua/gui_aqua.cpp
aqua_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#aqua_gnash_DEPENDENCIES = .configline
aqua_gnash_LDADD = \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS)
diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
index 40ec664..6d13711 100644
--- a/gui/dump/Makefile.am
+++ b/gui/dump/Makefile.am
@@ -69,8 +69,6 @@ AM_LDFLAGS = \
$(CURL_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
- $(LIRC_LIBS) \
- $(MYSQL_LIBS) \
$(INTLLIBS) \
$(TS_LIBS) \
$(BOOST_LIBS) \
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index 096828b..4ef6480 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -66,8 +66,6 @@ AM_LDFLAGS = \
$(CURL_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
- $(LIRC_LIBS) \
- $(MYSQL_LIBS) \
$(INTLLIBS) \
$(TS_LIBS) \
$(BOOST_LIBS) \
diff --git a/gui/fltk/fltk.am b/gui/fltk/fltk.am
index bb2feb3..7b14cda 100644
--- a/gui/fltk/fltk.am
+++ b/gui/fltk/fltk.am
@@ -29,7 +29,6 @@ if WIN32
endif
#fltk_gnash_DEPENDENCIES = .configline
fltk_gnash_LDADD = \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(X!!_LIBS) \
$(AM_LDFLAGS)
diff --git a/gui/qt/kde3.am b/gui/qt/kde3.am
index ae0345e..7daa9b4 100644
--- a/gui/qt/kde3.am
+++ b/gui/qt/kde3.am
@@ -37,7 +37,6 @@ kde3_gnash_SOURCES = $(GUI_SRCS) qt/gui_kde.cpp
kde3_gnash_LDFLAGS = -export-dynamic
#kde_gnash_DEPENDENCIES = .configline
kde3_gnash_LDADD = \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS)
if BUILD_OGL_RENDERER
diff --git a/gui/qt/qt4.am b/gui/qt/qt4.am
index a8edd74..ca07aee 100644
--- a/gui/qt/qt4.am
+++ b/gui/qt/qt4.am
@@ -52,7 +52,6 @@ qt4_gnash_SOURCES = $(GUI_SRCS) \
qt4_gnash_CPPFLAGS = -DGUI_QT4 -DGUI_CONFIG=\"QT4\" $(AM_CPPFLAGS)
$(QT4_CFLAGS)
qt4_gnash_LDFLAGS = -export-dynamic
qt4_gnash_LDADD = \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS) \
$(LIBVA_X11_LIBS)
diff --git a/gui/qt/qtopia3.am b/gui/qt/qtopia3.am
index 72daaad..8275d7e 100644
--- a/gui/qt/qtopia3.am
+++ b/gui/qt/qtopia3.am
@@ -27,7 +27,6 @@ qtopia_gnash_SOURCES = $(GUI_SRCS) qt/gui_kde.cpp
qtopia_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#qtopia_gnash_DEPENDENCIES = .configline
qtopia_gnash_LDADD = \
- $(MYSQL_LIBS) \
$(GNASH_LIBS) \
$(AM_LDFLAGS)
if BUILD_OGL_RENDERER
diff --git a/gui/sdl/sdl.am b/gui/sdl/sdl.am
index dd9ee85..d366673 100644
--- a/gui/sdl/sdl.am
+++ b/gui/sdl/sdl.am
@@ -32,7 +32,6 @@ sdl_gnash_SOURCES = $(GUI_SRCS) \
sdl_gnash_LDFLAGS = -export-dynamic
sdl_gnash_LDADD = \
$(GNASH_LIBS) \
- $(MYSQL_LIBS) \
$(AM_LDFLAGS) \
$(SDL_LIBS)
http://git.savannah.gnu.org/cgit//commit/?id=062a4cc22e6072a3599853aabf14f272c5c44cbc
commit 062a4cc22e6072a3599853aabf14f272c5c44cbc
Author: Bastiaan Jacques <address@hidden>
Date: Wed Mar 23 22:17:15 2011 +0100
Fix copy/paste errors.
diff --git a/extensions/dbus/Makefile.am b/extensions/dbus/Makefile.am
index 5492cc1..23a7109 100644
--- a/extensions/dbus/Makefile.am
+++ b/extensions/dbus/Makefile.am
@@ -35,7 +35,7 @@ AM_CPPFLAGS = \
dbus_la_SOURCES = dbus_ext.cpp dbus_ext.h
dbus_la_CPPFLAGS = $(AM_CPPFLAGS)
dbus_la_LDFLAGS = -module -avoid-version -no-undefined
-dbus_la_LIBDADD = $(LIBADD_DL) \
+dbus_la_LIBADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(BOOST_LIBS) \
diff --git a/extensions/dejagnu/Makefile.am b/extensions/dejagnu/Makefile.am
index 57ca59b..21e1fa6 100644
--- a/extensions/dejagnu/Makefile.am
+++ b/extensions/dejagnu/Makefile.am
@@ -41,7 +41,7 @@ AM_LDFLAGS = \
dejagnu_la_SOURCES = dejagnu.cpp dejagnu.h
dejagnu_la_LDFLAGS = -module -avoid-version -no-undefined
-dejagnu_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
+dejagnu_la_LIBADD = $(LIBADD_DL) $(AM_LDFLAGS)
check_PROGRAMS = # SharedTest
CLEANFILES = \
diff --git a/extensions/fileio/Makefile.am b/extensions/fileio/Makefile.am
index cd35c8f..6625a60 100644
--- a/extensions/fileio/Makefile.am
+++ b/extensions/fileio/Makefile.am
@@ -47,7 +47,7 @@ AM_LDFLAGS = \
fileio_la_SOURCES = fileio.cpp fileio.h
fileio_la_LDFLAGS = -module -avoid-version -no-undefined
-fileio_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
+fileio_la_LIBADD = $(LIBADD_DL) $(AM_LDFLAGS)
check_SCRIPTS =
diff --git a/extensions/gtk2/Makefile.am b/extensions/gtk2/Makefile.am
index 9aff4f4..cd4ad6f 100644
--- a/extensions/gtk2/Makefile.am
+++ b/extensions/gtk2/Makefile.am
@@ -60,7 +60,7 @@ AM_LDFLAGS = \
gtkext_la_SOURCES = gtkext.cpp gtkext.h
gtkext_la_CPPFLAGS = $(AM_CPPFLAGS)
gtkext_la_LDFLAGS = -module -avoid-version # -no-undefined
-gtkext_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
+gtkext_la_LIBADD = $(LIBADD_DL) $(AM_LDFLAGS)
# check_PROGRAMS = hello
CLEANFILES = \
diff --git a/extensions/lirc/Makefile.am b/extensions/lirc/Makefile.am
index 970d230..3679d30 100644
--- a/extensions/lirc/Makefile.am
+++ b/extensions/lirc/Makefile.am
@@ -36,7 +36,7 @@ AM_CPPFLAGS = \
lirc_la_SOURCES = lirc_ext.cpp lirc_ext.h
lirc_la_CPPFLAGS = $(AM_CPPFLAGS)
lirc_la_LDFLAGS = -module -avoid-version -no-undefined
-lirc_la_LIBDADD = $(LIBADD_DL) \
+lirc_la_LIBADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(PTHREAD_LIBS) \
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 4 ++--
extensions/dbus/Makefile.am | 2 +-
extensions/dejagnu/Makefile.am | 2 +-
extensions/fileio/Makefile.am | 2 +-
extensions/gtk2/Makefile.am | 2 +-
extensions/lirc/Makefile.am | 2 +-
gui/Makefile.am | 2 --
gui/aos4/aos4.am | 1 -
gui/aqua/aqua.am | 1 -
gui/dump/Makefile.am | 2 --
gui/fb/Makefile.am | 2 --
gui/fltk/fltk.am | 1 -
gui/qt/kde3.am | 1 -
gui/qt/qt4.am | 1 -
gui/qt/qtopia3.am | 1 -
gui/sdl/sdl.am | 1 -
macros/npapi.m4 | 4 ++--
17 files changed, 9 insertions(+), 22 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-330-g461caa3,
Bastiaan Jacques <=