/hg/icedtea6: 2010-04-08 Matthias Klose <doko at ubuntu.com>

[Andrew John Hughes]

On 8 April 2010 18:01,  <doko at icedtea.classpath.org> wrote:
> changeset a3cfc302306d in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a3cfc302306d
> author: doko at ubuntu.com
> date: Thu Apr 08 18:35:34 2010 +0200
>
>        2010-04-08 Matthias Klose <doko at ubuntu.com>
>
>         * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-
>        debug.stamp): Always install nss.cfg.
>                * configure.ac: Always make nss.cfg a config file, always
>        substitute NSS_LIBDIR.
>
>
> diffstat:
>
> 3 files changed, 24 insertions(+), 6 deletions(-)
> ChangeLog    |    7 +++++++
> Makefile.am  |    4 ----
> configure.ac |   19 +++++++++++++++++--
>
> diffs (76 lines):
>
> diff -r 918671af194a -r a3cfc302306d ChangeLog
> --- a/ChangeLog Thu Apr 08 14:25:13 2010 +0100
> +++ b/ChangeLog Thu Apr 08 18:35:34 2010 +0200
> @@ -1,3 +1,10 @@ 2010-04-08  Andrew John Hughes  <ahughes
> +2010-04-08  Matthias Klose  <doko at ubuntu.com>
> +
> +       * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
> +       Always install nss.cfg.
> +       * configure.ac: Always make nss.cfg a config file, always
> +       substitute NSS_LIBDIR.
> +
>  2010-04-08  Andrew John Hughes  <ahughes at redhat.com>
>
>        * Makefile.am: Remove remaining references to
> diff -r 918671af194a -r a3cfc302306d Makefile.am
> --- a/Makefile.am       Thu Apr 08 14:25:13 2010 +0100
> +++ b/Makefile.am       Thu Apr 08 18:35:34 2010 +0200
> @@ -1345,10 +1345,8 @@ if ENABLE_SYSTEMTAP
>        cp $(abs_top_builddir)/tapset/jstack.stp \
>          $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
>  endif
> -if ENABLE_NSS
>        cp $(abs_top_builddir)/nss.cfg \
>          $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
> -endif
>  if WITH_TZDATA_DIR
>        cp $(abs_top_builddir)/tz.properties \
>          $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
> @@ -1437,10 +1435,8 @@ if ENABLE_SYSTEMTAP
>        cp $(abs_top_builddir)/tapset/jstack.stp \
>          $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp
>  endif
> -if ENABLE_NSS
>        cp $(abs_top_builddir)/nss.cfg \
>          $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security;
> -endif
>  if WITH_TZDATA_DIR
>        cp $(abs_top_builddir)/tz.properties \
>          $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib;
> diff -r 918671af194a -r a3cfc302306d configure.ac
> --- a/configure.ac      Thu Apr 08 14:25:13 2010 +0100
> +++ b/configure.ac      Thu Apr 08 18:35:34 2010 +0200
> @@ -37,6 +37,7 @@ if test "x$FASTJAR" = x; then
>        AC_MSG_ERROR([Can't find fastjar or jar])
>  fi
>  AC_SUBST([FASTJAR])
> +AC_CHECK_TOOL([LDD], [ldd])
>  dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
>  dnl check for it explicitly rather than using AC_PROG_AWK.
>  FIND_TOOL([GAWK], [gawk])
> @@ -415,9 +416,23 @@ then
>     AC_MSG_ERROR([Could not find NSS.  Either install it or configure using --disable-nss.])
>   fi
>   NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss`
> -  AC_SUBST(NSS_LIBDIR)
> -  AC_CONFIG_FILES([nss.cfg])
> +else
> +  dnl set it to the system library directory
> +  if test "x$LDD" = x; then
> +    NSS_LIBDIR=/usr/lib
> +  else
> +    AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
> +    $CC conftest.c
> +    syslibdir=`$LDD a.out | sed -n '/libc\.so./s,.*=> */\(@<:@^/@:>@*\)/.*,\1,p'`
> +    rm -f a.out
> +    case x${syslibdir} in
> +      xlib|xlib64|xlib32|xlibn32) NSS_LIBDIR=/usr/${syslibdir};;
> +      *) NSS_LIBDIR=/usr/lib
> +    esac
> +  fi
>  fi
> +AC_SUBST(NSS_LIBDIR)
> +AC_CONFIG_FILES([nss.cfg])
>
>  if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then
>   dnl Check for libffi headers and libraries.
>

Why have you committed this without first reading my reply???
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8