diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-26 19:14:13 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-26 19:14:13 +0100 |
| commit | a234f6d223d43a2a90c5bec8036fd5f050640aab (patch) | |
| tree | def27d73afc6919cb08eed68d04760722261a66e /configure.ac | |
| parent | 7d747cae9cc7f2ab6bd137282b70a171e4034c4e (diff) | |
build: fix build on both rhel6/<f16 and f16
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 46dc6c2..061ea56 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT(spice-xpi, [2.6], [], spice-xpi) +AC_INIT(spice-xpi, [2.7], [], spice-xpi) AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER([config.h]) @@ -47,16 +47,16 @@ AC_SUBST(XUL_CFLAGS) AC_SUBST(XUL_LIBS) # Find xpidl -for i in `pkg-config --variable=libdir libxul`/xpidl ; do - if test -x $i ; then - XPIDL=$i - fi -done -if test x"XPIDL" = x ; then - AC_MSG_ERROR([Can't find xpidl based on libxulrunner .pc file]) -fi +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` AC_SUBST(XUL_INCLUDEDIR) @@ -68,9 +68,8 @@ PKG_CHECK_MODULES(XUL191, have_xul191=yes, have_xul191=no) -AM_CONDITIONAL([HAVE_XUL191], [test "x$have_xul191" = "xyes"]) if test "x$have_xul191" = "xyes" ; then - AC_DEFINE([HAVE_XUL191], [], [Define if we have libxul >= 1.9.1]) + AC_DEFINE([HAVE_XUL191], [1], [Define if we have libxul >= 1.9.1]) fi m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) |