changeset in /hg/icedtea6: 2009-05-18 Robert Schuster <roberts...

[Robert Schuster]

changeset 723f9a6a6379 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=723f9a6a6379
description:
	2009-05-18  Robert Schuster  <robertschuster at fsfe.org>

	    * configure.ac: Make xulrunner compilation check optional.

diffstat:

2 files changed, 18 insertions(+), 12 deletions(-)
ChangeLog    |    4 ++++
configure.ac |   26 ++++++++++++++------------

diffs (54 lines):

diff -r ea3bc7968a1c -r 723f9a6a6379 ChangeLog
--- a/ChangeLog	Tue May 19 15:08:12 2009 +0200
+++ b/ChangeLog	Tue May 19 16:13:30 2009 +0200
@@ -1,3 +1,7 @@ 2009-05-18  Robert Schuster  <robertschu
+2009-05-18  Robert Schuster  <robertschuster at fsfe.org>
+
+	* configure.ac: Make xulrunner compilation check optional.
+
 2009-05-18  Robert Schuster  <robertschuster at fsfe.org>
 
 	* Makefile.am: Corrected quoting of cross-compilation Makefile arguments.
diff -r ea3bc7968a1c -r 723f9a6a6379 configure.ac
--- a/configure.ac	Tue May 19 15:08:12 2009 +0200
+++ b/configure.ac	Tue May 19 16:13:30 2009 +0200
@@ -491,13 +491,15 @@ if test "x${enable_npplugin}" = "xyes"
     AC_SUBST(GTK_LIBS)
   fi
 
-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([[
+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([[
 #include <mozilla-config.h>
 #include <math.h>
 #include <string.h>
@@ -534,11 +536,11 @@ return EXIT_SUCCESS;
     [AC_MSG_FAILURE([cannot determine xulrunner version])])],
   [xulrunner_cv_collapsed_version="190000"])
 
-CPPFLAGS="$OLDCPPFLAGS"
-AC_LANG_POP([C++])
-
-AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
-
+  CPPFLAGS="$OLDCPPFLAGS"
+  AC_LANG_POP([C++])
+
+  AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
+fi
 
 AC_MSG_CHECKING(for --with-additional-vms)
 AC_ARG_WITH(additional-vms,