35129e5a5a
* lib/argmatch.c, lib/argmatch.h, lib/c-ctype.c, lib/c-ctype.h, lib/config.charset, lib/c-strcasecmp.c, lib/c-strcaseeq.h, lib/c-strcase.h, lib/c-strncasecmp.c, lib/exitfail.c, lib/exitfail.h, lib/isatty.c, lib/localcharset.c, lib/localcharset.h, lib/mbrtowc.c, lib/mbsinit.c, lib/quotearg.c, lib/quotearg.h, lib/quote.h, lib/ref-add.sin, lib/ref-del.sin, lib/streq.h, lib/wctype-h.c, lib/wctype.in.h, lib/xalloc-die.c, lib/xalloc.h, lib/xalloc-oversized.h, lib/xmalloc.c, m4/codeset.m4, m4/configmake.m4, m4/glibc21.m4, m4/isatty.m4, m4/localcharset.m4, m4/locale-fr.m4, m4/locale-ja.m4, m4/locale-zh.m4, m4/mbrtowc.m4, m4/mbsinit.m4, m4/mbstate_t.m4, m4/quotearg.m4, m4/quote.m4, m4/wctype_h.m4, m4/xalloc.m4: New files. * lib/Makefile.am, m4/gnulib-cache.m4, m4/gnulib-comp.m4: Update.
50 lines
1.8 KiB
Text
50 lines
1.8 KiB
Text
# configmake.m4 serial 1
|
|
dnl Copyright (C) 2010-2013 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) or automake
|
|
# 1.9.6 (pkglibexecdir wasn't supported until 1.10b.).
|
|
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 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}'])
|
|
])
|