diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2013-03-07 18:34:41 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2013-03-08 13:03:03 +0100 |
| commit | 7f0094642835ff753e63d7c09ac9bed8b38cffdd (patch) | |
| tree | ce86e9cc39114e196384e71bd22ebccf8ca8ec32 | |
| parent | e7170578a22a426c7c946894c56e533cc403c4bb (diff) | |
Don't try to use xpidl
The xpidl binary is no longer available in xulrunner 10, so we no longer
need the Makefile magic using xpidl now that we require it. We'll always
directly use header.py/typelib.py instead.
| -rw-r--r-- | SpiceXPI/src/plugin/Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 0 insertions, 19 deletions
diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am index ad4ba7f..5705731 100644 --- a/SpiceXPI/src/plugin/Makefile.am +++ b/SpiceXPI/src/plugin/Makefile.am @@ -44,19 +44,11 @@ libnsISpicec_la_SOURCES = \ pluginbase.h \ $(NULL) -if HAVE_XPIDL -nsISpicec.h: nsISpicec.idl - $(AM_V_GEN)$(XPIDL) -m header -I $(SDK_INCLUDE_DIR) $< - -nsISpicec.xpt: nsISpicec.idl - $(AM_V_GEN)$(XPIDL) -m typelib -I $(SDK_INCLUDE_DIR) $< -else nsISpicec.h: nsISpicec.idl $(AM_V_GEN)$(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/header.py --cachedir . -I $(SDK_INCLUDE_DIR) $< -o $@ nsISpicec.xpt: nsISpicec.idl $(AM_V_GEN)$(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/typelib.py --cachedir . -I $(SDK_INCLUDE_DIR) $< -o $@ -endif BUILT_SOURCES = \ nsISpicec.h \ diff --git a/configure.ac b/configure.ac index 67e51e7..fa7a253 100644 --- a/configure.ac +++ b/configure.ac @@ -31,16 +31,6 @@ AC_SUBST(GLIB_LIBS) PKG_CHECK_MODULES(XUL, libxul-embedding >= 10) AC_SUBST(XUL_CFLAGS) AC_SUBST(XUL_LIBS) -# Find xpidl -XPIDL=`pkg-config --variable=libdir libxul`/xpidl -AM_CONDITIONAL([HAVE_XPIDL], [test -x "$XPIDL"]) -AC_SUBST(XPIDL) - -if ! test -x "$XPIDL"; then - AM_PATH_PYTHON - AC_CHECK_FILE([`pkg-config --variable=sdkdir libxul`/sdk/bin/header.py]) - AC_CHECK_FILE([`pkg-config --variable=sdkdir libxul`/sdk/bin/typelib.py]) -fi XUL_INCLUDEDIR=`pkg-config --variable=includedir libxul` XUL_IDLDIR=`pkg-config --variable=idldir libxul` @@ -72,7 +62,6 @@ AC_MSG_NOTICE([ prefix: ${prefix} compiler: ${CC} - xpidl: ${XPIDL} XUL includes: ${XUL_INCLUDEDIR} XUL IDL files: ${XUL_IDLDIR} Build test page generator: ${enable_generator} |