changeset in /hg/icedtea6: 2008-03-04 Lillian Angel <langel at re...

[Lillian Angel]

changeset d5f9253d01b9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d5f9253d01b9
description:
	2008-03-04  Lillian Angel  <langel at redhat.com>

	        * configure.ac: Changed to look for libxul instead of libxul-unstable.
	        * configure: Regenerated.

diffstat:

3 files changed, 14 insertions(+), 9 deletions(-)
ChangeLog    |    5 +++++
configure    |   16 ++++++++--------
configure.ac |    2 +-

diffs (71 lines):

diff -r c52771aeffc6 -r d5f9253d01b9 ChangeLog
--- a/ChangeLog	Tue Mar 04 08:42:21 2008 -0500
+++ b/ChangeLog	Tue Mar 04 11:51:01 2008 -0500
@@ -1,3 +1,8 @@ 2008-03-04  Matthias Klose  <doko at ubuntu
+2008-03-04  Lillian Angel  <langel at redhat.com>
+
+	* configure.ac: Changed to look for libxul instead of libxul-unstable.
+	* configure: Regenerated.
+
 2008-03-04  Matthias Klose  <doko at ubuntu.com>
 
 	* configure.ac: Check for xulrunner-1.9.
diff -r c52771aeffc6 -r d5f9253d01b9 configure
--- a/configure	Tue Mar 04 08:42:21 2008 -0500
+++ b/configure	Tue Mar 04 11:51:01 2008 -0500
@@ -9338,12 +9338,12 @@ 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
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin libxul\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-plugin libxul") 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`
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin libxul" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -9356,12 +9356,12 @@ if test -n "$PKG_CONFIG"; 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
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin libxul\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-plugin libxul") 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`
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin libxul" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -9380,9 +9380,9 @@ 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"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-plugin libxul"`
         else
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin libxul-unstable"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin libxul"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZILLA_PKG_ERRORS" >&5
diff -r c52771aeffc6 -r d5f9253d01b9 configure.ac
--- a/configure.ac	Tue Mar 04 08:42:21 2008 -0500
+++ b/configure.ac	Tue Mar 04 11:51:01 2008 -0500
@@ -243,7 +243,7 @@ AC_SUBST(ALSA_LIBS)
 
 dnl Check for plugin support headers and libraries.
 if test "$ENABLE_PLUGIN" = "yes"; then
-PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], \
+PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul, [MOZILLA_FOUND=yes], \
   [MOZILLA_FOUND=no])
 if test "x${MOZILLA_FOUND}" = xno
 then