Mercurial > hg > release > icedtea-1.9
changeset 758:c52771aeffc6
2008-03-04 Matthias Klose <doko@ubuntu.com>
* configure.ac: Check for xulrunner-1.9.
* configure: Regenerated.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Tue, 04 Mar 2008 08:42:21 -0500 |
| parents | 7a49207c4a52 |
| children | d5f9253d01b9 |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 91 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 Matthias Klose <doko@ubuntu.com> + + * configure.ac: Check for xulrunner-1.9. + * configure: Regenerated. + 2008-03-04 Lillian Angel <langel@redhat.com> * patches/icedtea-lesstif-64.patch: Reverted.
--- a/configure Tue Mar 04 08:38:44 2008 -0500 +++ b/configure Tue Mar 04 08:42:21 2008 -0500 @@ -9338,6 +9338,81 @@ 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 +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=$? @@ -9389,17 +9464,17 @@ { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - \ - MOZILLA_FOUND=no + MOZILLA_FOUND=no elif test $pkg_failed = untried; then - \ - MOZILLA_FOUND=no + 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 + \ + MOZILLA_FOUND=yes +fi fi if test "x${MOZILLA_FOUND}" = xno then
--- a/configure.ac Tue Mar 04 08:38:44 2008 -0500 +++ b/configure.ac Tue Mar 04 08:42:21 2008 -0500 @@ -243,10 +243,15 @@ 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, \ [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) fi