[openvrml-commit] openvrml/mozilla-plugin configure.ac, 1.14.2.1, 1.14.2.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22198/mozilla-plugin

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	configure.ac 
Log Message:
Use the npruntime extensions to NPAPI to make the plug-in scriptable instead of XPCOM.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/configure.ac,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** configure.ac	1 Oct 2006 05:48:25 -0000	1.14.2.1
--- configure.ac	9 Oct 2006 03:09:02 -0000	1.14.2.2
***************
*** 16,24 ****
  ACX_PTHREAD(, [AC_MSG_FAILURE([pthread support not found])])
  
- PKG_CHECK_MODULES([MOZILLA_XPCOM], [mozilla-xpcom], , [have_mozilla_xpcom=no])
- if test "X$PKG_CONFIG" != "Xno" -a -z "MOZILLA_XPCOM_PKG_ERRORS"; then
-   mozincludedir=`$PKG_CONFIG --variable=includedir mozilla-xpcom`
-   MOZILLA_XPCOM_CFLAGS="-I$mozincludedir $MOZILLA_XPCOM_CFLAGS"
- fi
  PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 1.6],
                    , [have_mozilla_plugin=no])
--- 16,19 ----
***************
*** 26,48 ****
  mozprefix=`$PKG_CONFIG --variable=prefix mozilla-plugin`
  mozlibdir=`$PKG_CONFIG --variable=libdir mozilla-plugin`
- AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])
- AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])
- AC_PATH_PROG([XPIDL], [xpidl], , ["$mozlibdir"])
- mozidldir="$mozprefix/share/idl/mozilla-$mozversion"
- MOZILLA_XPIDLFLAGS="-I $mozidldir"
  AC_SUBST([mozlibdir])
- AC_SUBST([MOZILLA_XPIDLFLAGS])
  PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
  
- AX_CHECK_GL
- AC_PATH_XTRA
- 
  if test "X$enable_mozilla_plugin" != "Xno"; then
    if test "X$have_mozilla_plugin" = "Xno"; then
      AC_MSG_FAILURE([Mozilla plug-in development headers are required to build the Mozilla plug-in.])
    fi
-   if test -z "$XPIDL"; then
-     AC_MSG_FAILURE([xpidl is required to build the Mozilla plug-in])
-   fi
    if test "X$have_gtk" = "Xno"; then
      AC_MSG_FAILURE([GTK+ is required to build the Mozilla plug-in])
--- 21,31 ----