[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: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-160-g3f4c518 |
|
Date: |
Tue, 01 Mar 2011 21:31:46 +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 3f4c518aecad0ffc39f62d18bddff153bdc4214e (commit)
via 2aad1d0a77e8d2cf8be75929978a62309e7ba22e (commit)
via 3c0153b9a2b202abe6f644a9d1b43c5b43294766 (commit)
via f1d5cd5519e2404b25afce708c6b261294382f94 (commit)
via e7d8d96dce098ee0c84e8ff0d363140e0c26bb71 (commit)
via 6c72c1ba9c36507c8a69d8d45b627ff4cb3c581e (commit)
from c8e058bcaeacd71052801c2d58e2c838a4e7cbae (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=3f4c518aecad0ffc39f62d18bddff153bdc4214e
commit 3f4c518aecad0ffc39f62d18bddff153bdc4214e
Author: Benjamin Wolsey <address@hidden>
Date: Tue Mar 1 22:31:57 2011 +0100
Correct package name for yum users.
diff --git a/configure.ac b/configure.ac
index de11391..ae32835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3878,7 +3878,7 @@ 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
+ echo " or .rpm users: yum install libtool-ltdl-devel" >&3
fi
if test x"$python" = x"yes"; then
http://git.savannah.gnu.org/cgit//commit/?id=2aad1d0a77e8d2cf8be75929978a62309e7ba22e
commit 2aad1d0a77e8d2cf8be75929978a62309e7ba22e
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=3c0153b9a2b202abe6f644a9d1b43c5b43294766
commit 3c0153b9a2b202abe6f644a9d1b43c5b43294766
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=f1d5cd5519e2404b25afce708c6b261294382f94
commit f1d5cd5519e2404b25afce708c6b261294382f94
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)
http://git.savannah.gnu.org/cgit//commit/?id=e7d8d96dce098ee0c84e8ff0d363140e0c26bb71
commit e7d8d96dce098ee0c84e8ff0d363140e0c26bb71
Author: Hicham HAOUARI <address@hidden>
Date: Tue Mar 1 17:42:55 2011 +0000
Remove some odd character from previous patch
diff --git a/configure.ac b/configure.ac
index bc5da51..7371f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1293,7 +1293,7 @@ AC_SUBST(DLPREOPEN)
GNASH_PKG_FIND([ltdl], [ltdl.h], [libltdl library], [lt_dlinit])
-if test x"$Ä¥as_ltdl" = x"yes";then
+if test x"$has_ltdl" = x"yes";then
AC_DEFINE(HAVE_LTDL, [1], [Libtool 2.x defines this, but libtool 1.5
doesn't])
fi
http://git.savannah.gnu.org/cgit//commit/?id=6c72c1ba9c36507c8a69d8d45b627ff4cb3c581e
commit 6c72c1ba9c36507c8a69d8d45b627ff4cb3c581e
Author: Hicham HAOUARI <address@hidden>
Date: Tue Mar 1 16:17:01 2011 +0000
Use system ltdl
diff --git a/Makefile.am b/Makefile.am
index 1843ce8..f6193af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,16 +63,12 @@ STD_DIRS = \
po \
$(NULL)
-if LIBLTDL2
-LIBLTDLDIR = libltdl
-endif
-
if HAVE_VAAPI
VAAPI_DIR = libvaapi
endif
-SUBDIRS = $(LIBLTDLDIR) $(VAAPI_DIR) $(STD_DIRS)
-DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite libltdl libvaapi
+SUBDIRS = $(VAAPI_DIR) $(STD_DIRS)
+DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite libvaapi
if TESTSUITE
SUBDIRS += testsuite
@@ -109,10 +105,6 @@ EXTRA_DIST = \
packaging/klash.xpm \
revno.h
-if LIBLTDL1
-EXTRA_DIST += libltdl/ltdl.h libltdl/ltdl.c
-endif
-
# dist-hook:
# @test -d "$(distdir)/packaging" || $(mkinstalldirs)
"$(distdir)/packaging"
# cp -p $(srcdir)/*.am $(top_distdir)/packaging/
@@ -292,8 +284,6 @@ endif
@echo " X11_CFLAGS is $(X11_CFLAGS)"
@echo " X11_LIBS is $(X11_LIBS)"
@echo "Support libraries..."
- @echo " INCLTDL $(INCLTDL) "
- @echo " LIBLTDL $(LIBLTDL) "
@echo " GLIB_CFLAGS is $(GLIB_CFLAGS)"
@echo " GLIB_LIBS is $(GLIB_LIBS)"
@echo " Z_CFLAGS is $(Z_CFLAGS)"
diff --git a/configure.ac b/configure.ac
index 13e4f61..bc5da51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ AC_CONFIG_SRCDIR([libcore/as_object.h])
AC_CONFIG_HEADERS([gnashconfig.h])
AC_CONFIG_MACRO_DIR([macros])
-dnl AC_CONFIG_SUBDIRS(libltdl)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
@@ -1278,57 +1277,25 @@ AM_CONDITIONAL(BUILD_EXTENSIONS, [ test -n
"$extensions_list"])
GNASH_PKG_CLASSFILE
-ltmajor=0
-AC_MSG_CHECKING([For the version of libtool])
-if test -d ${srcdir}/libltdl/libltdl; then
- ltver=2.x
-else
- ltver=1.x
-fi
-ltmajor=`echo $ltver | cut -d '.' -f 1`
-AC_MSG_RESULT([$ltver])
-dnl Libtool version 1.5
-if test $ltmajor -eq 1; then
- AC_LIBLTDL_CONVENIENCE
- AC_LIBTOOL_DLOPEN
- if test x"${windows}" = x"yes"; then
- dnl The following macro may be empty; the colon is necessary
- dnl in this case to avoid an empty if statement (which is a syntax error).
- AC_LIBTOOL_WIN32_DLL
- :
- fi
- AC_DISABLE_STATIC
- dnl FIXME: there should really be a test here to make sure it's really there,
- dnl but because libltdl requires us to use their config code, it's a lot
harder
- dnl to do that. So if we get this far without errors, we just blindly assume
- dnl the header exists too. This is only used by libtool 1.5, which appears to
- dnl mostly only effect Debian lenny or OpenBSD. Libtool; 2.x defines this,
but
- dnl libtool 1.5 doesn't, and we need it for dlopen() so extensions work.
- AC_DEFINE(HAVE_LTDL, [1], [Libtool 2.x defines this, but libtool 1.5
doesn't])
-dnl libtool version 2.x
-else
- dnl LT_CONFIG_LTDL_DIR([libltdl])
- LT_INIT([dlopen win32-dll disable-static])
- LTDL_INIT([convenience recursive])
-fi
-AC_LIB_LTDL
+dnl --------------------------------------------------------
+dnl Libtool
+dnl --------------------------------------------------------
+AC_LIBTOOL_DLOPEN
+AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
DLOPEN="-dlopen"
DLPREOPEN="-dlpreopen"
AC_SUBST(DLOPEN)
AC_SUBST(DLPREOPEN)
-dnl dnl Substitute INCLTDL and LIBLTDL in the Makefiles
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
+GNASH_PKG_FIND([ltdl], [ltdl.h], [libltdl library], [lt_dlinit])
-AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
-AM_CONDITIONAL(LIBLTDL1, [test $ltmajor -eq 1])
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
+if test x"$Ä¥as_ltdl" = x"yes";then
+ AC_DEFINE(HAVE_LTDL, [1], [Libtool 2.x defines this, but libtool 1.5
doesn't])
+fi
dnl --------------------------------------------------------
dnl SOL dir
@@ -2947,7 +2914,7 @@ SUPPORTED_GUIS="`echo ${SUPPORTED_GUIS} | sed 's/,//'`" #
Strip leading comma
AC_SUBST(SUPPORTED_GUIS)
dnl AC_CONFIG_LINKS(doc/C/images)
-dnl AC_CONFIG_LINKS(gnashconfig.h,libltdl/config.h)
+dnl AC_CONFIG_LINKS(gnashconfig.h)
AC_CONFIG_LINKS(cygnal/testsuite/cygnal.all/cygnalrc:cygnal/testsuite/cygnal.all/cygnalrc.in)
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc:testsuite/libbase.all/gnashrc.in)
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc-local:testsuite/libbase.all/gnashrc-local.in)
@@ -2961,7 +2928,6 @@ desktop/gnash-qt-launcher:desktop/gnash-qt-launcher.in
AC_OUTPUT(Makefile
desktop/Makefile
po/Makefile
-libltdl/Makefile
libmedia/Makefile
libsound/Makefile
libbase/Makefile
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index cb66fa2..ead19a3 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -23,13 +23,10 @@ sysconf_DATA = gnashrc gnashpluginrc
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
-# If we are using an installable libltdl, then it needs to be built
-# before libgnash, as libgnash depends on it for extensions.
pkglib_LTLIBRARIES = libgnashbase.la
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -I$(top_srcdir)/libltdl \
$(PTHREAD_CFLAGS) \
$(PNG_CFLAGS) \
$(GIF_CFLAGS) \
@@ -40,7 +37,6 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
$(Z_CFLAGS) \
$(JPEG_CFLAGS) \
$(BOOST_CFLAGS) \
- $(INCLTDL) \
$(NULL)
if ANDROID
@@ -130,17 +126,7 @@ if USE_GIF
libgnashbase_la_SOURCES += GnashImageGif.cpp
endif
-if LIBLTDL1
-noinst_LTLIBRARIES = libltdlc.la
-libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
-libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-libgnashbase_la_LIBADD += $(top_builddir)/libbase/libltdlc.la
-endif
-
-if LIBLTDL2
-libgnashbase_la_LIBADD += $(top_builddir)/libltdl/libltdlc.la
-endif
-
+libgnashbase_la_LIBADD += -lltdl
if HAIKU
libgnashbase_la_LIBADD += $(HAIKU_LIBS)
@@ -163,7 +149,6 @@ endif
noinst_HEADERS =
inst_HEADERS = \
- $(LIBLTDLHEAD) \
accumulator.h \
SimpleBuffer.h \
extension.h \
@@ -234,8 +219,8 @@ EXTENSIONS_API = \
instdir = $(includedir)/gnash
inst_HEADERS += $(EXTENSIONS_API)
-libgnashbase_la_LDFLAGS = -release $(VERSION)
-libgnashbase_la_DEPENDENCIES = $(LIBLTDLLIB)
+libgnashbase_la_LDFLAGS = -release $(VERSION)
+libgnashbase_la_DEPENDENCIES =
if BUILD_OGL_RENDERER
libgnashbase_la_SOURCES += \
@@ -291,7 +276,7 @@ if ENABLE_PCH
AM_CXXFLAGS = $(PCH_FLAGS)
endif
-CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
+CLEANFILES = gnashrc gnashpluginrc
# Rebuild with GCC 4.x Mudflap support
mudflap:
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 16 +++--------
configure.ac | 70 ++++++++++++++++----------------------------------
libbase/Makefile.am | 24 +++--------------
3 files changed, 32 insertions(+), 78 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-160-g3f4c518,
Benjamin Wolsey <=