aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCrispin Flowerday <gnome@flowerday.cx>2005-08-28 05:47:07 +0800
committerCrispin Flowerday <crispin@src.gnome.org>2005-08-28 05:47:07 +0800
commit9acbc44f12e4db912061ac42a0099c1439a530c8 (patch)
treea6f3648c2f5746aaa229bfb126f3e62627cd83fe
parent424a2bd495c0901cb51c61b671b2c966e6f9f67b (diff)
downloadgsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.tar
gsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.tar.gz
gsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.tar.bz2
gsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.tar.lz
gsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.tar.xz
gsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.tar.zst
gsoc2013-epiphany-9acbc44f12e4db912061ac42a0099c1439a530c8.zip
Add another workaround for the Gentoo header layout, and reference the
2005-08-27 Crispin Flowerday <gnome@flowerday.cx> * configure.ac: * embed/mozilla/Makefile.am: Add another workaround for the Gentoo header layout, and reference the gentoo bug in the configure script
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac1
-rw-r--r--embed/mozilla/Makefile.am4
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 054863189..d3b9e36b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-27 Crispin Flowerday <gnome@flowerday.cx>
+
+ * configure.ac:
+ * embed/mozilla/Makefile.am:
+
+ Add another workaround for the Gentoo header layout, and
+ reference the gentoo bug in the configure script
+
2005-08-27 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 28ec189f3..eee770350 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,7 @@ CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --
CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $MOZILLA-xpcom`"
dnl Sigh Gentoo has a rubbish header layout
+dnl http://bugs.gentoo.org/show_bug.cgi?id=100804
CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/dom"
AC_MSG_CHECKING([[whether we have a gtk 2 mozilla build]])
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 385a39b81..6314ec3ee 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -105,6 +105,10 @@ mozilla_include_subdirs = \
xpcom \
xpconnect
+# Grr, damn gentoo has a dodgy header layout
+# http://bugs.gentoo.org/show_bug.cgi?id=100804
+mozilla_include_subdirs += find pref
+
libephymozillaembed_la_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/embed \