Mercurial > hg > release > icedtea-1.9
changeset 760:5e745cc5c151
Reverted last change
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Tue, 04 Mar 2008 13:03:02 -0500 |
parents | d5f9253d01b9 |
children | 38e6eb354632 |
files | ChangeLog configure configure.ac |
diffstat | 3 files changed, 9 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 04 11:51:01 2008 -0500 +++ b/ChangeLog Tue Mar 04 13:03:02 2008 -0500 @@ -1,8 +1,3 @@ -2008-03-04 Lillian Angel <langel@redhat.com> - - * configure.ac: Changed to look for libxul instead of libxul-unstable. - * configure: Regenerated. - 2008-03-04 Matthias Klose <doko@ubuntu.com> * configure.ac: Check for xulrunner-1.9.
--- a/configure Tue Mar 04 11:51:01 2008 -0500 +++ b/configure Tue Mar 04 13:03:02 2008 -0500 @@ -9338,12 +9338,12 @@ pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin libxul\"") >&5 - ($PKG_CONFIG --exists --print-errors "mozilla-plugin libxul") 2>&5 + { (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" 2>/dev/null` + pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin libxul-unstable" 2>/dev/null` else pkg_failed=yes fi @@ -9356,12 +9356,12 @@ pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin libxul\"") >&5 - ($PKG_CONFIG --exists --print-errors "mozilla-plugin libxul") 2>&5 + { (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" 2>/dev/null` + pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin libxul-unstable" 2>/dev/null` else pkg_failed=yes fi @@ -9380,9 +9380,9 @@ _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"` + 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"` + 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
--- a/configure.ac Tue Mar 04 11:51:01 2008 -0500 +++ b/configure.ac Tue Mar 04 13:03:02 2008 -0500 @@ -243,7 +243,7 @@ dnl Check for plugin support headers and libraries. if test "$ENABLE_PLUGIN" = "yes"; then -PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul, [MOZILLA_FOUND=yes], \ +PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], \ [MOZILLA_FOUND=no]) if test "x${MOZILLA_FOUND}" = xno then