commit 0fcb19444228ac43c8ae4bffeb6c487b9ea2d2f9
Author: Hicham HAOUARI <hicham.haouari(a)gmail.com>
Date: Tue Mar 1 00:41:58 2011 +0000
Rework system ltdl patch
0001-Use-system-ltdl.patch | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/0001-Use-system-ltdl.patch b/0001-Use-system-ltdl.patch
index fdda7b1..5fb29d6 100644
--- a/0001-Use-system-ltdl.patch
+++ b/0001-Use-system-ltdl.patch
@@ -1,13 +1,13 @@
-From 7a68d3ebdfaaa50e567f1895f576ac4a0739f962 Mon Sep 17 00:00:00 2001
+From fcf5836fbff1b0172205f618e92c1c2d996c75ac Mon Sep 17 00:00:00 2001
From: Hicham HAOUARI <hicham.haouari(a)gmail.com>
-Date: Mon, 28 Feb 2011 22:58:31 +0000
+Date: Tue, 1 Mar 2011 00:41:26 +0000
Subject: [PATCH] Use system ltdl
---
Makefile.am | 14 +---------
configure.ac | 63 ++++++++++++--------------------------------------
- libbase/Makefile.am | 22 ++---------------
- 3 files changed, 20 insertions(+), 79 deletions(-)
+ libbase/Makefile.am | 23 +++---------------
+ 3 files changed, 21 insertions(+), 79 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1843ce8..f6193af 100644
@@ -53,7 +53,7 @@ index 1843ce8..f6193af 100644
@echo " GLIB_LIBS is $(GLIB_LIBS)"
@echo " Z_CFLAGS is $(Z_CFLAGS)"
diff --git a/configure.ac b/configure.ac
-index 13e4f61..dcfb7ea 100644
+index 13e4f61..57613c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ AC_CONFIG_SRCDIR([libcore/as_object.h])
@@ -132,7 +132,7 @@ index 13e4f61..dcfb7ea 100644
+ [lt_dlinit],
+ AC_DEFINE(HAVE_LTDL, [1], [Libtool 2.x defines this, but libtool 1.5
doesn't]),
+ AC_MSG_ERROR([Can't find any suitable libltdl to link
against]))],
-+ AC_MSG_ERROR([Can't find libltdl]))
++ AC_MSG_ERROR([Can't find ltdl.h]))
dnl --------------------------------------------------------
dnl SOL dir
@@ -154,7 +154,7 @@ index 13e4f61..dcfb7ea 100644
libsound/Makefile
libbase/Makefile
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
-index cb66fa2..db011ca 100644
+index cb66fa2..ead19a3 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -23,13 +23,10 @@ sysconf_DATA = gnashrc gnashpluginrc
@@ -206,17 +206,18 @@ index cb66fa2..db011ca 100644
accumulator.h \
SimpleBuffer.h \
extension.h \
-@@ -234,8 +219,7 @@ EXTENSIONS_API = \
+@@ -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 +275,7 @@ if ENABLE_PCH
+@@ -291,7 +276,7 @@ if ENABLE_PCH
AM_CXXFLAGS = $(PCH_FLAGS)
endif
Show replies by date