[Gnash-commit] [SCM] Gnash branch, ltdl, updated. release_0_8_9_start-158-g15a7030

[Benjamin Wolsey]

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, ltdl has been updated
       via  15a70308718493f3b3ccb623c6dd1fc379aa5577 (commit)
       via  d0e86e29b7e2ce562409ca68e3e1fe11020840d1 (commit)
       via  85f59682fe2976142014199718c639b35897bcae (commit)
      from  d1f5c57d1838bd8f7ce3e1ca80913a8ce036ca43 (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=15a70308718493f3b3ccb623c6dd1fc379aa5577


commit 15a70308718493f3b3ccb623c6dd1fc379aa5577
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 1 21:03:44 2011 +0100

    Consistent formatting.

diff --git a/Makefile.am b/Makefile.am
index 0be9b14..88a45e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -284,8 +284,8 @@ endif
        @echo " X11_CFLAGS is $(X11_CFLAGS)"
        @echo " X11_LIBS is $(X11_LIBS)"
        @echo "Support libraries..."
-       @echo " LTDL_CFLAGS is: $(LTDL_CFLAGS)"
-       @echo " LTDL_LIBS is: $(LTDL_LIBS)"
+       @echo " LTDL_CFLAGS is $(LTDL_CFLAGS)"
+       @echo " LTDL_LIBS is $(LTDL_LIBS)"
        @echo " GLIB_CFLAGS is $(GLIB_CFLAGS)"
        @echo " GLIB_LIBS is $(GLIB_LIBS)"
        @echo " Z_CFLAGS is $(Z_CFLAGS)"

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


commit d0e86e29b7e2ce562409ca68e3e1fe11020840d1
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 1 21:02:02 2011 +0100

    Add ltdl flags back into make dumpconfig.

diff --git a/Makefile.am b/Makefile.am
index f6193af..0be9b14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -284,6 +284,8 @@ endif
        @echo " X11_CFLAGS is $(X11_CFLAGS)"
        @echo " X11_LIBS is $(X11_LIBS)"
        @echo "Support libraries..."
+       @echo " LTDL_CFLAGS is: $(LTDL_CFLAGS)"
+       @echo " LTDL_LIBS is: $(LTDL_LIBS)"
        @echo " GLIB_CFLAGS is $(GLIB_CFLAGS)"
        @echo " GLIB_LIBS is $(GLIB_LIBS)"
        @echo " Z_CFLAGS is $(Z_CFLAGS)"

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


commit 85f59682fe2976142014199718c639b35897bcae
Author: Hicham HAOUARI <address@hidden>
Date:   Tue Mar 1 19:33:14 2011 +0000

    Use LTDL_CFLAGS ang LTDL_LIBS produced by GNASH_PKG_FIND

diff --git a/configure.ac b/configure.ac
index 7371f1d..de11391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3870,6 +3870,16 @@ dnl Haiku
 if test x"${build_haiku}" = xyes -o x"${build_sound_mkit}" = xyes -o 
x"${build_media_haiku}" = x"yes"; then
     echo "        Haiku libs are: $HAIKU_LIBS"
 fi
+
+if test x"$has_ltdl" = x"yes";then
+  echo "        LIBLTDL flags are: $LTDL_CFLAGS"
+  echo "        LIBLTDL libs are: $LTDL_LIBS"
+else
+  echo "        ERROR: No libltdl development package is installed" >&3
+  echo "               Install it from ftp://ftp.gnu.org/gnu/libtool/"; >&3
+  echo "               or .deb users: apt-get install libltdl-dev" >&3
+  echo "               or .rpm users: yum install libltdl-devel" >&3
+fi
  
 if test x"$python" = x"yes"; then
   if test x"$has_python" = x"yes"; then
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index ead19a3..57747b4 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -37,6 +37,7 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
        $(Z_CFLAGS) \
        $(JPEG_CFLAGS) \
        $(BOOST_CFLAGS) \
+       $(LTDL_CFLAGS) \
        $(NULL)
 
 if ANDROID
@@ -126,7 +127,7 @@ if USE_GIF
 libgnashbase_la_SOURCES += GnashImageGif.cpp
 endif
 
-libgnashbase_la_LIBADD += -lltdl
+libgnashbase_la_LIBADD += $(LTDL_LIBS)
 
 if HAIKU
   libgnashbase_la_LIBADD += $(HAIKU_LIBS)

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

Summary of changes:
 Makefile.am         |    2 ++
 configure.ac        |   10 ++++++++++
 libbase/Makefile.am |    3 ++-
 3 files changed, 14 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash