Commit 4847e3f0 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents 1c8e352f 0cca0a78
2011-06-16 Miles Bader <miles@gnu.org>
* configure.in: Try to determine CRT_DIR automatically when
using gcc.
2011-06-15 Paul Eggert <eggert@cs.ucla.edu>
* lib/ftoastr.c, lib/stdio.in.h, lib/verify.h:
......
......@@ -81,11 +81,12 @@ AR = ar
ARFLAGS = cru
libgnu_a_AR = $(AR) $(ARFLAGS)
am__DEPENDENCIES_1 =
am__libgnu_a_SOURCES_DIST = allocator.c careadlinkat.c dtoastr.c \
gettext.h
am__libgnu_a_SOURCES_DIST = allocator.c careadlinkat.c md5.c sha1.c \
dtoastr.c filemode.c gettext.h strftime.c
am__objects_1 =
am_libgnu_a_OBJECTS = allocator.$(OBJEXT) careadlinkat.$(OBJEXT) \
dtoastr.$(OBJEXT) $(am__objects_1)
md5.$(OBJEXT) sha1.$(OBJEXT) dtoastr.$(OBJEXT) \
filemode.$(OBJEXT) $(am__objects_1) strftime.$(OBJEXT)
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
......@@ -733,15 +734,15 @@ BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) inttypes.h \
$(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \
stdlib.h sys/stat.h time.h unistd.h warn-on-use.h
EXTRA_DIST = allocator.h $(top_srcdir)/./arg-nonnull.h \
$(top_srcdir)/./c++defs.h careadlinkat.h md5.c md5.h sha1.c \
sha1.h dosname.h ftoastr.c ftoastr.h filemode.c filemode.h \
getloadavg.c getopt.c getopt.in.h getopt1.c getopt_int.h \
ignore-value.h intprops.h inttypes.in.h lstat.c \
mktime-internal.h mktime.c readlink.c stat.c stdarg.in.h \
stdbool.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \
strftime.c strftime.h strtol.c strtoul.c strtoull.c \
strtoimax.c strtoumax.c symlink.c sys_stat.in.h time.in.h \
time_r.c unistd.in.h verify.h $(top_srcdir)/./warn-on-use.h
$(top_srcdir)/./c++defs.h careadlinkat.h md5.h sha1.h \
dosname.h ftoastr.c ftoastr.h filemode.h getloadavg.c getopt.c \
getopt.in.h getopt1.c getopt_int.h ignore-value.h intprops.h \
inttypes.in.h lstat.c mktime-internal.h mktime.c readlink.c \
stat.c stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \
stdio.in.h stdlib.in.h strftime.h strtol.c strtoul.c \
strtoull.c strtoimax.c strtoumax.c symlink.c sys_stat.in.h \
time.in.h time_r.c unistd.in.h verify.h \
$(top_srcdir)/./warn-on-use.h
MOSTLYCLEANDIRS = sys
MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
c++defs.h c++defs.h-t getopt.h getopt.h-t inttypes.h \
......@@ -751,14 +752,13 @@ MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t
noinst_LIBRARIES = libgnu.a
DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
libgnu_a_SOURCES = allocator.c careadlinkat.c dtoastr.c \
$(am__append_1)
libgnu_a_SOURCES = allocator.c careadlinkat.c md5.c sha1.c dtoastr.c \
filemode.c $(am__append_1) strftime.c
libgnu_a_LIBADD = $(gl_LIBOBJS)
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES = md5.c sha1.c ftoastr.c filemode.c \
getloadavg.c getopt.c getopt1.c lstat.c mktime.c readlink.c \
stat.c strftime.c strtol.c strtoul.c strtoull.c strtoimax.c \
strtoumax.c symlink.c time_r.c
EXTRA_libgnu_a_SOURCES = ftoastr.c getloadavg.c getopt.c getopt1.c \
lstat.c mktime.c readlink.c stat.c strtol.c strtoul.c \
strtoull.c strtoimax.c strtoumax.c symlink.c time_r.c
ARG_NONNULL_H = arg-nonnull.h
CXXDEFS_H = c++defs.h
WARN_ON_USE_H = warn-on-use.h
......
......@@ -14975,60 +14975,41 @@ $as_echo "$gl_cv_func_getopt_gnu" >&6; }
fi
fi
 
ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
if test "x$ac_cv_have_decl_getenv" = x""yes; then :
ac_have_decl=1
else
ac_have_decl=0
fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_GETENV $ac_have_decl
_ACEOF
 
 
 
 
REPLACE_GETOPT=0
 
 
if test -n "$gl_replace_getopt"; then :
 
REPLACE_GETOPT=1
 
