4fd297786a
This also include my patch to lib/argp.hh for C++ compilation. * lib/Makefile.am, lib/alloca.in.h, lib/argmatch.c, lib/argmatch.h, lib/argp-ba.c, lib/argp-eexst.c, lib/argp-fmtstream.c, lib/argp-fmtstream.h, lib/argp-fs-xinl.c, lib/argp-help.c, lib/argp-namefrob.h, lib/argp-parse.c, lib/argp-pin.c, lib/argp-pv.c, lib/argp-pvh.c, lib/argp-xinl.c, lib/argp.h, lib/asnprintf.c, lib/basename-lgpl.c, lib/c-ctype.h, lib/c-strcase.h, lib/c-strcasecmp.c, lib/c-strcaseeq.h, lib/c-strncasecmp.c, lib/config.charset, lib/dirname-lgpl.c, lib/dirname.h, lib/dosname.h, lib/errno.in.h, lib/error.c, lib/error.h, lib/exitfail.c, lib/exitfail.h, lib/fcntl.in.h, lib/float+.h, lib/float.c, lib/float.in.h, lib/getopt.c, lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h, lib/gettext.h, lib/gettimeofday.c, lib/hard-locale.c, lib/hard-locale.h, lib/intprops.h, lib/isatty.c, lib/itold.c, lib/localcharset.c, lib/localcharset.h, lib/lstat.c, lib/malloc.c, lib/mbrtowc.c, lib/mbsinit.c, lib/memchr.c, lib/mempcpy.c, lib/mkstemp.c, lib/mkstemps.c, lib/msvc-inval.c, lib/msvc-inval.h, lib/msvc-nothrow.c, lib/msvc-nothrow.h, lib/pathmax.h, lib/printf-args.c, lib/printf-args.h, lib/printf-parse.c, lib/printf-parse.h, lib/progname.c, lib/progname.h, lib/quote.h, lib/quotearg.c, lib/quotearg.h, lib/rawmemchr.c, lib/ref-add.sin, lib/ref-del.sin, lib/secure_getenv.c, lib/size_max.h, lib/sleep.c, lib/stat.c, lib/stdalign.in.h, lib/stdbool.in.h, lib/stddef.in.h, lib/stdint.in.h, lib/stdio.in.h, lib/stdlib.in.h, lib/stpcpy.c, lib/strcasecmp.c, lib/strchrnul.c, lib/streq.h, lib/strerror-override.c, lib/strerror-override.h, lib/strerror.c, lib/string.in.h, lib/strings.in.h, lib/stripslash.c, lib/strncasecmp.c, lib/strndup.c, lib/strnlen.c, lib/strverscmp.c, lib/sys_stat.in.h, lib/sys_time.in.h, lib/sys_types.in.h, lib/sys_wait.in.h, lib/sysexits.in.h, lib/tempname.c, lib/tempname.h, lib/time.in.h, lib/unistd.in.h, lib/vasnprintf.c, lib/vasnprintf.h, lib/verify.h, lib/vsnprintf.c, lib/wchar.in.h, lib/wctype.in.h, lib/xalloc-die.c, lib/xalloc-oversized.h, lib/xalloc.h, lib/xmalloc.c, lib/xsize.h, m4/00gnulib.m4, m4/absolute-header.m4, m4/alloca.m4, m4/argp.m4, m4/configmake.m4, m4/dirname.m4, m4/double-slash-root.m4, m4/errno_h.m4, m4/error.m4, m4/exponentd.m4, m4/extensions.m4, m4/extern-inline.m4, m4/fcntl-o.m4, m4/fcntl_h.m4, m4/float_h.m4, m4/getopt.m4, m4/gettimeofday.m4, m4/glibc21.m4, m4/gnulib-cache.m4, m4/gnulib-common.m4, m4/gnulib-comp.m4, m4/gnulib-tool.m4, m4/hard-locale.m4, m4/include_next.m4, m4/intmax_t.m4, m4/inttypes_h.m4, m4/isatty.m4, m4/largefile.m4, m4/localcharset.m4, m4/locale-fr.m4, m4/locale-ja.m4, m4/locale-zh.m4, m4/longlong.m4, m4/lstat.m4, m4/malloc.m4, m4/math_h.m4, m4/mbrtowc.m4, m4/mbsinit.m4, m4/mbstate_t.m4, m4/memchr.m4, m4/mempcpy.m4, m4/mkstemp.m4, m4/mkstemps.m4, m4/mmap-anon.m4, m4/msvc-inval.m4, m4/msvc-nothrow.m4, m4/multiarch.m4, m4/nocrash.m4, m4/off_t.m4, m4/pathmax.m4, m4/printf.m4, m4/quote.m4, m4/quotearg.m4, m4/rawmemchr.m4, m4/secure_getenv.m4, m4/size_max.m4, m4/sleep.m4, m4/ssize_t.m4, m4/stat.m4, m4/stdalign.m4, m4/stdbool.m4, m4/stddef_h.m4, m4/stdint.m4, m4/stdint_h.m4, m4/stdio_h.m4, m4/stdlib_h.m4, m4/stpcpy.m4, m4/strcase.m4, m4/strchrnul.m4, m4/strerror.m4, m4/string_h.m4, m4/strings_h.m4, m4/strndup.m4, m4/strnlen.m4, m4/strverscmp.m4, m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/sys_time_h.m4, m4/sys_types_h.m4, m4/sys_wait_h.m4, m4/sysexits.m4, m4/tempname.m4, m4/time_h.m4, m4/unistd_h.m4, m4/vasnprintf.m4, m4/vsnprintf.m4, m4/warn-on-use.m4, m4/wchar_h.m4, m4/wchar_t.m4, m4/wctype_h.m4, m4/wint_t.m4, m4/xalloc.m4, m4/xsize.m4, tools/snippet/arg-nonnull.h, tools/snippet/c++defs.h, tools/snippet/warn-on-use.h: Update. * lib/getprogname.c, lib/getprogname.h, lib/limits.in.h, lib/minmax.h, m4/getprogname.m4, m4/limits-h.m4, m4/minmax.m4: New files.
55 lines
2 KiB
Text
55 lines
2 KiB
Text
# configmake.m4 serial 2
|
|
dnl Copyright (C) 2010-2017 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.
|
|
|
|
# gl_CONFIGMAKE_PREP
|
|
# ------------------
|
|
# Guarantee all of the standard directory variables, even when used with
|
|
# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir
|
|
# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b,
|
|
# and runstatedir in 1.14.1).
|
|
AC_DEFUN([gl_CONFIGMAKE_PREP],
|
|
[
|
|
dnl Technically, datadir should default to datarootdir. But if
|
|
dnl autoconf is too old to provide datarootdir, then reversing the
|
|
dnl definition is a reasonable compromise. Only AC_SUBST a variable
|
|
dnl if it was not already defined earlier by autoconf.
|
|
if test "x$datarootdir" = x; then
|
|
AC_SUBST([datarootdir], ['${datadir}'])
|
|
fi
|
|
dnl Copy the approach used in autoconf 2.60.
|
|
if test "x$docdir" = x; then
|
|
AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
|
|
['${datarootdir}/doc/${PACKAGE_TARNAME}'],
|
|
['${datarootdir}/doc/${PACKAGE}'])])
|
|
fi
|
|
dnl The remaining variables missing from autoconf 2.59 are easier.
|
|
if test "x$htmldir" = x; then
|
|
AC_SUBST([htmldir], ['${docdir}'])
|
|
fi
|
|
if test "x$dvidir" = x; then
|
|
AC_SUBST([dvidir], ['${docdir}'])
|
|
fi
|
|
if test "x$pdfdir" = x; then
|
|
AC_SUBST([pdfdir], ['${docdir}'])
|
|
fi
|
|
if test "x$psdir" = x; then
|
|
AC_SUBST([psdir], ['${docdir}'])
|
|
fi
|
|
if test "x$lispdir" = x; then
|
|
AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp'])
|
|
fi
|
|
if test "x$localedir" = x; then
|
|
AC_SUBST([localedir], ['${datarootdir}/locale'])
|
|
fi
|
|
dnl Added in autoconf 2.70
|
|
if test "x$runstatedir" = x; then
|
|
AC_SUBST([runstatedir], ['${localstatedir}/run'])
|
|
fi
|
|
|
|
dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely
|
|
dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe.
|
|
AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}'])
|
|
])
|