diff options
author | Pedro Alves <palves@redhat.com> | 2012-04-19 19:34:52 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2012-04-19 19:34:52 +0000 |
commit | c971b7fa72c48b07e3199b76f8d79f3a71c65124 (patch) | |
tree | 1da895c31fc16645f398f166dfdb33b41ac36f78 /gdb/gdbserver/configure.ac | |
parent | 9d28a8c73b6f647ffab4a27d827137e272e046b8 (diff) | |
download | gdb-c971b7fa72c48b07e3199b76f8d79f3a71c65124.zip gdb-c971b7fa72c48b07e3199b76f8d79f3a71c65124.tar.gz gdb-c971b7fa72c48b07e3199b76f8d79f3a71c65124.tar.bz2 |
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.
Diffstat (limited to 'gdb/gdbserver/configure.ac')
-rw-r--r-- | gdb/gdbserver/configure.ac | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index ebbe571..7013a21 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -26,12 +26,12 @@ AC_CONFIG_HEADER(config.h:config.in) AM_MAINTAINER_MODE AC_PROG_CC -gl_EARLY AC_GNU_SOURCE AC_CANONICAL_SYSTEM AC_PROG_INSTALL +AC_PROG_RANLIB AC_ARG_PROGRAM @@ -43,6 +43,13 @@ AC_FUNC_ALLOCA # Check for the 'make' the user wants to use. AC_CHECK_PROGS(MAKE, make) +# Configure gnulib. We can't use AC_CONFIG_SUBDIRS as that'd expect +# to find the the source subdir to be configured directly under +# gdbserver/. We need to build gnulib under some other directory not +# "gnulib", to avoid the problem of both GDB and GDBserver wanting to +# build it in the same directory, when building in the source dir. +ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"]) + AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl proc_service.h sys/procfs.h thread_db.h linux/elf.h dnl stdlib.h unistd.h dnl @@ -439,18 +446,15 @@ AC_SUBST(srv_xmlfiles) AC_SUBST(IPA_DEPFILES) AC_SUBST(extra_libraries) -gl_INIT -# GDBserver does not use automake, but gnulib does. This line lets -# us generate its Makefile.in. -AM_INIT_AUTOMAKE(gdbserver, UNUSED-VERSION, [no-define]) +GNULIB=build-gnulib-gdbserver/import GNULIB_STDINT_H= if test x"$STDINT_H" != x; then - GNULIB_STDINT_H=gnulib/$STDINT_H + GNULIB_STDINT_H=$GNULIB/$STDINT_H fi AC_SUBST(GNULIB_STDINT_H) -AC_OUTPUT(Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in, +AC_OUTPUT(Makefile, [case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; |