8690e6342c
Add fnmatch-gnu module. * gnulib/Makefile.in (aclocal_m4_deps): Add new files and remove one. * gnulib/configure.ac (AC_INIT): Use now import/memmem.c. * gnulib/aclocal.m4: Regenerate. * gnulib/config.in: Regenerate. * gnulib/configure: Regenerate. * gnulib/import/dummy.c: Remove. * gnulib/import/Makefile.am: Regenerate. * gnulib/import/Makefile.in: Likewise. * gnulib/import/m4/gnulib-cache.m4: Likewise. * gnulib/import/m4/gnulib-comp.m4: Likewise. * gnulib/import/alloca.c: New file. * gnulib/import/alloca.in.h: Likewise. * gnulib/import/config.charset: Likewise. * gnulib/import/fnmatch.c: Likewise. * gnulib/import/fnmatch.in.h: Likewise. * gnulib/import/fnmatch_loop.c: Likewise. * gnulib/import/localcharset.c: Likewise. * gnulib/import/localcharset.h: Likewise. * gnulib/import/m4/alloca.m4: Likewise. * gnulib/import/m4/codeset.m4: Likewise. * gnulib/import/m4/configmake.m4: Likewise. * gnulib/import/m4/fcntl-o.m4: Likewise. * gnulib/import/m4/fnmatch.m4: Likewise. * gnulib/import/m4/glibc21.m4: Likewise. * gnulib/import/m4/localcharset.m4: Likewise. * gnulib/import/m4/locale-fr.m4: Likewise. * gnulib/import/m4/locale-ja.m4: Likewise. * gnulib/import/m4/locale-zh.m4: Likewise. * gnulib/import/m4/mbrtowc.m4: Likewise. * gnulib/import/m4/mbsinit.m4: Likewise. * gnulib/import/m4/mbsrtowcs.m4: Likewise. * gnulib/import/m4/mbstate_t.m4: Likewise. * gnulib/import/m4/stdbool.m4: Likewise. * gnulib/import/m4/wchar_h.m4: Likewise. * gnulib/import/m4/wctype_h.m4: Likewise. * gnulib/import/m4/wint_t.m4: Likewise. * gnulib/import/mbrtowc.c: Likewise. * gnulib/import/mbsinit.c: Likewise. * gnulib/import/mbsrtowcs-impl.h: Likewise. * gnulib/import/mbsrtowcs-state.c: Likewise. * gnulib/import/mbsrtowcs.c: Likewise. * gnulib/import/ref-add.sin: Likewise. * gnulib/import/ref-del.sin: Likewise. * gnulib/import/stdbool.in.h: Likewise. * gnulib/import/streq.h: Likewise. * gnulib/import/strnlen1.c: Likewise. * gnulib/import/strnlen1.h: Likewise. * gnulib/import/verify.h: Likewise. * gnulib/import/wchar.in.h: Likewise. * gnulib/import/wctype.in.h: Likewise.
50 lines
1.8 KiB
Text
50 lines
1.8 KiB
Text
# configmake.m4 serial 1
|
|
dnl Copyright (C) 2010-2012 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}'])
|
|
])
|