configury: move autoconf macros to build-aux subdirectory.

* ltdl/m4: Move from here...
* build-aux/m4: ...to here.
* configure.ac (AC_CONFIG_MACRO_DIR): Adjust.
* Makefile.am (config_macro_dir, ACLOCAL_AMFLAGS): Adjust.
* build-aux/m4/gnulib-cache.m4: Regenerate.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

1 files changed, 41 insertions, 0 deletions

diff --git a/build-aux/m4/m4-error.m4 b/build-aux/m4/m4-error.m4
new file mode 100644
index 00000000..27695cbb
--- /dev/null
+++ b/build-aux/m4/m4-error.m4
@@ -0,0 +1,41 @@
+#                                                            -*- Autoconf -*-
+# m4-error.m4 -- Use the installed version of error.h if available.
+# Written by Gary V. Vaughan <gary@gnu.org>
+#
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013 Free Software
+# Foundation, Inc.
+#
+# This file is part of GNU M4.
+#
+# GNU M4 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.
+#
+# GNU M4 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 program.  If not, see <http://www.gnu.org/licenses/>.
+
+# serial 4
+
+# M4_ERROR
+# --------
+# Use the installed version of error.h if available.
+AC_DEFUN([M4_ERROR],
+[AC_BEFORE([gl_ERROR], [M4_ERROR])
+
+AC_CHECK_HEADERS([error.h],
+    [ERROR_H=""], [ERROR_H="error.h"], [AC_INCLUDES_DEFAULT])
+AC_SUBST([ERROR_H])
+
+if test $ac_cv_header_error_h = yes; then
+  INCLUDE_ERROR_H='#include <error.h>'
+else
+  INCLUDE_ERROR_H='#include <gnu/error.h>'
+fi
+AC_SUBST([INCLUDE_ERROR_H])
+])# M4_ERROR