Commit 16caa361 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Make compilation of mozilla plugin easier on different distributions. Removed...

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
parent fc5c3b36
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment