Update.

1998-09-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* scripts/test-installation.pl (installation_problem): Don't link
	the test program against libdb1.

diff --git a/ChangeLog b/ChangeLog
index 9b4aeba..3ba61e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-09-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+       * scripts/test-installation.pl (installation_problem): Don't link
+       the test program against libdb1.
+
 1998-09-23 13:52  Ulrich Drepper  <drepper@cygnus.com>
 
        * Makeconfig (all-subdirs): Add db.

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f8e72b4..a17976b 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,7 +1,6 @@
 1998-09-23  Ulrich Drepper  <drepper@cygnus.com>
 
-       * Makefile [no install_root] (LOCALEDEF): Run localedef using just
-       built ld.so.
+       * Makefile: Rewrite install-locales rule.
 
 1998-06-15  Ulrich Drepper  <drepper@cygnus.com>
 

diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index 4b17338..a0e824e 100755 (executable)
--- a/scripts/test-installation.pl
+++ b/scripts/test-installation.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 1997 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997.
 
@@ -56,7 +56,7 @@ arglist: while (@ARGV) {
       $ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" ||
       $ARGV[0] eq "--versio" || $ARGV[0] eq "--version") {
     print "test-installation (GNU $PACKAGE)\n";
-    print "Copyright (C) 1997 Free Software Foundation, Inc.\n";
+    print "Copyright (C) 1997, 1998 Free Software Foundation, Inc.\n";
     print "This is free software; see the source for copying conditions.  There is NO\n";
     print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
     print "Written by Andreas Jaeger <aj\@arthur.rhein-neckar.de>\n";
@@ -101,7 +101,10 @@ while (<SOVERSIONS>) {
   chop;
   if (/^lib/) {
     ($name, $version)= /^lib(.*)\.so-version=\.(.*)$/;
-    if ($name ne "nss_ldap") {
+    # Filter out some libraries we don't want to link:
+    # - nss_ldap since it's not yet available
+    # - libdb1 since it conflicts with libdb
+    if ($name ne "nss_ldap" && $name ne "db1") {
       $link_libs .= " -l$name";
       $versions{$name} = $version;
     }