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-d3aeb78583b8master
parent
a3322fd65d
commit
87435d9223
|
@ -28,10 +28,14 @@ CVS code -
|
||||||
- Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
|
- Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
|
||||||
- Change localedir line to 1.0's version.
|
- Change localedir line to 1.0's version.
|
||||||
- Moved m4/ stuff to its own m4/Makefile.am.
|
- 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:
|
- configure.in:
|
||||||
- Renamed to configure.ac.
|
- Renamed to configure.ac.
|
||||||
- configure.ac:
|
- configure.ac:
|
||||||
- Moved to autoconf 2.52 (Jeff Bailey).
|
- Moved to autoconf 2.52 (Jeff Bailey).
|
||||||
|
- Added call to AM_ACLOCAL_INCLUDE.
|
||||||
- files.c:
|
- files.c:
|
||||||
read_byte()
|
read_byte()
|
||||||
- Added check for conrol characters (indicative of a binary
|
- Added check for conrol characters (indicative of a binary
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
## $Id$
|
## $Id$
|
||||||
AUTOMAKE_OPTIONS = gnu no-dependencies
|
AUTOMAKE_OPTIONS = gnu no-dependencies
|
||||||
M4DIR = $(srcdir)/m4
|
|
||||||
ACLOCAL_AMFLAGS = -I $(M4DIR)
|
|
||||||
|
|
||||||
DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
|
DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR([nano.c])
|
||||||
AC_PREREQ(2.52)
|
AC_PREREQ(2.52)
|
||||||
AM_INIT_AUTOMAKE(nano, 1.1.6-cvs)
|
AM_INIT_AUTOMAKE(nano, 1.1.6-cvs)
|
||||||
AM_CONFIG_HEADER(config.h:config.h.in)
|
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"
|
ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv nn nl da pl nb"
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
|
|
|
@ -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
|
||||||
|
])
|
|
@ -1 +0,0 @@
|
||||||
timestamp
|
|
Loading…
Reference in New Issue