From 16caa3618badef00bb71d852ab7361dd3f45b362 Mon Sep 17 00:00:00 2001
From: Jean-Paul Saman <jpsaman@videolan.org>
Date: Sat, 16 Apr 2005 14:10:00 +0000
Subject: [PATCH] Make compilation of mozilla plugin easier on different
 distributions. Removed fixed include paths from mozilla/Makefile.am.
 XPIDL_INCL is automatically determined from ${MOZILLA_CONFIG}. Configure and
 compile with XPIDL=<path_to_xpidl> application of your mozilla version, eg
 for mozilla-1.7.6 use: XPIDL=/usr/lib/mozilla-1.7.6/xpidl ./configure <rest
 of line> && make

---
 configure.ac        | 4 ++++
 mozilla/Makefile.am | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2bb1a97e18..7dcd76b203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4155,6 +4155,10 @@ dnl Not necessarily in ${PATH}
 if test -z "${XPIDL}" -o ! -x "${XPIDL}"; then
   XPIDL="/usr/lib/mozilla/xpidl"
 fi
+if test -z "${XPIDL_INCL}"; then
+  XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \
+ `${MOZILLA_CONFIG} --idlflags plugin xpcom java` "
+fi
 AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 
 dnl
diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index ee3e2138ed..357adba2f1 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -76,13 +76,11 @@ $(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \
 vlcintf_xpt_DATA = vlcintf.xpt
 vlcintf_xptdir = $(libdir)/mozilla/components
 vlcintf.xpt: vlcintf.idl
-	$(XPIDL) $(XPIDL_INCL) -I/usr/share/idl/mozilla \
-	  -I/usr/lib/mozilla/include/idl \
+	$(XPIDL) $(XPIDL_INCL) \
 	  -m typelib -o vlcintf $(srcdir)/vlcintf.idl
 
 vlcintf.h: vlcintf.idl
-	$(XPIDL) $(XPIDL_INCL) -I/usr/share/idl/mozilla \
-	  -I/usr/lib/mozilla/include/idl \
+	$(XPIDL) $(XPIDL_INCL) \
 	  -m header -o vlcintf $(srcdir)/vlcintf.idl
 
 if HAVE_WIN32