packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Also make gjs-based tests conditional on introspection support 

Since they use imports.gi.OSTree.
This commit is contained in:
Colin Walters 2013-10-11 11:50:15 -04:00
parent 3b31f2b4d1
commit 2b37abf7b6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -79,7 +79,7 @@ AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
GOBJECT_INTROSPECTION_CHECK([1.34.0]) GOBJECT_INTROSPECTION_CHECK([1.34.0])
]) ])
AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test x$found_introspection = xyes) AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test "x$found_introspection" = xyes)
LIBGPGME_DEPENDENCY="1.1.8" LIBGPGME_DEPENDENCY="1.1.8"
@ -154,12 +154,14 @@ AS_IF([test "x$with_dracut" = "xyes"], [
]) ])
dnl for tests dnl for tests
AC_PATH_PROG(GJS, [gjs]) AS_IF([test "x$found_introspection" = xyes], [
if test -n "$GJS"; then AC_PATH_PROG(GJS, [gjs])
if test -n "$GJS"; then
have_gjs=yes have_gjs=yes
else else
have_gjs=no have_gjs=no
fi fi
], [have_gjs=no])
AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes) AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
AC_CONFIG_FILES([ AC_CONFIG_FILES([