Mercurial > hg > release > icedtea6-1.6
changeset 738:0b246c403c1d cacao
2008-03-04 Lillian Angel <langel@redhat.com>
* configure.ac: Changed to look for libxul instead of libxul-unstable.
* configure: Regenerated.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Tue, 04 Mar 2008 11:51:01 -0500 |
| parents | 6e1c977fc81c |
| children | df160eda16eb |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 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 08:42:21 2008 -0500 +++ b/configure Tue Mar 04 11:51:01 2008 -0500 @@ -9380,12 +9380,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-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 @@ -9398,12 +9398,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-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 @@ -9422,9 +9422,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-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
--- a/configure.ac Tue Mar 04 08:42:21 2008 -0500 +++ b/configure.ac Tue Mar 04 11:51:01 2008 -0500 @@ -244,7 +244,7 @@ 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