From 57aed41219a7bdb0ab075d49fd19a909322c3567 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 29 Aug 2000 20:00:37 +0000 Subject: [PATCH] * mc-aclocal.m4: renamed to ... * acinclude.m4: ... this * autogen.sh: simplified - no more tricks with mc-aclocal.m4 * Makefile.am: aclocal should scan "." for gettext.m4 --- ChangeLog | 7 +++++++ Makefile.am | 2 +- mc-aclocal.m4 => acinclude.m4 | 0 autogen.sh | 5 ++--- 4 files changed, 10 insertions(+), 4 deletions(-) rename mc-aclocal.m4 => acinclude.m4 (100%) diff --git a/ChangeLog b/ChangeLog index adc602661..676dcfbba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-08-29 Pavel Roskin + + * mc-aclocal.m4: renamed to ... + * acinclude.m4: ... this + * autogen.sh: simplified - no more tricks with mc-aclocal.m4 + * Makefile.am: aclocal should scan "." for gettext.m4 + 2000-08-28 Pavel Roskin * Make.common.in: removed hack for "make distcopy" diff --git a/Makefile.am b/Makefile.am index 27c9aca59..68018f376 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = vfs lib doc slang gtkedit edit src gnome new_icons \ idl syntax intl doc-gnome po pc -ACLOCAL_AMFLAGS = -I macros +ACLOCAL_AMFLAGS = -I . -I macros GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 \ macros/linger.m4 diff --git a/mc-aclocal.m4 b/acinclude.m4 similarity index 100% rename from mc-aclocal.m4 rename to acinclude.m4 diff --git a/autogen.sh b/autogen.sh index f22a5358f..80d9eb9ca 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,9 +6,8 @@ test -z "$srcdir" && srcdir=. ( cd $srcdir -if test -d macros && test -f mc-aclocal.m4 && test -f gettext.m4; then - cat mc-aclocal.m4 gettext.m4 > acinclude.m4 - aclocal -I macros $ACLOCAL_FLAGS || exit 1 +if test -d macros; then + aclocal -I . -I macros $ACLOCAL_FLAGS || exit 1 else if test -f aclocal.m4; then echo Warning: aclocal.m4 cannot be rebuilt