From 5a3a2567e941489d91cccc8b728b1416b8ffd12b Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Thu, 2 Oct 1997 13:39:40 -0400
Subject: [PATCH] [multiple changes]

Thu Oct  2 10:36:49 1997  Jason Merrill  <jason@yorick.cygnus.com>

	* gen-params: Fix __printf_fp test.
	* config/linuxlibc1.mt (gxx_includedir): Don't define.

Thu Oct  2 10:36:26 1997  Ulrich Drepper  <drepper@rtl.cygnus.com>

	* config/linuxlibc1.mt (_G_CONFIG_H): Don't define.
	* gen-params: Add test for __printf_fp.

Getting closer...

From-SVN: r15833
---
 libio/ChangeLog            | 12 +++++++++++-
 libio/config/linuxlibc1.mt |  7 -------
 libio/gen-params           | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/libio/ChangeLog b/libio/ChangeLog
index 557efbd65a3e..803adfcfcd0d 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct  2 10:36:49 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* gen-params: Fix __printf_fp test.
+	* config/linuxlibc1.mt (gxx_includedir): Don't define.
+
+Thu Oct  2 10:36:26 1997  Ulrich Drepper  <drepper@rtl.cygnus.com>
+
+	* config/linuxlibc1.mt (_G_CONFIG_H): Don't define.
+	* gen-params: Add test for __printf_fp.
+
 Sun Sep 28 12:09:04 1997  Mark Mitchell  <mmitchell@usa.net>
 
         * iomanip.h: Use new friend <> syntax.
@@ -6,7 +16,7 @@ Sun Sep 28 12:04:21 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* libio.h: Don't use _IO_LOCK_T if it's not defined.
 
-Fri Sep 26 20:56:41 1997  Ulrich Drepper  <drepper@rtl.cygnus.com>
+Fri Sep 26 20:56:41 1997  
 
 	Based on a patch by H.J. Lu  (hjl@gnu.ai.mit.edu).
 
diff --git a/libio/config/linuxlibc1.mt b/libio/config/linuxlibc1.mt
index 1f22b4a0dc84..eaed5dabf088 100644
--- a/libio/config/linuxlibc1.mt
+++ b/libio/config/linuxlibc1.mt
@@ -1,17 +1,10 @@
 # Use the libio which comes with the local libc.
 
-# That is where we keep the g++ header files.
-gxx_includedir =$(prefix)/include/g++
-
 # Comment this out to avoid including the stdio functions in libiostream.a:
 # LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS)
 # LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stdio.list
 # LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list`
 
-# Comment the above and uncomment the below to use the code in the Linux libc:
-# We have _G_config.h in /usr/include.
-_G_CONFIG_H=
-
 # We must not see the libio.h file from this library.
 LIBIO_INCLUDE=
 
diff --git a/libio/gen-params b/libio/gen-params
index ef417e73544f..c6eb7d30fd8c 100755
--- a/libio/gen-params
+++ b/libio/gen-params
@@ -692,6 +692,22 @@ if test -n "${USE_INT32_FLAGS}" ; then
     echo "#define ${macro_prefix}USE_INT32_FLAGS 1"
 fi
 
+# A little test program to check if __printf_fp is available.
+cat >dummy.c <<EOF
+int main()
+{
+    return __printf_fp ();
+}
+EOF
+
+if ${CC} dummy.c >/dev/null 2>&1 ; then
+  echo "#define ${macro_prefix}HAVE_PRINTF_FP 1"
+  echo "#define ${macro_prefix}HAVE_LONG_DOUBLE_IO 1"
+else
+  echo "#define ${macro_prefix}HAVE_PRINTF_FP 0"
+  echo "#define ${macro_prefix}HAVE_LONG_DOUBLE_IO 0"
+fi
+
 # Uncomment the following line if you don't have working templates.
 # echo "#define ${macro_prefix}NO_TEMPLATES"