Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gnulib / configure.ac

diff --git a/gnulib/configure.ac b/gnulib/configure.ac
index 74e4ae2b68844c10dc8605ccbf7738ab2c3c1c53..7661b8b7cd30da766d950ca39d6d0faadfcffc75 100644 (file)
--- a/gnulib/configure.ac
+++ b/gnulib/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf configure script for GDB, the GNU debugger.
-dnl Copyright (C) 1995-2019 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2020 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GDB.
 dnl
@@ -21,6 +21,8 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([libgnu], [UNUSED-VERSION])
 AC_CONFIG_SRCDIR([import/memmem.c])
 AC_CONFIG_HEADER(config.h:config.in)
+AC_CONFIG_MACRO_DIRS([import/m4])
+AC_CONFIG_MACRO_DIRS([../config])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
@@ -35,9 +37,7 @@ AC_CANONICAL_SYSTEM
 
 gl_INIT
 
-# We don't use automake, but gnulib does.  This line lets us generate
-# its Makefile.in.
-AM_INIT_AUTOMAKE([no-define])
+AM_INIT_AUTOMAKE([no-define no-dist foreign])
 
 AM_SILENT_RULES([yes])