about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--iconvdata/Makefile8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a21e27ce0e..be0241190e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-18  Andreas Jaeger  <aj@suse.de>
+
+	* iconvdata/Makefile: Only run tests when shared libs are
+	available.
+
 2002-03-17  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/mips/fpu/fraiseexcpt.c (__feraiseexcept): Set cause bits.
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 9817a638b6..bdbee356ac 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -54,11 +54,13 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 
 modules.so := $(addsuffix .so, $(modules))
 
+include ../Makeconfig
+
+ifeq (yes,$(build-shared))
 tests = bug-iconv1 bug-iconv2 tst-loading
 
 test-srcs := tst-table-from tst-table-to
-
-include ../Makeconfig
+endif
 
 libJIS-routines := jis0201 jis0208 jis0212
 libKSC-routines := ksc5601