...
 
Commits (2)
...@@ -125,7 +125,18 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-2.0 >= 2.30.0]) ...@@ -125,7 +125,18 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-2.0 >= 2.30.0])
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
PKG_CHECK_MODULES(LIBJS, [mozjs185]) AC_ARG_WITH(mozjs, AS_HELP_STRING([--with-mozjs=@<:@mozjs185/mozjs-17.0|auto@:>@],
[Specify version of Spidermonkey to use]),,
with_mozjs=auto)
AS_IF([test x${with_mozjs} != xauto], [
PKG_CHECK_MODULES(LIBJS, ${with_mozjs})
], [
PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no)
AS_IF([test x${have_mozjs185} = xno], [
PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes,
[AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])])
])
])
AC_SUBST(LIBJS_CFLAGS) AC_SUBST(LIBJS_CFLAGS)
AC_SUBST(LIBJS_LIBS) AC_SUBST(LIBJS_LIBS)
......
...@@ -54,13 +54,12 @@ libpolkit_backend_1_la_CFLAGS = \ ...@@ -54,13 +54,12 @@ libpolkit_backend_1_la_CFLAGS = \
$(LIBJS_CFLAGS) \ $(LIBJS_CFLAGS) \
$(NULL) $(NULL)
# Note: We don't include $(LIBJS_LIBS) here since it's dlopen()'ed in polkitbackendjsauthority.c
#
libpolkit_backend_1_la_LIBADD = \ libpolkit_backend_1_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(LIBSYSTEMD_LOGIN_LIBS) \ $(LIBSYSTEMD_LOGIN_LIBS) \
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \ $(top_builddir)/src/polkit/libpolkit-gobject-1.la \
$(EXPAT_LIBS) \ $(EXPAT_LIBS) \
$(LIBJS_LIBS) \
$(NULL) $(NULL)
rulesdir = $(sysconfdir)/polkit-1/rules.d rulesdir = $(sysconfdir)/polkit-1/rules.d
......