Mercurial > hg > release > icedtea6-1.5
changeset 1554:a4fb20bcfb03
From icedtea6 trunk.
2009-05-18 Robert Schuster <robertschuster@fsfe.org>
* configure.ac: Make xulrunner compilation check optional.
| author | Robert Schuster <robertschuster@fsfe.org> |
|---|---|
| date | Tue, 19 May 2009 16:14:36 +0200 |
| parents | 862fbdec414a |
| children | 21ec4087c33d |
| files | ChangeLog configure.ac |
| diffstat | 2 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 19 16:12:36 2009 +0200 +++ b/ChangeLog Tue May 19 16:14:36 2009 +0200 @@ -1,3 +1,7 @@ +2009-05-18 Robert Schuster <robertschuster@fsfe.org> + + * configure.ac: Make xulrunner compilation check optional. + 2009-05-18 Robert Schuster <robertschuster@fsfe.org> * Makefile.am: Corrected quoting of cross-compilation Makefile arguments.
--- a/configure.ac Tue May 19 16:12:36 2009 +0200 +++ b/configure.ac Tue May 19 16:14:36 2009 +0200 @@ -491,13 +491,15 @@ AC_SUBST(GTK_LIBS) fi -AC_LANG_PUSH([C++]) -OLDCPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" +if test "x${enable_plugin}" = "xyes" -o "x${enable_npplugin}" = "xyes" +then + AC_LANG_PUSH([C++]) + OLDCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" -AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ + AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ #include <mozilla-config.h> #include <math.h> #include <string.h> @@ -534,11 +536,11 @@ [AC_MSG_FAILURE([cannot determine xulrunner version])])], [xulrunner_cv_collapsed_version="190000"]) -CPPFLAGS="$OLDCPPFLAGS" -AC_LANG_POP([C++]) + CPPFLAGS="$OLDCPPFLAGS" + AC_LANG_POP([C++]) -AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) - + AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version) +fi AC_MSG_CHECKING(for --with-additional-vms) AC_ARG_WITH(additional-vms,