aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile2
-rwxr-xr-xconfigure82
-rw-r--r--configure.in1
4 files changed, 51 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 93e7e65dc1..64f2113214 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
Sat Jul 22 01:56:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+ * Makefile (autoconf-it): Make it executable and unwritable.
+
+ * configure.in (sysnames): Under --enable-debug-configure, spew
+ potential sysnames.
+
* sysdeps/unix/i386/sysdep.h (JUMPTARGET): New macro; use name@PLT
#ifdef PIC.
(PSEUDO): Use JUMPTARGET(syscall_error) in jump insn.
diff --git a/Makefile b/Makefile
index e85be51cc0..139d20b361 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,9 @@ endif
all: lib others
define autoconf-it
+@-rm -f $@.new
autoconf $(ACFLAGS) $< > $@.new
+chmod a-w,a+x $@.new
mv -f $@.new $@
test ! -d CVS || cvs commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
endef
diff --git a/configure b/configure
index 466006bceb..3619897dcf 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
# From configure.in CVSid
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.3
+# Generated automatically using autoconf version 2.4
# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -237,7 +237,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.3"
+ echo "configure generated by autoconf version 2.4"
exit 0 ;;
-with-* | --with-*)
@@ -624,9 +624,9 @@ netbsd* | 386bsd* | freebsd* | bsdi*)
base_os=unix/bsd/bsd4.4 ;;
osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
base_os=unix/bsd ;;
-linux* | sysv* | isc* | esix* | sco* | minix* | irix4*)
+sysv* | isc* | esix* | sco* | minix* | irix4*)
base_os=unix/sysv ;;
-solaris[2-9]*)
+linux* | solaris[2-9]*)
base_os=unix/sysv/sysv4 ;;
none)
base_os=standalone ;;
@@ -677,6 +677,7 @@ for b in $base ''; do
for o in /$ostry ''; do
for m in $mach ''; do
try="$m0$b$v$o$m"
+ test -n "$enable_debug_configure" && echo "$0 DEBUG: try $try" >&2
if test -d $sysdep_dir$try; then
sysnames="$sysnames $try"
{ test -n "$o" || test -n "$b"; } && os_used=t
@@ -997,7 +998,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 1001 "configure"
+#line 1002 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
@@ -1011,7 +1012,7 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1015 "configure"
+#line 1016 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
@@ -1030,8 +1031,10 @@ fi
rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
fi
-CPP="$ac_cv_prog_CPP"
echo "$ac_t""$CPP" 1>&4
@@ -1063,7 +1066,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 1067 "configure"
+#line 1070 "configure"
#include "confdefs.h"
#define __need_size_t
#define __need_wchar_t
@@ -1118,14 +1121,44 @@ if test $libc_cv_need_minus_P = yes; then
asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
fi
+echo $ac_n "checking for assembler global-symbol directive""... $ac_c" 1>&4
+if eval "test \"`echo '$''{'libc_cv_asm_global_directive'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&4
+else
+ libc_cv_asm_global_directive=UNKNOWN
+for ac_globl in .globl .global; do
+ cat > conftest.s <<EOF
+.text
+${ac_globl} foo
+foo: .long 0
+EOF
+ if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then
+ libc_cv_asm_global_directive=${ac_globl}
+ fi
+ rm -f conftest*
+ test $libc_cv_asm_global_directive != UNKNOWN && break
+done
+fi
+
+echo "$ac_t""$libc_cv_asm_global_directive" 1>&4
+if test $libc_cv_asm_global_directive = UNKNOWN; then
+ { echo "configure: error: cannot determine asm global directive" 1>&2; exit 1; }
+else
+ cat >> confdefs.h <<EOF
+#define ASM_GLOBAL_DIRECTIVE ${libc_cv_asm_global_directive}
+EOF
+
+fi
+
echo $ac_n "checking for .set assembler directive""... $ac_c" 1>&4
if eval "test \"`echo '$''{'libc_cv_asm_set_directive'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&4
else
- cat > conftest.s <<\EOF
+ cat > conftest.s <<EOF
.text
foo: .long 0
.set glibc_conftest_frobozz,foo
+$libc_cv_asm_global_directive glibc_conftest_frobozz
EOF
# The alpha-dec-osf1 assembler gives only a warning for `.set'
# (but it doesn't work), so we must do a linking check to be sure.
@@ -1150,35 +1183,6 @@ EOF
fi
-echo $ac_n "checking for assembler global-symbol directive""... $ac_c" 1>&4
-if eval "test \"`echo '$''{'libc_cv_asm_global_directive'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
-else
- libc_cv_asm_global_directive=UNKNOWN
-for ac_globl in .globl .global; do
- cat > conftest.s <<EOF
-.text
-${ac_globl} foo
-foo: .long 0
-EOF
- if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then
- libc_cv_asm_global_directive=${ac_globl}
- fi
- rm -f conftest*
- test $libc_cv_asm_global_directive != UNKNOWN && break
-done
-fi
-
-echo "$ac_t""$libc_cv_asm_global_directive" 1>&4
-if test $libc_cv_asm_global_directive = UNKNOWN; then
- { echo "configure: error: cannot determine asm global directive" 1>&2; exit 1; }
-else
- cat >> confdefs.h <<EOF
-#define ASM_GLOBAL_DIRECTIVE ${libc_cv_asm_global_directive}
-EOF
-
-fi
-
# sysdeps configure fragments may set these with files to be linked below.
libc_link_dests=
@@ -1369,7 +1373,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.3"
+ echo "$CONFIG_STATUS generated by autoconf version 2.4"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
diff --git a/configure.in b/configure.in
index e1e794cce9..a35378ab37 100644
--- a/configure.in
+++ b/configure.in
@@ -166,6 +166,7 @@ for b in $base ''; do
for o in /$ostry ''; do
for m in $mach ''; do
try="$m0$b$v$o$m"
+ test -n "$enable_debug_configure" && echo "$0 [DEBUG]: try $try" >&2
if test -d $sysdep_dir$try; then
sysnames="$sysnames $try"
{ test -n "$o" || test -n "$b"; } && os_used=t