2008-04-14 18:05:12 +00:00
|
|
|
# DO NOT EDIT! GENERATED AUTOMATICALLY!
|
2012-04-18 20:45:25 +00:00
|
|
|
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
|
2008-04-14 18:05:12 +00:00
|
|
|
#
|
2012-04-18 20:45:25 +00:00
|
|
|
# This file is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This file is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this file. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
|
|
# As a special exception to the GNU General Public License,
|
|
|
|
# this file may be distributed as part of a program that
|
|
|
|
# contains a configuration script generated by Autoconf, under
|
2008-04-14 18:05:12 +00:00
|
|
|
# the same distribution terms as the rest of that program.
|
|
|
|
#
|
|
|
|
# Generated by gnulib-tool.
|
|
|
|
#
|
|
|
|
# This file represents the compiled summary of the specification in
|
|
|
|
# gnulib-cache.m4. It lists the computed macro invocations that need
|
|
|
|
# to be invoked from configure.ac.
|
2012-04-18 20:45:25 +00:00
|
|
|
# In projects that use version control, this file can be treated like
|
|
|
|
# other built files.
|
2008-04-14 18:05:12 +00:00
|
|
|
|
|
|
|
|
|
|
|
# This macro should be invoked from ./configure.ac, in the section
|
|
|
|
# "Checks for programs", right after AC_PROG_CC, and certainly before
|
|
|
|
# any checks for libraries, header files, types and library functions.
|
|
|
|
AC_DEFUN([gl_EARLY],
|
|
|
|
[
|
|
|
|
m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
|
|
|
|
m4_pattern_allow([^gl_ES$])dnl a valid locale name
|
|
|
|
m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
|
|
|
|
m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
|
2012-04-18 20:45:25 +00:00
|
|
|
AC_REQUIRE([gl_PROG_AR_RANLIB])
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module alloca:
|
|
|
|
# Code from module alloca-opt:
|
|
|
|
# Code from module configmake:
|
2010-05-23 00:57:01 +00:00
|
|
|
# Code from module extensions:
|
2008-04-14 18:05:12 +00:00
|
|
|
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module fnmatch:
|
|
|
|
# Code from module fnmatch-gnu:
|
2010-05-23 00:57:01 +00:00
|
|
|
# Code from module include_next:
|
2012-04-14 05:24:57 +00:00
|
|
|
# Code from module inttypes:
|
2012-04-18 20:45:25 +00:00
|
|
|
# Code from module inttypes-incomplete:
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module localcharset:
|
|
|
|
# Code from module mbrtowc:
|
|
|
|
# Code from module mbsinit:
|
|
|
|
# Code from module mbsrtowcs:
|
2010-05-23 00:57:01 +00:00
|
|
|
# Code from module memchr:
|
|
|
|
# Code from module memmem:
|
|
|
|
# Code from module memmem-simple:
|
|
|
|
# Code from module multiarch:
|
2012-04-18 20:45:25 +00:00
|
|
|
# Code from module snippet/arg-nonnull:
|
|
|
|
# Code from module snippet/c++defs:
|
|
|
|
# Code from module snippet/warn-on-use:
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module stdbool:
|
2010-05-23 00:57:01 +00:00
|
|
|
# Code from module stddef:
|
|
|
|
# Code from module stdint:
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module streq:
|
2010-05-23 00:57:01 +00:00
|
|
|
# Code from module string:
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module strnlen1:
|
2012-04-18 20:06:39 +00:00
|
|
|
# Code from module update-copyright:
|
2012-07-02 11:52:39 +00:00
|
|
|
# Code from module verify:
|
|
|
|
# Code from module wchar:
|
|
|
|
# Code from module wctype-h:
|
2008-04-14 18:05:12 +00:00
|
|
|
])
|
|
|
|
|
|
|
|
# This macro should be invoked from ./configure.ac, in the section
|
|
|
|
# "Check for header files, types and library functions".
|
|
|
|
AC_DEFUN([gl_INIT],
|
|
|
|
[
|
|
|
|
AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
|
|
|
|
gl_cond_libtool=false
|
|
|
|
gl_libdeps=
|
|
|
|
gl_ltlibdeps=
|
2012-04-19 Pedro Alves <palves@redhat.com>
gdb/
* Makefile.in (GNULIB_BUILDDIR): New.
(LIBGNU, INCGNU, GNULIB_H): Adjust.
(SUBDIRS): Add $(GNULIB_BUILDDIR).
(CLEANDIRS). Remove gnulib/import.
(REQUIRED_SUBDIRS): Replace gnulib/import with $(GNULIB_BUILDDIR).
(all-lib): Ditto.
(distclean): Remove the $(GNULIB_BUILDDIR) directory.
(gnulib/import/Makefile): Replace gnulib/import with
$(GNULIB_BUILDDIR). Set CONFIG_FILES to just Makefile.
(ACLOCAL_AMFLAGS): Remove '-I gnulib/import/m4'.
(aclocal_m4_deps): Remove the gnulib dependencies. Add
acx_configure_dir.m4.
* acinclude.m4: Include acx_configure_dir.m4.
* acx_configure_dir.m4: New file.
* aclocal.m4: Regenerate.
* configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
calls. Configure gnulib using ACX_CONFIGURE_DIR.
(GNULIB): New variable.
(GNULIB_STDINT_H): Adjust.
(AC_OUTPUT): Don't output gnulib/Makefile.
* gdb/defs.h: Include build-gnulib/config.h.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
* gnulib/Makefile.in: New file.
* gnulib/configure.ac: New file.
* gnulib/aclocal.m4: New file.
* gnulib/config.in: New file.
* gnulib/configure: New file.
* gnulib/: Re-run gnulib-tool to adjust.
gdb/gdbserver/
* Makefile.in (GNULIB_BUILDDIR): New.
(LIBGNU, INCGNU, GNULIB_H): Adjust.
(SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): New.
(all, install-only, uninstall, clean-info, all-lib, clean): No
longer pass GNULIB_FLAGS_TO_PASS. Use subdir_do.
(maintainer-clean realclean distclean): Use subdir_do.
(subdir_do): New.
(gnulib/import/Makefile): Adjust. Replace gnulib/import with
$(GNULIB_BUILDDIR). Don't pass argument to config.status.
* acinclude.m4: Include acx_configure_dir.m4.
* configure.ac: Remove gl_EARLY, gl_INIT, and AM_INIT_AUTOMAKE
calls. Call AC_PROG_RANLIB. Configure gnulib using
ACX_CONFIGURE_DIR.
(GNULIB): New.
(GNULIB_STDINT_H): Adjust.
(AC_OUTPUT): Don't output gnulib/Makefile anymore.
* gdbreplay.c: Include build-gnulib/config.h.
* server.h: Likewise.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
2012-04-19 19:34:52 +00:00
|
|
|
gl_m4_base='import/m4'
|
2008-04-14 18:05:12 +00:00
|
|
|
m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
|
|
|
|
m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
|
|
|
|
m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
|
2010-05-23 00:57:01 +00:00
|
|
|
m4_pushdef([gl_LIBSOURCES_LIST], [])
|
|
|
|
m4_pushdef([gl_LIBSOURCES_DIR], [])
|
|
|
|
gl_COMMON
|
2012-04-19 Pedro Alves <palves@redhat.com>
gdb/
* Makefile.in (GNULIB_BUILDDIR): New.
(LIBGNU, INCGNU, GNULIB_H): Adjust.
(SUBDIRS): Add $(GNULIB_BUILDDIR).
(CLEANDIRS). Remove gnulib/import.
(REQUIRED_SUBDIRS): Replace gnulib/import with $(GNULIB_BUILDDIR).
(all-lib): Ditto.
(distclean): Remove the $(GNULIB_BUILDDIR) directory.
(gnulib/import/Makefile): Replace gnulib/import with
$(GNULIB_BUILDDIR). Set CONFIG_FILES to just Makefile.
(ACLOCAL_AMFLAGS): Remove '-I gnulib/import/m4'.
(aclocal_m4_deps): Remove the gnulib dependencies. Add
acx_configure_dir.m4.
* acinclude.m4: Include acx_configure_dir.m4.
* acx_configure_dir.m4: New file.
* aclocal.m4: Regenerate.
* configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
calls. Configure gnulib using ACX_CONFIGURE_DIR.
(GNULIB): New variable.
(GNULIB_STDINT_H): Adjust.
(AC_OUTPUT): Don't output gnulib/Makefile.
* gdb/defs.h: Include build-gnulib/config.h.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
* gnulib/Makefile.in: New file.
* gnulib/configure.ac: New file.
* gnulib/aclocal.m4: New file.
* gnulib/config.in: New file.
* gnulib/configure: New file.
* gnulib/: Re-run gnulib-tool to adjust.
gdb/gdbserver/
* Makefile.in (GNULIB_BUILDDIR): New.
(LIBGNU, INCGNU, GNULIB_H): Adjust.
(SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): New.
(all, install-only, uninstall, clean-info, all-lib, clean): No
longer pass GNULIB_FLAGS_TO_PASS. Use subdir_do.
(maintainer-clean realclean distclean): Use subdir_do.
(subdir_do): New.
(gnulib/import/Makefile): Adjust. Replace gnulib/import with
$(GNULIB_BUILDDIR). Don't pass argument to config.status.
* acinclude.m4: Include acx_configure_dir.m4.
* configure.ac: Remove gl_EARLY, gl_INIT, and AM_INIT_AUTOMAKE
calls. Call AC_PROG_RANLIB. Configure gnulib using
ACX_CONFIGURE_DIR.
(GNULIB): New.
(GNULIB_STDINT_H): Adjust.
(AC_OUTPUT): Don't output gnulib/Makefile anymore.
* gdbreplay.c: Include build-gnulib/config.h.
* server.h: Likewise.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
2012-04-19 19:34:52 +00:00
|
|
|
gl_source_base='import'
|
2012-07-02 11:52:39 +00:00
|
|
|
gl_FUNC_ALLOCA
|
|
|
|
gl_CONFIGMAKE_PREP
|
|
|
|
gl_FUNC_FNMATCH_POSIX
|
|
|
|
if test -n "$FNMATCH_H"; then
|
|
|
|
AC_LIBOBJ([fnmatch])
|
|
|
|
gl_PREREQ_FNMATCH
|
|
|
|
fi
|
|
|
|
gl_FUNC_FNMATCH_GNU
|
|
|
|
if test -n "$FNMATCH_H"; then
|
|
|
|
AC_LIBOBJ([fnmatch])
|
|
|
|
gl_PREREQ_FNMATCH
|
|
|
|
fi
|
2012-04-18 20:45:25 +00:00
|
|
|
gl_INTTYPES_H
|
|
|
|
gl_INTTYPES_INCOMPLETE
|
2012-07-02 11:52:39 +00:00
|
|
|
gl_LOCALCHARSET
|
|
|
|
LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
|
|
|
|
AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
|
|
|
|
gl_FUNC_MBRTOWC
|
|
|
|
if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
|
|
|
|
AC_LIBOBJ([mbrtowc])
|
|
|
|
gl_PREREQ_MBRTOWC
|
|
|
|
fi
|
|
|
|
gl_WCHAR_MODULE_INDICATOR([mbrtowc])
|
|
|
|
gl_FUNC_MBSINIT
|
|
|
|
if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
|
|
|
|
AC_LIBOBJ([mbsinit])
|
|
|
|
gl_PREREQ_MBSINIT
|
|
|
|
fi
|
|
|
|
gl_WCHAR_MODULE_INDICATOR([mbsinit])
|
|
|
|
gl_FUNC_MBSRTOWCS
|
|
|
|
if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
|
|
|
|
AC_LIBOBJ([mbsrtowcs])
|
|
|
|
AC_LIBOBJ([mbsrtowcs-state])
|
|
|
|
gl_PREREQ_MBSRTOWCS
|
|
|
|
fi
|
|
|
|
gl_WCHAR_MODULE_INDICATOR([mbsrtowcs])
|
2012-04-18 20:45:25 +00:00
|
|
|
gl_FUNC_MEMCHR
|
|
|
|
if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
|
|
|
|
AC_LIBOBJ([memchr])
|
|
|
|
gl_PREREQ_MEMCHR
|
|
|
|
fi
|
|
|
|
gl_STRING_MODULE_INDICATOR([memchr])
|
|
|
|
gl_FUNC_MEMMEM
|
|
|
|
if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
|
|
|
|
AC_LIBOBJ([memmem])
|
|
|
|
fi
|
|
|
|
gl_FUNC_MEMMEM_SIMPLE
|
|
|
|
if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
|
|
|
|
AC_LIBOBJ([memmem])
|
|
|
|
fi
|
|
|
|
gl_STRING_MODULE_INDICATOR([memmem])
|
|
|
|
gl_MULTIARCH
|
2012-07-02 11:52:39 +00:00
|
|
|
AM_STDBOOL_H
|
2012-04-18 20:45:25 +00:00
|
|
|
gl_STDDEF_H
|
|
|
|
gl_STDINT_H
|
|
|
|
gl_HEADER_STRING_H
|
2012-07-02 11:52:39 +00:00
|
|
|
gl_WCHAR_H
|
|
|
|
gl_WCTYPE_H
|
2010-05-23 00:57:01 +00:00
|
|
|
# End of code from modules
|
|
|
|
m4_ifval(gl_LIBSOURCES_LIST, [
|
|
|
|
m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
|
|
|
|
for gl_file in ]gl_LIBSOURCES_LIST[ ; do
|
|
|
|
if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
|
|
|
|
echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
done])dnl
|
|
|
|
m4_if(m4_sysval, [0], [],
|
|
|
|
[AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
|
|
|
|
])
|
|
|
|
m4_popdef([gl_LIBSOURCES_DIR])
|
|
|
|
m4_popdef([gl_LIBSOURCES_LIST])
|
2008-04-14 18:05:12 +00:00
|
|
|
m4_popdef([AC_LIBSOURCES])
|
|
|
|
m4_popdef([AC_REPLACE_FUNCS])
|
|
|
|
m4_popdef([AC_LIBOBJ])
|
|
|
|
AC_CONFIG_COMMANDS_PRE([
|
|
|
|
gl_libobjs=
|
|
|
|
gl_ltlibobjs=
|
|
|
|
if test -n "$gl_LIBOBJS"; then
|
|
|
|
# Remove the extension.
|
|
|
|
sed_drop_objext='s/\.o$//;s/\.obj$//'
|
2010-05-23 00:57:01 +00:00
|
|
|
for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
|
2008-04-14 18:05:12 +00:00
|
|
|
gl_libobjs="$gl_libobjs $i.$ac_objext"
|
|
|
|
gl_ltlibobjs="$gl_ltlibobjs $i.lo"
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
|
|
|
|
AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
|
|
|
|
])
|
|
|
|
gltests_libdeps=
|
|
|
|
gltests_ltlibdeps=
|
|
|
|
m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
|
|
|
|
m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
|
|
|
|
m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
|
2010-05-23 00:57:01 +00:00
|
|
|
m4_pushdef([gltests_LIBSOURCES_LIST], [])
|
|
|
|
m4_pushdef([gltests_LIBSOURCES_DIR], [])
|
|
|
|
gl_COMMON
|
2008-04-14 18:05:12 +00:00
|
|
|
gl_source_base='tests'
|
2010-05-23 00:57:01 +00:00
|
|
|
changequote(,)dnl
|
|
|
|
gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
|
|
|
|
changequote([, ])dnl
|
|
|
|
AC_SUBST([gltests_WITNESS])
|
|
|
|
gl_module_indicator_condition=$gltests_WITNESS
|
|
|
|
m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
|
|
|
|
m4_popdef([gl_MODULE_INDICATOR_CONDITION])
|
|
|
|
m4_ifval(gltests_LIBSOURCES_LIST, [
|
|
|
|
m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
|
|
|
|
for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
|
|
|
|
if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
|
|
|
|
echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
done])dnl
|
|
|
|
m4_if(m4_sysval, [0], [],
|
|
|
|
[AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
|
|
|
|
])
|
|
|
|
m4_popdef([gltests_LIBSOURCES_DIR])
|
|
|
|
m4_popdef([gltests_LIBSOURCES_LIST])
|
2008-04-14 18:05:12 +00:00
|
|
|
m4_popdef([AC_LIBSOURCES])
|
|
|
|
m4_popdef([AC_REPLACE_FUNCS])
|
|
|
|
m4_popdef([AC_LIBOBJ])
|
|
|
|
AC_CONFIG_COMMANDS_PRE([
|
|
|
|
gltests_libobjs=
|
|
|
|
gltests_ltlibobjs=
|
|
|
|
if test -n "$gltests_LIBOBJS"; then
|
|
|
|
# Remove the extension.
|
|
|
|
sed_drop_objext='s/\.o$//;s/\.obj$//'
|
2010-05-23 00:57:01 +00:00
|
|
|
for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
|
2008-04-14 18:05:12 +00:00
|
|
|
gltests_libobjs="$gltests_libobjs $i.$ac_objext"
|
|
|
|
gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
|
|
|
|
AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
|
|
|
|
])
|
|
|
|
LIBGNU_LIBDEPS="$gl_libdeps"
|
|
|
|
AC_SUBST([LIBGNU_LIBDEPS])
|
|
|
|
LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
|
|
|
|
AC_SUBST([LIBGNU_LTLIBDEPS])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Like AC_LIBOBJ, except that the module name goes
|
|
|
|
# into gl_LIBOBJS instead of into LIBOBJS.
|
|
|
|
AC_DEFUN([gl_LIBOBJ], [
|
|
|
|
AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
|
|
|
|
gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
|
|
|
|
])
|
|
|
|
|
|
|
|
# Like AC_REPLACE_FUNCS, except that the module name goes
|
|
|
|
# into gl_LIBOBJS instead of into LIBOBJS.
|
|
|
|
AC_DEFUN([gl_REPLACE_FUNCS], [
|
|
|
|
m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
|
|
|
|
AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Like AC_LIBSOURCES, except the directory where the source file is
|
2010-05-23 00:57:01 +00:00
|
|
|
# expected is derived from the gnulib-tool parameterization,
|
2008-04-14 18:05:12 +00:00
|
|
|
# and alloca is special cased (for the alloca-opt module).
|
|
|
|
# We could also entirely rely on EXTRA_lib..._SOURCES.
|
|
|
|
AC_DEFUN([gl_LIBSOURCES], [
|
|
|
|
m4_foreach([_gl_NAME], [$1], [
|
|
|
|
m4_if(_gl_NAME, [alloca.c], [], [
|
2012-04-19 Pedro Alves <palves@redhat.com>
gdb/
* Makefile.in (GNULIB_BUILDDIR): New.
(LIBGNU, INCGNU, GNULIB_H): Adjust.
(SUBDIRS): Add $(GNULIB_BUILDDIR).
(CLEANDIRS). Remove gnulib/import.
(REQUIRED_SUBDIRS): Replace gnulib/import with $(GNULIB_BUILDDIR).
(all-lib): Ditto.
(distclean): Remove the $(GNULIB_BUILDDIR) directory.
(gnulib/import/Makefile): Replace gnulib/import with
$(GNULIB_BUILDDIR). Set CONFIG_FILES to just Makefile.
(ACLOCAL_AMFLAGS): Remove '-I gnulib/import/m4'.
(aclocal_m4_deps): Remove the gnulib dependencies. Add
acx_configure_dir.m4.
* acinclude.m4: Include acx_configure_dir.m4.
* acx_configure_dir.m4: New file.
* aclocal.m4: Regenerate.
* configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
calls. Configure gnulib using ACX_CONFIGURE_DIR.
(GNULIB): New variable.
(GNULIB_STDINT_H): Adjust.
(AC_OUTPUT): Don't output gnulib/Makefile.
* gdb/defs.h: Include build-gnulib/config.h.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
* gnulib/Makefile.in: New file.
* gnulib/configure.ac: New file.
* gnulib/aclocal.m4: New file.
* gnulib/config.in: New file.
* gnulib/configure: New file.
* gnulib/: Re-run gnulib-tool to adjust.
gdb/gdbserver/
* Makefile.in (GNULIB_BUILDDIR): New.
(LIBGNU, INCGNU, GNULIB_H): Adjust.
(SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): New.
(all, install-only, uninstall, clean-info, all-lib, clean): No
longer pass GNULIB_FLAGS_TO_PASS. Use subdir_do.
(maintainer-clean realclean distclean): Use subdir_do.
(subdir_do): New.
(gnulib/import/Makefile): Adjust. Replace gnulib/import with
$(GNULIB_BUILDDIR). Don't pass argument to config.status.
* acinclude.m4: Include acx_configure_dir.m4.
* configure.ac: Remove gl_EARLY, gl_INIT, and AM_INIT_AUTOMAKE
calls. Call AC_PROG_RANLIB. Configure gnulib using
ACX_CONFIGURE_DIR.
(GNULIB): New.
(GNULIB_STDINT_H): Adjust.
(AC_OUTPUT): Don't output gnulib/Makefile anymore.
* gdbreplay.c: Include build-gnulib/config.h.
* server.h: Likewise.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
2012-04-19 19:34:52 +00:00
|
|
|
m4_define([gl_LIBSOURCES_DIR], [import])
|
2010-05-23 00:57:01 +00:00
|
|
|
m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
|
2008-04-14 18:05:12 +00:00
|
|
|
])
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Like AC_LIBOBJ, except that the module name goes
|
|
|
|
# into gltests_LIBOBJS instead of into LIBOBJS.
|
|
|
|
AC_DEFUN([gltests_LIBOBJ], [
|
|
|
|
AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
|
|
|
|
gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
|
|
|
|
])
|
|
|
|
|
|
|
|
# Like AC_REPLACE_FUNCS, except that the module name goes
|
|
|
|
# into gltests_LIBOBJS instead of into LIBOBJS.
|
|
|
|
AC_DEFUN([gltests_REPLACE_FUNCS], [
|
|
|
|
m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
|
|
|
|
AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Like AC_LIBSOURCES, except the directory where the source file is
|
2010-05-23 00:57:01 +00:00
|
|
|
# expected is derived from the gnulib-tool parameterization,
|
2008-04-14 18:05:12 +00:00
|
|
|
# and alloca is special cased (for the alloca-opt module).
|
|
|
|
# We could also entirely rely on EXTRA_lib..._SOURCES.
|
|
|
|
AC_DEFUN([gltests_LIBSOURCES], [
|
|
|
|
m4_foreach([_gl_NAME], [$1], [
|
|
|
|
m4_if(_gl_NAME, [alloca.c], [], [
|
2010-05-23 00:57:01 +00:00
|
|
|
m4_define([gltests_LIBSOURCES_DIR], [tests])
|
|
|
|
m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ])
|
2008-04-14 18:05:12 +00:00
|
|
|
])
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
# This macro records the list of files which have been installed by
|
|
|
|
# gnulib-tool and may be removed by future gnulib-tool invocations.
|
|
|
|
AC_DEFUN([gl_FILE_LIST], [
|
2012-04-18 20:45:25 +00:00
|
|
|
build-aux/snippet/arg-nonnull.h
|
|
|
|
build-aux/snippet/c++defs.h
|
|
|
|
build-aux/snippet/warn-on-use.h
|
2012-04-18 20:06:39 +00:00
|
|
|
build-aux/update-copyright
|
2012-07-02 11:52:39 +00:00
|
|
|
lib/alloca.c
|
|
|
|
lib/alloca.in.h
|
|
|
|
lib/config.charset
|
|
|
|
lib/fnmatch.c
|
|
|
|
lib/fnmatch.in.h
|
|
|
|
lib/fnmatch_loop.c
|
2012-04-14 05:24:57 +00:00
|
|
|
lib/inttypes.in.h
|
2012-07-02 11:52:39 +00:00
|
|
|
lib/localcharset.c
|
|
|
|
lib/localcharset.h
|
|
|
|
lib/mbrtowc.c
|
|
|
|
lib/mbsinit.c
|
|
|
|
lib/mbsrtowcs-impl.h
|
|
|
|
lib/mbsrtowcs-state.c
|
|
|
|
lib/mbsrtowcs.c
|
2008-04-14 18:05:12 +00:00
|
|
|
lib/memchr.c
|
2010-05-23 00:57:01 +00:00
|
|
|
lib/memchr.valgrind
|
2008-04-14 18:05:12 +00:00
|
|
|
lib/memmem.c
|
2012-07-02 11:52:39 +00:00
|
|
|
lib/ref-add.sin
|
|
|
|
lib/ref-del.sin
|
|
|
|
lib/stdbool.in.h
|
2010-05-23 00:57:01 +00:00
|
|
|
lib/stddef.in.h
|
2008-04-14 18:05:12 +00:00
|
|
|
lib/stdint.in.h
|
|
|
|
lib/str-two-way.h
|
2012-07-02 11:52:39 +00:00
|
|
|
lib/streq.h
|
2008-04-14 18:05:12 +00:00
|
|
|
lib/string.in.h
|
2012-07-02 11:52:39 +00:00
|
|
|
lib/strnlen1.c
|
|
|
|
lib/strnlen1.h
|
|
|
|
lib/verify.h
|
|
|
|
lib/wchar.in.h
|
|
|
|
lib/wctype.in.h
|
2010-05-23 00:57:01 +00:00
|
|
|
m4/00gnulib.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/alloca.m4
|
|
|
|
m4/codeset.m4
|
|
|
|
m4/configmake.m4
|
2008-04-14 18:05:12 +00:00
|
|
|
m4/extensions.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/fcntl-o.m4
|
|
|
|
m4/fnmatch.m4
|
|
|
|
m4/glibc21.m4
|
2008-04-14 18:05:12 +00:00
|
|
|
m4/gnulib-common.m4
|
|
|
|
m4/include_next.m4
|
2012-04-14 05:24:57 +00:00
|
|
|
m4/inttypes-pri.m4
|
|
|
|
m4/inttypes.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/localcharset.m4
|
|
|
|
m4/locale-fr.m4
|
|
|
|
m4/locale-ja.m4
|
|
|
|
m4/locale-zh.m4
|
2008-04-14 18:05:12 +00:00
|
|
|
m4/longlong.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/mbrtowc.m4
|
|
|
|
m4/mbsinit.m4
|
|
|
|
m4/mbsrtowcs.m4
|
|
|
|
m4/mbstate_t.m4
|
2008-04-14 18:05:12 +00:00
|
|
|
m4/memchr.m4
|
|
|
|
m4/memmem.m4
|
2010-05-23 00:57:01 +00:00
|
|
|
m4/mmap-anon.m4
|
|
|
|
m4/multiarch.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/stdbool.m4
|
2010-05-23 00:57:01 +00:00
|
|
|
m4/stddef_h.m4
|
2008-04-14 18:05:12 +00:00
|
|
|
m4/stdint.m4
|
|
|
|
m4/string_h.m4
|
2010-05-23 00:57:01 +00:00
|
|
|
m4/warn-on-use.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/wchar_h.m4
|
2010-05-23 00:57:01 +00:00
|
|
|
m4/wchar_t.m4
|
2012-07-02 11:52:39 +00:00
|
|
|
m4/wctype_h.m4
|
|
|
|
m4/wint_t.m4
|
2008-04-14 18:05:12 +00:00
|
|
|
])
|