From 87435d922349441f8188008a30b7db1d974b2146 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Tue, 5 Mar 2002 17:58:34 +0000 Subject: [PATCH] Removed m4 stuff from topdir Makefile.am, again. Added a small macro that tells configure.ac where to look for macros. Removed cruftly stamp-h.in from rep. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1101 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++++ Makefile.am | 2 -- configure.ac | 1 + m4/aclocal_inc.m4 | 6 ++++++ stamp-h.in | 1 - 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 m4/aclocal_inc.m4 delete mode 100644 stamp-h.in diff --git a/ChangeLog b/ChangeLog index 36fe321b..ea7ebae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,10 +28,14 @@ CVS code - - Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc. - Change localedir line to 1.0's version. - Moved m4/ stuff to its own m4/Makefile.am. +- m4/aclocal_inc.m4: + - New macro AM_ACLOCAL_INCLUDE, tells configure.ac where to look for + macros (Gergely Nagy). - configure.in: - Renamed to configure.ac. - configure.ac: - Moved to autoconf 2.52 (Jeff Bailey). + - Added call to AM_ACLOCAL_INCLUDE. - files.c: read_byte() - Added check for conrol characters (indicative of a binary diff --git a/Makefile.am b/Makefile.am index e07c26d5..921a2024 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ ## $Id$ AUTOMAKE_OPTIONS = gnu no-dependencies -M4DIR = $(srcdir)/m4 -ACLOCAL_AMFLAGS = -I $(M4DIR) DEFS= -DSYSCONFDIR=\"$(sysconfdir)\" diff --git a/configure.ac b/configure.ac index 6018bea5..79bdf0a4 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR([nano.c]) AC_PREREQ(2.52) AM_INIT_AUTOMAKE(nano, 1.1.6-cvs) AM_CONFIG_HEADER(config.h:config.h.in) +AM_ACLOCAL_INCLUDE(m4) ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv nn nl da pl nb" dnl Checks for programs. diff --git a/m4/aclocal_inc.m4 b/m4/aclocal_inc.m4 new file mode 100644 index 00000000..45c46a7c --- /dev/null +++ b/m4/aclocal_inc.m4 @@ -0,0 +1,6 @@ +dnl AM_ACLOCAL_INCLUDE(macrodir) +AC_DEFUN([AM_ACLOCAL_INCLUDE], +[ + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done +]) diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index 9788f702..00000000 --- a/stamp-h.in +++ /dev/null @@ -1 +0,0 @@ -timestamp