GETOPT_H=getopt.h
$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
GNULIB_UNISTD_H_GETOPT=1
gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
fi
 
 
gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
if test $REPLACE_GETOPT = 1; then
 
GETOPT_H=getopt.h
 
$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
GNULIB_UNISTD_H_GETOPT=1
fi
 
ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
if test "x$ac_cv_have_decl_getenv" = x""yes; then :
ac_have_decl=1
else
ac_have_decl=0
fi
 
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_GETENV $ac_have_decl
_ACEOF
 
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
......@@ -16034,21 +16015,16 @@ $as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h
 
 
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
$as_echo_n "(cached) " >&6
else
rm -f conftest.sym conftest.file
echo >conftest.file
if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
if test "$cross_compiling" = yes; then :
# When cross-compiling, be pessimistic so we will end up using the
# replacement version of lstat that checks for trailing slashes and
# calls lstat a second time when necessary.
ac_cv_func_lstat_dereferences_slashed_symlink=no
echo >conftest.file
if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
if test "$cross_compiling" = yes; then :
ac_cv_func_lstat_dereferences_slashed_symlink=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
......@@ -16057,11 +16033,10 @@ int
main ()
{
struct stat sbuf;
/* Linux will dereference the symlink and fail, as required by
POSIX. That is better in the sense that it means we will not
have to compile and use the lstat wrapper. */
return lstat ("conftest.sym/", &sbuf) == 0;
/* Linux will dereference the symlink and fail, as required by POSIX.
That is better in the sense that it means we will not
have to compile and use the lstat wrapper. */
return lstat ("conftest.sym/", &sbuf) == 0;
;
return 0;
}
......@@ -16075,23 +16050,25 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
 
else
# If the 'ln -s' command failed, then we probably don't even
# have an lstat function.
ac_cv_func_lstat_dereferences_slashed_symlink=no
fi
rm -f conftest.sym conftest.file
else
# If the `ln -s' command failed, then we probably don't even
# have an lstat function.
ac_cv_func_lstat_dereferences_slashed_symlink=no
fi
rm -f conftest.sym conftest.file
 
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
 
cat >>confdefs.h <<_ACEOF
#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
_ACEOF
 
if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
 
 
 
......@@ -16102,7 +16079,7 @@ _ACEOF
 
gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
 
fi
fi
 
 
GNULIB_MKTIME=0;
......@@ -16678,33 +16655,11 @@ fi
 
 
 
gl_LIBOBJS="$gl_LIBOBJS md5.$ac_objext"
:
 
 
 
 
gl_LIBOBJS="$gl_LIBOBJS sha1.$ac_objext"
:
 
 
......@@ -16714,16 +16669,6 @@ fi
 
 
 
gl_LIBOBJS="$gl_LIBOBJS filemode.$ac_objext"
# Persuade glibc <stdlib.h> to declare getloadavg().
 
 
......@@ -16731,6 +16676,7 @@ gl_save_LIBS=$LIBS
 
# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
HAVE_GETLOADAVG=1
ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
if test "x$ac_cv_func_getloadavg" = x""yes; then :
 
......@@ -16917,6 +16863,51 @@ fi
 
# Set up the replacement function if necessary.
if test $gl_have_func = no; then
HAVE_GETLOADAVG=0
fi
fi
if test "x$gl_save_LIBS" = x; then
GETLOADAVG_LIBS=$LIBS
else
GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_save_LIBS!!"`
fi
LIBS=$gl_save_LIBS
# Test whether the system declares getloadavg. Solaris has the function
# but declares it in <sys/loadavg.h>, not <stdlib.h>.
for ac_header in sys/loadavg.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_LOADAVG_H 1
_ACEOF
fi
done
if test $ac_cv_header_sys_loadavg_h = yes; then
HAVE_SYS_LOADAVG_H=1
else
HAVE_SYS_LOADAVG_H=0
fi
ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H
# include <sys/loadavg.h>
#endif
#include <stdlib.h>
"
if test "x$ac_cv_have_decl_getloadavg" = x""yes; then :
else
HAVE_DECL_GETLOADAVG=0
fi
if test $HAVE_GETLOADAVG = 0; then
 
 
 
......@@ -17197,47 +17188,16 @@ fi
 
done
 
fi
fi
 
 
if test "x$gl_save_LIBS" = x; then
GETLOADAVG_LIBS=$LIBS
else
GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_save_LIBS!!"`
fi
LIBS=$gl_save_LIBS
 
 
# Test whether the system declares getloadavg. Solaris has the function
# but declares it in <sys/loadavg.h>, not <stdlib.h>.
for ac_header in sys/loadavg.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_LOADAVG_H 1
_ACEOF
 
