4a626d0a0f
2015-08-24 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 1029a8112290f6eee9d7878a391c49db42c999bd. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/basename-lgpl.c: Update. * gnulib/import/canonicalize-lgpl.c: Update. * gnulib/import/config.charset: Update. * gnulib/import/dirent.in.h: Update. * gnulib/import/dirfd.c: Update. * gnulib/import/dirname-lgpl.c: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno.in.h: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/float+.h: Update. * gnulib/import/float.c: Update. * gnulib/import/float.in.h: Update. * gnulib/import/fnmatch.c: Update. * gnulib/import/fnmatch.in.h: Update. * gnulib/import/fnmatch_loop.c: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp.c: Update. * gnulib/import/frexpl.c: Update. * gnulib/import/gettimeofday.c: Update. * gnulib/import/inttypes.in.h: Update. * gnulib/import/isnan.c: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand.c: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl.c: Update. * gnulib/import/itold.c: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat.c: Update. * gnulib/import/m4/00gnulib.m4: Update. * gnulib/import/m4/absolute-header.m4: Update. * gnulib/import/m4/alloca.m4: Update. * gnulib/import/m4/canonicalize.m4: Update. * gnulib/import/m4/codeset.m4: Update. * gnulib/import/m4/configmake.m4: Update. * gnulib/import/m4/dirent_h.m4: Update. * gnulib/import/m4/dirfd.m4: Update. * gnulib/import/m4/dirname.m4: Update. * gnulib/import/m4/double-slash-root.m4: Update. * gnulib/import/m4/eealloc.m4: Update. * gnulib/import/m4/errno_h.m4: Update. * gnulib/import/m4/exponentd.m4: Update. * gnulib/import/m4/exponentl.m4: Update. * gnulib/import/m4/extensions.m4: Update. * gnulib/import/m4/extern-inline.m4: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/float_h.m4: Update. * gnulib/import/m4/fnmatch.m4: Update. * gnulib/import/m4/fpieee.m4: Update. * gnulib/import/m4/frexp.m4: Update. * gnulib/import/m4/frexpl.m4: Update. * gnulib/import/m4/gettimeofday.m4: Update. * gnulib/import/m4/glibc21.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-common.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/gnulib-tool.m4: Update. * gnulib/import/m4/include_next.m4: Update. * gnulib/import/m4/inttypes-pri.m4: Update. * gnulib/import/m4/inttypes.m4: Update. * gnulib/import/m4/isnand.m4: Update. * gnulib/import/m4/isnanl.m4: Update. * gnulib/import/m4/largefile.m4: Update. * gnulib/import/m4/localcharset.m4: Update. * gnulib/import/m4/locale-fr.m4: Update. * gnulib/import/m4/locale-ja.m4: Update. * gnulib/import/m4/locale-zh.m4: Update. * gnulib/import/m4/longlong.m4: Update. * gnulib/import/m4/lstat.m4: Update. * gnulib/import/m4/malloc.m4: Update. * gnulib/import/m4/malloca.m4: Update. * gnulib/import/m4/math_h.m4: Update. * gnulib/import/m4/mbrtowc.m4: Update. * gnulib/import/m4/mbsinit.m4: Update. * gnulib/import/m4/mbsrtowcs.m4: Update. * gnulib/import/m4/mbstate_t.m4: Update. * gnulib/import/m4/memchr.m4: Update. * gnulib/import/m4/memmem.m4: Update. * gnulib/import/m4/mmap-anon.m4: Update. * gnulib/import/m4/multiarch.m4: Update. * gnulib/import/m4/nocrash.m4: Update. * gnulib/import/m4/off_t.m4: Update. * gnulib/import/m4/pathmax.m4: Update. * gnulib/import/m4/readlink.m4: Update. * gnulib/import/m4/rename.m4: Update. * gnulib/import/m4/rmdir.m4: Update. * gnulib/import/m4/ssize_t.m4: Update. * gnulib/import/m4/stat.m4: Update. * gnulib/import/m4/stdbool.m4: Update. * gnulib/import/m4/stddef_h.m4: Update. * gnulib/import/m4/stdint.m4: Update. * gnulib/import/m4/stdio_h.m4: Update. * gnulib/import/m4/stdlib_h.m4: Update. * gnulib/import/m4/string_h.m4: Update. * gnulib/import/m4/strstr.m4: Update. * gnulib/import/m4/strtok_r.m4: Update. * gnulib/import/m4/sys_socket_h.m4: Update. * gnulib/import/m4/sys_stat_h.m4: Update. * gnulib/import/m4/sys_time_h.m4: Update. * gnulib/import/m4/sys_types_h.m4: Update. * gnulib/import/m4/time_h.m4: Update. * gnulib/import/m4/unistd_h.m4: Update. * gnulib/import/m4/warn-on-use.m4: Update. * gnulib/import/m4/wchar_h.m4: Update. * gnulib/import/m4/wchar_t.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/m4/wint_t.m4: Update. * gnulib/import/malloc.c: Update. * gnulib/import/malloca.c: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math.in.h: Update. * gnulib/import/mbrtowc.c: Update. * gnulib/import/mbsinit.c: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state.c: Update. * gnulib/import/mbsrtowcs.c: Update. * gnulib/import/memchr.c: Update. * gnulib/import/memmem.c: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/readlink.c: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename.c: Update. * gnulib/import/rmdir.c: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/stat.c: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/stddef.in.h: Update. * gnulib/import/stdint.in.h: Update. * gnulib/import/stdio.c: Update. * gnulib/import/stdio.in.h: Update. * gnulib/import/stdlib.in.h: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/streq.h: Update. * gnulib/import/string.in.h: Update. * gnulib/import/stripslash.c: Update. * gnulib/import/strnlen1.c: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr.c: Update. * gnulib/import/strtok_r.c: Update. * gnulib/import/sys_stat.in.h: Update. * gnulib/import/sys_time.in.h: Update. * gnulib/import/sys_types.in.h: Update. * gnulib/import/time.in.h: Update. * gnulib/import/unistd.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar.in.h: Update. * gnulib/import/wctype.in.h: Update. * gnulib/import/gettimeofday.c: New file. * gnulib/import/m4/absolute-header.m4: New file. * gnulib/import/m4/gettimeofday.m4: New file. * gnulib/import/m4/sys_socket_h.m4: New file. * gnulib/import/m4/sys_time_h.m4: New file. * gnulib/import/stdio.c: Delete file. * gnulib/import/sys_time.in.h: New file.
124 lines
3.6 KiB
Text
124 lines
3.6 KiB
Text
# canonicalize.m4 serial 26
|
|
|
|
dnl Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
|
|
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
# Provides canonicalize_file_name and canonicalize_filename_mode, but does
|
|
# not provide or fix realpath.
|
|
AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
|
|
[
|
|
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
|
AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
|
|
AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
|
|
AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
|
|
if test $ac_cv_func_canonicalize_file_name = no; then
|
|
HAVE_CANONICALIZE_FILE_NAME=0
|
|
else
|
|
case "$gl_cv_func_realpath_works" in
|
|
*yes) ;;
|
|
*) REPLACE_CANONICALIZE_FILE_NAME=1 ;;
|
|
esac
|
|
fi
|
|
])
|
|
|
|
# Provides canonicalize_file_name and realpath.
|
|
AC_DEFUN([gl_CANONICALIZE_LGPL],
|
|
[
|
|
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
|
|
AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE])
|
|
if test $ac_cv_func_canonicalize_file_name = no; then
|
|
HAVE_CANONICALIZE_FILE_NAME=0
|
|
if test $ac_cv_func_realpath = no; then
|
|
HAVE_REALPATH=0
|
|
else
|
|
case "$gl_cv_func_realpath_works" in
|
|
*yes) ;;
|
|
*) REPLACE_REALPATH=1 ;;
|
|
esac
|
|
fi
|
|
else
|
|
case "$gl_cv_func_realpath_works" in
|
|
*yes)
|
|
;;
|
|
*)
|
|
REPLACE_CANONICALIZE_FILE_NAME=1
|
|
REPLACE_REALPATH=1
|
|
;;
|
|
esac
|
|
fi
|
|
])
|
|
|
|
# Like gl_CANONICALIZE_LGPL, except prepare for separate compilation
|
|
# (no REPLACE_CANONICALIZE_FILE_NAME, no REPLACE_REALPATH, no AC_LIBOBJ).
|
|
AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE],
|
|
[
|
|
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
|
AC_CHECK_FUNCS_ONCE([canonicalize_file_name getcwd readlink])
|
|
AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
|
|
AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
|
|
AC_CHECK_HEADERS_ONCE([sys/param.h])
|
|
])
|
|
|
|
# Check whether realpath works. Assume that if a platform has both
|
|
# realpath and canonicalize_file_name, but the former is broken, then
|
|
# so is the latter.
|
|
AC_DEFUN([gl_FUNC_REALPATH_WORKS],
|
|
[
|
|
AC_CHECK_FUNCS_ONCE([realpath])
|
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
|
AC_CACHE_CHECK([whether realpath works], [gl_cv_func_realpath_works], [
|
|
touch conftest.a
|
|
mkdir conftest.d
|
|
AC_RUN_IFELSE([
|
|
AC_LANG_PROGRAM([[
|
|
]GL_NOCRASH[
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
]], [[
|
|
int result = 0;
|
|
{
|
|
char *name = realpath ("conftest.a", NULL);
|
|
if (!(name && *name == '/'))
|
|
result |= 1;
|
|
}
|
|
{
|
|
char *name = realpath ("conftest.b/../conftest.a", NULL);
|
|
if (name != NULL)
|
|
result |= 2;
|
|
}
|
|
{
|
|
char *name = realpath ("conftest.a/", NULL);
|
|
if (name != NULL)
|
|
result |= 4;
|
|
}
|
|
{
|
|
char *name1 = realpath (".", NULL);
|
|
char *name2 = realpath ("conftest.d//./..", NULL);
|
|
if (strcmp (name1, name2) != 0)
|
|
result |= 8;
|
|
}
|
|
return result;
|
|
]])
|
|
],
|
|
[gl_cv_func_realpath_works=yes],
|
|
[gl_cv_func_realpath_works=no],
|
|
[case "$host_os" in
|
|
# Guess yes on glibc systems.
|
|
*-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
|
|
# If we don't know, assume the worst.
|
|
*) gl_cv_func_realpath_works="guessing no" ;;
|
|
esac
|
|
])
|
|
rm -rf conftest.a conftest.d
|
|
])
|
|
case "$gl_cv_func_realpath_works" in
|
|
*yes)
|
|
AC_DEFINE([FUNC_REALPATH_WORKS], [1], [Define to 1 if realpath()
|
|
can malloc memory, always gives an absolute path, and handles
|
|
trailing slash correctly.])
|
|
;;
|
|
esac
|
|
])
|