* 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
This commit is contained in:
Pavel Roskin 2000-08-29 20:00:37 +00:00
parent 4651b23593
commit 57aed41219
4 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2000-08-29 Pavel Roskin <proski@gnu.org>
* 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 <proski@gnu.org>
* Make.common.in: removed hack for "make distcopy"

View File

@ -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

View File

@ -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