videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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
This commit is contained in:
Jean-Paul Saman 2005-04-16 14:10:00 +00:00
parent fc5c3b368e
commit 16caa3618b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -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

6
mozilla/Makefile.am
View File

@ -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