* configure.ac, mozilla/Makefile.am: more win32 mozilla plugin build fixes.

diff --git a/configure.ac b/configure.ac
index 74f51d077c8d4d14d435f3a0f84b9b9f29ab6812..4efce96a0d2c57419c1a1bff574c3e393601c0a0 100644 (file)
--- 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 45d8625b30dcc47a7e15dbdd58ed00868b24203f..0e384ec66113bd06e0033a03cfcc1de97b3080a7 100644 (file)
--- 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