[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-469-g8449869

[Bastiaan Jacques]

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  8449869a36809fa29eabeae41dcc92c473b53d2f (commit)
       via  f8c0f877de476d43213e14d2ebdb18d8d90ddf90 (commit)
       via  ec93ac8f0bbf91a2b3211facab5a631ecf90bb79 (commit)
      from  cdcc7e11fd940e72be0845775e212ae5f3eb6409 (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=8449869a36809fa29eabeae41dcc92c473b53d2f


commit 8449869a36809fa29eabeae41dcc92c473b53d2f
Author: Gabriele Giacone <address@hidden>
Date:   Sat Apr 2 02:11:34 2011 +0200

    Don't link against MySQL libs (leftover from wallpaper fix for extensions/
    automake typo) unneccesarily.

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index b36f0b9..ec16ea1 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -37,7 +37,6 @@ GNASH_LIBS = \
 AM_LDFLAGS = \
        $(LIBINTL) \
        $(LIBADD_DL) \
-       $(MYSQL_LIBS) \
        $(CURL_LIBS) \
        $(JPEG_LIBS) \
        $(PNG_LIBS) \
@@ -72,7 +71,6 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PTHREAD_CFLAGS) \
-       $(MYSQL_CFLAGS) \
        $(NULL)
 
 if WIN32

http://git.savannah.gnu.org/cgit//commit/?id=f8c0f877de476d43213e14d2ebdb18d8d90ddf90


commit f8c0f877de476d43213e14d2ebdb18d8d90ddf90
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 02:07:24 2011 +0200

    Only link libXi for FLTK2. Don't link libX11 unless needed.

diff --git a/configure.ac b/configure.ac
index be8178a..97ee3cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1867,11 +1867,11 @@ AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAVE_GETPWNAM, 1, 
[Has getpwnam] ))
 dnl X11 is needed for fltk (at least),
 dnl and probably for many other guis too ...
 GNASH_PATH_X11
-AC_CHECK_LIB(Xi, XInput_find_display)
-AC_CHECK_LIB(X11, XDisableAccessControl)
 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>], [
   char *p1 = (char *)"Hello";
   char *p2 = (char *)"World";
@@ -2438,6 +2438,10 @@ fi
 
 if test x$build_fltk = xyes; then
   GNASH_PKG_FIND(fltk2, [fltk/FL_API.h], [Fast Light Toolkit], fl_window_flush)
+  if test x"${has_fltk2}" = xyes; then
+    AC_CHECK_LIB(Xi, XInput_find_display,
+      [AC_SUBST(FLTK2_LIBS, "$FLTK2_LIBS -lXi")])
+  fi
 fi
 
 AM_CONDITIONAL(HAVE_FLTK2, [ test x$has_fltk2 = xyes ])
diff --git a/gui/qt/qt4.am b/gui/qt/qt4.am
index bfc61e6..708bce8 100644
--- a/gui/qt/qt4.am
+++ b/gui/qt/qt4.am
@@ -54,6 +54,7 @@ qt4_gnash_LDFLAGS = -export-dynamic
 qt4_gnash_LDADD = \
        $(GNASH_LIBS) \
        $(AM_LDFLAGS) \
+       $(X11_LIBS) \
        $(LIBVA_X11_LIBS)
 
 if BUILD_OGL_RENDERER

http://git.savannah.gnu.org/cgit//commit/?id=ec93ac8f0bbf91a2b3211facab5a631ecf90bb79


commit ec93ac8f0bbf91a2b3211facab5a631ecf90bb79
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 01:35:13 2011 +0200

    Don't be noisy.

diff --git a/macros/curl.m4 b/macros/curl.m4
index 9a1e74a..b0ad815 100644
--- a/macros/curl.m4
+++ b/macros/curl.m4
@@ -122,7 +122,7 @@ AC_DEFUN([GNASH_PATH_CURL],
     dnl on most machines without it. (Ubuntu packaging bug.)
     save_LIBS="$LIBS"
     LIBS="$LIBS $CURL_LIBS"
-    AC_TRY_LINK_FUNC(curl_easy_init, [echo "ok!"], 
+    AC_TRY_LINK_FUNC(curl_easy_init, [], 
       [AC_CHECK_LIB(lber, ber_free, [CURL_LIBS="$CURL_LIBS -llber"])])
     dnl FIXME: complain if that didn't do the trick?
     LIBS="$save_LIBS"

-----------------------------------------------------------------------

Summary of changes:
 configure.ac          |    8 ++++++--
 gui/qt/qt4.am         |    1 +
 macros/curl.m4        |    2 +-
 utilities/Makefile.am |    2 --
 4 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash