changeset in /hg/icedtea: 2008-03-04 Matthias Klose <doko at ubun...

[Lillian Angel]

changeset 6e1c977fc81c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6e1c977fc81c
description:
	2008-03-04  Matthias Klose  <doko at ubuntu.com>

	        * configure.ac: Check for xulrunner-1.9.
	        * configure: Regenerated.

diffstat:

3 files changed, 86 insertions(+), 1 deletion(-)
ChangeLog    |    5 +++
configure    |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac |    7 ++++-

diffs (115 lines):

diff -r 577355a656ac -r 6e1c977fc81c ChangeLog
--- a/ChangeLog	Tue Mar 04 08:38:44 2008 -0500
+++ b/ChangeLog	Tue Mar 04 08:42:21 2008 -0500
@@ -1,3 +1,8 @@ 2008-03-04  Lillian Angel  <langel at redha
+2008-03-04  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: Check for xulrunner-1.9.
+	* configure: Regenerated.
+
 2008-03-04  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-lesstif-64.patch: Reverted.
diff -r 577355a656ac -r 6e1c977fc81c configure
--- a/configure	Tue Mar 04 08:38:44 2008 -0500
+++ b/configure	Tue Mar 04 08:42:21 2008 -0500
@@ -9380,6 +9380,81 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin libxul-unstable\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-plugin libxul-unstable") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin libxul-unstable" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$MOZILLA_LIBS"; then
+        pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin libxul-unstable\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-plugin libxul-unstable") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin libxul-unstable" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-plugin libxul-unstable"`
+        else
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin libxul-unstable"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$MOZILLA_PKG_ERRORS" >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                MOZILLA_FOUND=no
+elif test $pkg_failed = untried; then
+	MOZILLA_FOUND=no
+else
+	MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
+	MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	\
+    MOZILLA_FOUND=yes
+fi
+fi
+if test "x${MOZILLA_FOUND}" = xno
+then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for MOZILLA" >&5
+echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$MOZILLA_CFLAGS"; then
+        pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
   ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
   ac_status=$?
diff -r 577355a656ac -r 6e1c977fc81c configure.ac
--- a/configure.ac	Tue Mar 04 08:38:44 2008 -0500
+++ b/configure.ac	Tue Mar 04 08:42:21 2008 -0500
@@ -244,8 +244,13 @@ AC_SUBST(ALSA_LIBS)
 
 dnl Check for plugin support headers and libraries.
 if test "$ENABLE_PLUGIN" = "yes"; then
-PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], \
+PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], \
   [MOZILLA_FOUND=no])
+if test "x${MOZILLA_FOUND}" = xno
+then
+  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, \
+    [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+fi
 if test "x${MOZILLA_FOUND}" = xno
 then
   PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, \