fi
GNULIB_GETLOADAVG=1
 
done
 
if test $ac_cv_header_sys_loadavg_h = yes; then
HAVE_SYS_LOADAVG_H=1
else
HAVE_SYS_LOADAVG_H=0
fi
ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H
# include <sys/loadavg.h>
#endif
#include <stdlib.h>
"
if test "x$ac_cv_have_decl_getloadavg" = x""yes; then :
 
else
HAVE_DECL_GETLOADAVG=0
fi
 
 
 
......@@ -17245,7 +17205,7 @@ fi
 
 
 
GNULIB_GETLOADAVG=1
if test $REPLACE_GETOPT = 1; then
 
 
 
......@@ -17254,6 +17214,7 @@ fi
 
 
 
gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext"
 
 
 
......@@ -17262,9 +17223,29 @@ fi
 
 
 
gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext"
fi
REPLACE_GETOPT=0
if test -n "$gl_replace_getopt"; then :
 
REPLACE_GETOPT=1
fi
 
if test $REPLACE_GETOPT = 1; then
 
GETOPT_H=getopt.h
 
......@@ -17272,7 +17253,10 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
GNULIB_UNISTD_H_GETOPT=1
GNULIB_UNISTD_H_GETOPT=1
fi
if test $REPLACE_GETOPT = 1; then
 
 
 
......@@ -17296,27 +17280,37 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
fi
 
 
 
 
 
if test $ac_cv_func_lstat = yes; then
 
if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
REPLACE_LSTAT=1
if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then
REPLACE_LSTAT=1
fi
# Prerequisites of lib/lstat.c.
else
HAVE_LSTAT=0
fi
 
if test $REPLACE_LSTAT = 1; then
gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext"
:
fi
 
 
 
......@@ -17333,19 +17327,20 @@ fi
 
 
 
if test $APPLE_UNIVERSAL_BUILD = 1; then
# A universal build on Apple MacOS X platforms.
# The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode.
# But we need a configuration result that is valid in both modes.
ac_cv_func_working_mktime=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
if test $APPLE_UNIVERSAL_BUILD = 1; then
# A universal build on Apple MacOS X platforms.
# The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode.
# But we need a configuration result that is valid in both modes.
gl_cv_func_working_mktime=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
if test "${ac_cv_func_working_mktime+set}" = set; then :
if test "${gl_cv_func_working_mktime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
ac_cv_func_working_mktime=no
gl_cv_func_working_mktime=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
......@@ -17542,69 +17537,57 @@ main ()
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_working_mktime=yes
gl_cv_func_working_mktime=yes
else
ac_cv_func_working_mktime=no
gl_cv_func_working_mktime=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
 
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5
$as_echo "$ac_cv_func_working_mktime" >&6; }
if test $ac_cv_func_working_mktime = no; then
gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext"
 
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5
$as_echo "$gl_cv_func_working_mktime" >&6; }
 
if test $ac_cv_func_working_mktime = no; then
if test $gl_cv_func_working_mktime = no; then
REPLACE_MKTIME=1
else
REPLACE_MKTIME=0
fi
 
if test $REPLACE_MKTIME = 1; then
 
 
 
 
 
GNULIB_MKTIME=1
 
 
 
gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext"
 
 
 
 
fi
 
 
if test $ac_cv_func_readlink = no; then
HAVE_READLINK=0
 
 
GNULIB_MKTIME=1
 
 
 
 
 
 
gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
 
 
:
 
if test $ac_cv_func_readlink = no; then
HAVE_READLINK=0
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
$as_echo_n "checking whether readlink signature is correct... " >&6; }
......@@ -17675,18 +17658,12 @@ $as_echo "$gl_cv_func_readlink_works" >&6; }
$as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
REPLACE_READLINK=1
gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
elif test "$gl_cv_decl_readlink_works" != yes; then
REPLACE_READLINK=1
fi
fi
if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
 
 
 
......@@ -17697,9 +17674,10 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext"
 
fi
fi
 
:
fi
 
 
 
......@@ -18246,17 +18224,6 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
 
 
 
gl_LIBOBJS="$gl_LIBOBJS strftime.$ac_objext"
# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
 
 
......@@ -18276,31 +18243,30 @@ $as_echo "#define my_strftime nstrftime" >>confdefs.h
if test "$ac_cv_have_decl_strtoumax" != yes; then
HAVE_DECL_STRTOUMAX=0
 
for ac_func in strtoumax
do :
ac_fn_c_check_func "$LINENO" "strtoumax" "ac_cv_func_strtoumax"
if test "x$ac_cv_func_strtoumax" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRTOUMAX 1
_ACEOF
 
fi
done
 
fi
 
if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then