From cd35bf7cc1952960fbf46ac0cfd46afcaece66a6 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sat, 20 Sep 2003 15:52:19 +0000 Subject: [PATCH] * configure.ac, mozilla/Makefile.am: more win32 mozilla plugin build fixes. --- configure.ac | 6 ++++-- mozilla/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 74f51d077c..4efce96a0d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Autoconf settings for vlc -dnl $Id: configure.ac,v 1.75 2003/09/20 13:52:23 gbazin Exp $ +dnl $Id: configure.ac,v 1.76 2003/09/20 15:52:19 gbazin Exp $ AC_INIT(vlc,0.6.3-cvs) @@ -3085,8 +3085,9 @@ then if test -f "${real_mozilla_sdk}/mozilla-config.h"; then AC_MSG_RESULT(${real_mozilla_sdk}/mozilla-config.h) mozilla=: - AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I{real_mozilla_sdk}/plugin/include -I{real_mozilla_sdk}/java/include]) + AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) AX_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue]) + XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl" else dnl The given path is incorrect AC_MSG_RESULT(no) @@ -3260,6 +3261,7 @@ AC_SUBST(ASM) AC_SUBST(MOC) AC_SUBST(WINDRES) AC_SUBST(XPIDL) +AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) AC_SUBST(INCLUDES) AC_SUBST(ALL_LINGUAS) diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am index 45d8625b30..0e384ec661 100644 --- a/mozilla/Makefile.am +++ b/mozilla/Makefile.am @@ -68,11 +68,13 @@ $(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \ vlcintf_xpt_DATA = vlcintf.xpt vlcintf_xptdir = $(libdir)/mozilla/components vlcintf.xpt: vlcintf.idl - $(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \ + $(XPIDL) $(XPIDL_INCL) -I/usr/share/idl/mozilla \ + -I/usr/lib/mozilla/include/idl \ -m typelib -o vlcintf $(srcdir)/vlcintf.idl vlcintf.h: vlcintf.idl - $(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \ + $(XPIDL) $(XPIDL_INCL) -I/usr/share/idl/mozilla \ + -I/usr/lib/mozilla/include/idl \ -m header -o vlcintf $(srcdir)/vlcintf.idl if HAVE_WIN32 -- 2.39.2