* configure.in: Add check for libio. Only enable versioning if we

found libio.

2 files changed, 27 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 46f33200..33a700d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-20  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.in: Add check for libio.  Only enable versioning if we
+	found libio.
+
 2000-03-27  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* configure.in (VERSIONING): New check for ld --version-script.
diff --git a/configure.in b/configure.in
index ed80813a..c0c8de61 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION([$Id: configure.in,v 1.18 2000/03/27 18:20:47 roland Exp $])
+AC_REVISION([$Id: configure.in,v 1.19 2000/05/25 20:23:28 kettenis Exp $])
 AC_PREREQ(2.12)			dnl Minimum Autoconf version required.
 AC_INIT(hurd/hurd_types.h)	dnl A distinctive file to look for in srcdir.
 
@@ -93,7 +93,27 @@ else
   hurd_cv_ld_version_script_option=no
 fi
 rm -f conftest*])
-VERSIONING=$hurd_cv_ld_version_script_option
+
+# See if libc was built with --enable-libio.
+AC_CACHE_CHECK([for libio],
+  hurd_cv_libio,
+  AC_TRY_COMPILE([#include <stdio.h>
+#ifndef _STDIO_USES_IOSTREAM
+# error No libio found.
+#endif],,
+    hurd_cv_libio=yes,
+    hurd_cv_libio=no))
+
+# The versions of the symbols in libthreads have to match those in
+# libc.so.  Since the symbols in a libc that includes libio will be
+# versioned differently from the ones in a libc that uses stdio, this
+# isn't easy to accomplish.  Instead we leave things unversioned if
+# libio isn't found.
+if test $hurd_cv_libio = yes; then
+  VERSIONING=$hurd_cv_ld_version_script_option
+else
+  VERSIONING=no
+fi
 AC_SUBST(VERSIONING)