From d17e960c2bb10746bda675deb88d8b496f834eba Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Tue, 17 Oct 1995 01:08:25 +0000
Subject: * elf/Makefile (install-others): Add missing slash.

	* elf/ldd.sh.in: Prepend `./' to relative file names so ld.so
	won't search LD_LIBRARY_PATH.
---
 configure | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 724725bce2..08609a496e 100755
--- a/configure
+++ b/configure
@@ -26,6 +26,8 @@ ac_help="$ac_help
   --with-elf		  if using the ELF object format"
 ac_help="$ac_help
   --with-weak-symbols	  if weak symbols are available in as and ld"
+ac_help="$ac_help
+  --enable-libio          build in GNU libio instead of GNU stdio"
 ac_help="$ac_help
   --enable-shared         build shared library [default=yes if GNU ld & ELF]"
 ac_help="$ac_help
@@ -607,6 +609,15 @@ else
 fi
 
 
+# Check whether --enable-libio or --disable-libio was given.
+if test "${enable_libio+set}" = set; then
+  enableval="$enable_libio"
+  stdio=libio
+else
+  stdio=stdio
+fi
+
+
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -632,6 +643,16 @@ else
 fi
 
 
+echo $ac_n "checking stdio selection""... $ac_c" 1>&4
+
+if test $stdio = libio; then
+  cat >> confdefs.h <<\EOF
+#define USE_IN_LIBIO 1
+EOF
+
+fi
+echo "$ac_t""$stdio" 1>&4
+
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1112,7 +1133,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1116 "configure"
+#line 1137 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1126,7 +1147,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1130 "configure"
+#line 1151 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1180,7 +1201,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1184 "configure"
+#line 1205 "configure"
 #include "confdefs.h"
 #define __need_size_t
 #define __need_wchar_t
@@ -1303,7 +1324,7 @@ if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1307 "configure"
+#line 1328 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1438,7 +1459,6 @@ fi
 
 
 
-
 if test "`(cd $srcdir; pwd)`" = "`pwd`"; then
   config_makefile=
 else
@@ -1560,6 +1580,7 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@stdio@%$stdio%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
-- 
cgit 1.4.1