Gitweb links:
...log
http://git.netsurf-browser.org/libdom.git/shortlog/c90f98b7d5bdaecb1c497b...
...commit
http://git.netsurf-browser.org/libdom.git/commit/c90f98b7d5bdaecb1c497b15...
...tree
http://git.netsurf-browser.org/libdom.git/tree/c90f98b7d5bdaecb1c497b155a...
The branch, master has been updated
via c90f98b7d5bdaecb1c497b155af5347aedb1d617 (commit)
from abfd646c26f2e00484266507523c420bcb9ea7b8 (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 -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libdom.git/commit/?id=c90f98b7d5bdaecb1c49...
commit c90f98b7d5bdaecb1c497b155af5347aedb1d617
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Fix pkg-config file expat library linkage
diff --git a/Makefile b/Makefile
index 1c6d9ff..5690403 100644
--- a/Makefile
+++ b/Makefile
@@ -157,3 +157,6 @@ ifeq ($(WITH_HUBBUB_BINDING),yes)
REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub
endif
+ifeq ($(WITH_EXPAT_BINDING),yes)
+ REQUIRED_LIBS := $(REQUIRED_LIBS) expat
+endif
diff --git a/Makefile.config b/Makefile.config
index 04971d5..0aba3ff 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -3,6 +3,9 @@
# Build the libxml2 binding?
# yes | no
WITH_LIBXML_BINDING := no
+
+# Build the expat binding?
+# yes | no
WITH_EXPAT_BINDING := yes
# Build the hubbub binding?
diff --git a/libdom.pc.in b/libdom.pc.in
index 406ed9e..86a97bb 100644
--- a/libdom.pc.in
+++ b/libdom.pc.in
@@ -7,5 +7,5 @@ Name: libdom
Description: W3C DOM implementation
Version: VERSION
REQUIRED
-Libs: -L${libdir} -ldom -lexpat
+Libs: -L${libdir} -ldom LIBRARIES
Cflags: -I${includedir}
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +++
Makefile.config | 3 +++
libdom.pc.in | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1c6d9ff..5690403 100644
--- a/Makefile
+++ b/Makefile
@@ -157,3 +157,6 @@ ifeq ($(WITH_HUBBUB_BINDING),yes)
REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub
endif
+ifeq ($(WITH_EXPAT_BINDING),yes)
+ REQUIRED_LIBS := $(REQUIRED_LIBS) expat
+endif
diff --git a/Makefile.config b/Makefile.config
index 04971d5..0aba3ff 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -3,6 +3,9 @@
# Build the libxml2 binding?
# yes | no
WITH_LIBXML_BINDING := no
+
+# Build the expat binding?
+# yes | no
WITH_EXPAT_BINDING := yes
# Build the hubbub binding?
diff --git a/libdom.pc.in b/libdom.pc.in
index 406ed9e..86a97bb 100644
--- a/libdom.pc.in
+++ b/libdom.pc.in
@@ -7,5 +7,5 @@ Name: libdom
Description: W3C DOM implementation
Version: VERSION
REQUIRED
-Libs: -L${libdir} -ldom -lexpat
+Libs: -L${libdir} -ldom LIBRARIES
Cflags: -I${includedir}
--
Document Object Model library