Mercurial > hg > release > icedtea-1.9
changeset 732:b351056c0169
2008-02-15 Lillian Angel <langel@redhat.com>
* configure.ac: Added conditional check for libffi.
* configure: Regenerated.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Fri, 15 Feb 2008 16:05:51 -0500 |
parents | aa2f62fb69db |
children | 1ea2191a666f |
files | ChangeLog configure configure.ac |
diffstat | 3 files changed, 142 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 15 15:56:51 2008 -0500 +++ b/ChangeLog Fri Feb 15 16:05:51 2008 -0500 @@ -1,3 +1,16 @@ +2008-02-15 Lillian Angel <langel@redhat.com> + + * configure.ac: Added conditional check for libffi. + * configure: Regenerated. + +2008-02-15 Lillian Angel <langel@redhat.com> + + * INSTALL: Updated + * Makefile.am: Added new patch. + * Makefile.in: Regenerated. + * patches/icedtea-version.patch: Fixed + * patches/icedtea-lesstif-64.patch: New patch. + 2008-02-15 Lillian Angel <langel@redhat.com> * configure.ac: Updated version.
--- a/configure Fri Feb 15 15:56:51 2008 -0500 +++ b/configure Fri Feb 15 16:05:51 2008 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea 1.6. +# Generated by GNU Autoconf 2.61 for icedtea6 1.0. # # Report bugs to <fitzsim@redhat.com>. # @@ -572,10 +572,10 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='icedtea' -PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='icedtea 1.6' +PACKAGE_NAME='icedtea6' +PACKAGE_TARNAME='icedtea6' +PACKAGE_VERSION='1.0' +PACKAGE_STRING='icedtea6 1.0' PACKAGE_BUGREPORT='fitzsim@redhat.com' ac_default_prefix=bootstrap @@ -774,6 +774,8 @@ GLIB_LIBS GTK_CFLAGS GTK_LIBS +LIBFFI_CFLAGS +LIBFFI_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -813,7 +815,9 @@ GLIB_CFLAGS GLIB_LIBS GTK_CFLAGS -GTK_LIBS' +GTK_LIBS +LIBFFI_CFLAGS +LIBFFI_LIBS' # Initialize some variables set by options. @@ -1316,7 +1320,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea 1.6 to adapt to many kinds of systems. +\`configure' configures icedtea6 1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1364,7 +1368,7 @@ --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/icedtea] + --docdir=DIR documentation root [DATAROOTDIR/doc/icedtea6] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1386,7 +1390,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea 1.6:";; + short | recursive ) echo "Configuration of icedtea6 1.0:";; esac cat <<\_ACEOF @@ -1468,6 +1472,9 @@ GLIB_LIBS linker flags for GLIB, overriding pkg-config GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config + LIBFFI_CFLAGS + C compiler flags for LIBFFI, overriding pkg-config + LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1533,7 +1540,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea configure 1.6 +icedtea6 configure 1.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1547,7 +1554,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea $as_me 1.6, which was +It was created by icedtea6 $as_me 1.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2236,8 +2243,8 @@ # Define the identity of the package. - PACKAGE='icedtea' - VERSION='1.6' + PACKAGE='icedtea6' + VERSION='1.0' cat >>confdefs.h <<_ACEOF @@ -9968,6 +9975,94 @@ fi +case "$build" in + *ppc*) + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for LIBFFI" >&5 +echo $ECHO_N "checking for LIBFFI... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBFFI_CFLAGS"; then + pkg_cv_LIBFFI_CFLAGS="$LIBFFI_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi\"") >&5 + ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$LIBFFI_LIBS"; then + pkg_cv_LIBFFI_LIBS="$LIBFFI_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi\"") >&5 + ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 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 + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libffi"` + else + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libffi"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBFFI_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + LIBFFI_FOUND=no +elif test $pkg_failed = untried; then + LIBFFI_FOUND=no +else + LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS + LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + LIBFFI_FOUND=yes +fi + if test "x${LIBFFI_FOUND}" = xno + then + { { echo "$as_me:$LINENO: error: Could not find libffi headers - \ + Try installing libffi-devel." >&5 +echo "$as_me: error: Could not find libffi headers - \ + Try installing libffi-devel." >&2;} + { (exit 1); exit 1; }; } + fi + + + ;; + *i*86*) + ;; +esac + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -10513,7 +10608,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea $as_me 1.6, which was +This file was extended by icedtea6 $as_me 1.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10560,7 +10655,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea config.status 1.6 +icedtea6 config.status 1.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -10930,11 +11025,13 @@ GLIB_LIBS!$GLIB_LIBS$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim GTK_LIBS!$GTK_LIBS$ac_delim +LIBFFI_CFLAGS!$LIBFFI_CFLAGS$ac_delim +LIBFFI_LIBS!$LIBFFI_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac Fri Feb 15 15:56:51 2008 -0500 +++ b/configure.ac Fri Feb 15 16:05:51 2008 -0500 @@ -285,4 +285,20 @@ AC_SUBST(GTK_LIBS) fi +case "$build" in + *ppc*) + dnl Check for libffi headers and libraries. + PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no]) + if test "x${LIBFFI_FOUND}" = xno + then + AC_MSG_ERROR([Could not find libffi headers - \ + Try installing libffi-devel.]) + fi + AC_SUBST(LIBFFI_CFLAGS) + AC_SUBST(LIBFFI_LIBS) + ;; + *i*86*) + ;; +esac + AC_OUTPUT