From 9acbc44f12e4db912061ac42a0099c1439a530c8 Mon Sep 17 00:00:00 2001 From: Crispin Flowerday Date: Sat, 27 Aug 2005 21:47:07 +0000 Subject: Add another workaround for the Gentoo header layout, and reference the 2005-08-27 Crispin Flowerday * configure.ac: * embed/mozilla/Makefile.am: Add another workaround for the Gentoo header layout, and reference the gentoo bug in the configure script --- ChangeLog | 8 ++++++++ configure.ac | 1 + embed/mozilla/Makefile.am | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 054863189..d3b9e36b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-08-27 Crispin Flowerday + + * 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 * 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 \ -- cgit v1.2.3