+Sat Aug 24 09:30:46 1996 Tom Tromey <tromey@creche.cygnus.com>
+
+ * acinstall: New file.
+
+ * m4/AM_INIT_AUTOMAKE.m4: Define PACKAGE and VERSION.
+
+ * m4/AM_WITH_REGEX.m4: New version from François Pinard.
+
+ * m4/AM_TYPE_PTRDIFF_T.m4: Use am_cv, not ac_cv.
+ * m4/AM_C_PROTOTYPES.m4: Ditto.
+ * m4/AM_FUNC_STRTOD.m4: Ditto.
+ * m4/AM_PROG_CC_STDC.m4: Ditto.
+ * m4/AM_PROG_LIBTOOL.m4: Ditto.
+
+Fri Aug 23 22:23:50 1996 Tom Tromey <tromey@creche.cygnus.com>
+
+ * m4/Makefile.am (m4datadir): New macro
+ (m4data_DATA): Renamed.
+
+ * Makefile.am (cvs-dist): Depend on distcheck target.
+
Mon Aug 19 15:37:32 1996 Tom Tromey <tromey@creche.cygnus.com>
* automake.in (initialize_global_constants): [common_files]
## These must all be executable when installed.
pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
-mkinstalldirs elisp-comp ylwrap
+mkinstalldirs elisp-comp ylwrap acinstall
# The following requires a fixed version of the Emacs 19.30 etags.
ETAGS_ARGS = automake.in aclocal.in --lang=none \
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check
+cvs-dist: maintainer-check distcheck
@if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
echo "NEWS not updated; not releasing" 1>&2; \
exit 1; \
-# Makefile.in generated automatically by automake 1.1c from Makefile.am
+# Makefile.in generated automatically by automake 1.1d from Makefile.am
# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
-mkinstalldirs elisp-comp ylwrap
+mkinstalldirs elisp-comp ylwrap acinstall
# The following requires a fixed version of the Emacs 19.30 etags.
ETAGS_ARGS = automake.in aclocal.in --lang=none \
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
-INFOS = automake.info automake.info-[0-9] automake.info-[0-9][0-9]
+INFOS = automake.info[-0-9]*
INFO_DEPS = automake.info
DVIS = automake.dvi
TEXINFOS = automake.texi
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS README THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
ansi2knr.c automake.in config.guess config.sub configure configure.in \
-elisp-comp install-sh mdate-sh mkinstalldirs stamp-vti texinfo.tex \
-version.texi
+elisp-comp install-sh interlock mdate-sh mkinstalldirs stamp-vti \
+texinfo.tex version.texi ylwrap
PACKAGE = @PACKAGE@
.texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+.texinfo.info:
+ cd $(srcdir) \
+ && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+ TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+
install-info: $(INFO_DEPS)
$(mkinstalldirs) $(infodir)
for file in $(INFO_DEPS); do \
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check
+cvs-dist: maintainer-check distcheck
@if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
echo "NEWS not updated; not releasing" 1>&2; \
exit 1; \
cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
> $(PACKAGE)-$$prevno-$(VERSION).diff
.SUFFIXES:
-.SUFFIXES: .texi .info .dvi
+.SUFFIXES: .texi .texinfo .info .dvi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Noah Friedman <friedman@gnu.ai.mit.edu>
Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
Thomas Morgan <tmorgan@pobox.com>
+Tom Tromey <tromey@cygnus.com>
Ulrich Drepper <drepper@gnu.ai.mit.edu>
!! Must fix require_file stuff. It is really gross, and I don't
understand it any more.
+!! remove autosystem-specific macros
+!! should write autoconf-style doc entries for each m4 macro
+
+should put inverse of @MAINT@ before `.PHONY: configure'
+
* some options must be turned off when --gnu or higher
eg no-installinfo
copied into the output immediately. This feature is probably required
to fully support libtool ("grody compilation issue")
+Henrik Frystyk Nielsen says:
+Henrik> 4) Flags like --include-deps are lost when you make changes to
+Henrik> Makefile.am files and automake is run automatically. It would
+Henrik> be nice to keep these flags as I now have to redo everything
+Henrik> manually.
+... what about other options here too?
+
Think about: maybe "make check" should just bomb if error occurs?
Then user must use "make -k check". This is probably more natural.
--- /dev/null
+#! /bin/sh
+
+# Install an aclocal-style M4 file. A script is needed to do this
+# because we want to do serial-number checking; newer versions of
+# macro files should always be preferred.
+
+# Usage:
+# acinstall file directory installprogram [install-args]...
+
+file="$1"
+dir="$2"
+shift
+shift
+
+localserial="`grep '^# serial' $file | sed -e 's/^# serial //g'`"
+if test -z "$localserial"; then
+ echo "acinstall: no serial number in $file" 1>&2
+ exit 1
+fi
+
+# Maybe if the installed file has no serial number we should just
+# assume it is ancient.
+instserial="`grep '^# serial' $dir/$file | sed -e 's/^# serial //g'`"
+if test -z "$instserial"; then
+ echo "acinstall: no serial number in $dir/$file" 1>&2
+ exit 1
+fi
+
+if test $localserial -lt $instserial; then
+ # Installed file is newer.
+ exit 0
+fi
+
+# Install the file.
+$* $file $dir/$file
--- /dev/null
+#! /bin/sh
+
+# Install an aclocal-style M4 file. A script is needed to do this
+# because we want to do serial-number checking; newer versions of
+# macro files should always be preferred.
+
+# Usage:
+# acinstall file directory installprogram [install-args]...
+
+file="$1"
+dir="$2"
+shift
+shift
+
+localserial="`grep '^# serial' $file | sed -e 's/^# serial //g'`"
+if test -z "$localserial"; then
+ echo "acinstall: no serial number in $file" 1>&2
+ exit 1
+fi
+
+# Maybe if the installed file has no serial number we should just
+# assume it is ancient.
+instserial="`grep '^# serial' $dir/$file | sed -e 's/^# serial //g'`"
+if test -z "$instserial"; then
+ echo "acinstall: no serial number in $dir/$file" 1>&2
+ exit 1
+fi
+
+if test $localserial -lt $instserial; then
+ # Installed file is newer.
+ exit 0
+fi
+
+# Install the file.
+$* $file $dir/$file
## These must all be executable when installed.
pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
-mkinstalldirs elisp-comp ylwrap
+mkinstalldirs elisp-comp ylwrap acinstall
# The following requires a fixed version of the Emacs 19.30 etags.
ETAGS_ARGS = automake.in aclocal.in --lang=none \
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.
-cvs-dist: maintainer-check
+cvs-dist: maintainer-check distcheck
@if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
echo "NEWS not updated; not releasing" 1>&2; \
exit 1; \
## From Franc,ois Pinard ##
## ------------------------------- ##
+# serial 1
+
AC_DEFUN(AM_C_PROTOTYPES,
[AC_REQUIRE([AM_PROG_CC_STDC])
AC_BEFORE([$0], [AC_C_INLINE])
AC_MSG_CHECKING([for function prototypes])
-if test "$ac_cv_prog_cc_stdc" != no; then
+if test "$am_cv_prog_cc_stdc" != no; then
AC_MSG_RESULT(yes)
AC_DEFINE(PROTOTYPES)
U= ANSI2KNR=
-dnl Use this in conjunction with autosystem to get working ctype-style
-dnl macros.
+## -------------------------- ##
+## Use in conjunction with ##
+## autosystem to get working ##
+## ctype-style macros ##
+## Tom Tromey ##
+## -------------------------- ##
+
+# serial 1
AC_DEFUN([AM_FEATURE_CTYPE],
AC_REQUIRE([AC_HEADER_STDC]))
dnl Use this in conjunction with autosystem to get `errno'.
dnl Doesn't actually require any definition; it just assumes that
dnl <errno.h> exists.
+
+# serial 1
+
AC_DEFUN([AM_FEATURE_ERRNO])
dnl EXIT_SUCCESS, and EXIT_FAILURE.
dnl Doesn't actually require any definition; it just assumes that
dnl <stdlib.h> exists.
+
+# serial 1
+
AC_DEFUN([AM_FEATURE_EXIT])
## Check for a working fnmatch ##
## --------------------------- ##
+# serial 1
+
# @defmac AC_FUNC_FNMATCH
# @maindex FUNC_FNMATCH
# @ovindex LIBOBJS
dnl From Jim Meyering.
+
+# serial 1
+
AC_DEFUN(AM_FUNC_STRTOD,
-[AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
+[AC_CACHE_CHECK(for working strtod, am_cv_func_strtod,
[AC_TRY_RUN([
double strtod ();
int
}
exit (0);
}
-], ac_cv_func_strtod=yes, ac_cv_func_strtod=no, ac_cv_func_strtod=no)])
-test $ac_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
+], am_cv_func_strtod=yes, am_cv_func_strtod=no, am_cv_func_strtod=no)])
+test $am_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
AC_SUBST(LIBOBJS)dnl
-if test $ac_cv_func_strtod = no; then
+if test $am_cv_func_strtod = no; then
AC_CHECK_FUNCS(pow)
- if test $ac_cv_func_pow = no; then
+ if test $am_cv_func_pow = no; then
AC_CHECK_LIB(m, pow)
fi
fi
dnl From Jim Meyering.
+# serial 1
+
AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
[AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
+# serial 1
+
dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version)
[AC_REQUIRE([AM_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
VERSION=[$2]
AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_ARG_PROGRAM
AC_PROG_MAKE_SET])
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
+
+# serial 1
+
AC_DEFUN(AM_MAINTAINER_MODE,
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
## Emacs LISP file handling
## From Ulrich Drepper
## ------------------------
+
+# serial 1
+
AC_DEFUN(AM_PATH_LISPDIR,
[AC_PATH_PROG(EMACS, emacs xemacs, no)
if test $EMACS != "no"; then
## From Franc,ois Pinard ##
## ----------------------------------------- ##
+# serial 1
+
# @defmac AC_PROG_CC_STDC
# @maindex PROG_CC_STDC
# @ovindex CC
#
# If you use this macro, you should check after calling it whether the C
# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
+# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
# code in ANSI C, you can make an un-ANSIfied copy of it by using the
# program @code{ansi2knr}, which comes with Ghostscript.
# @end defmac
AC_DEFUN(AM_PROG_CC_STDC,
[AC_REQUIRE([AC_PROG_CC])
AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
-AC_CACHE_VAL(ac_cv_prog_cc_stdc,
-[ac_cv_prog_cc_stdc=no
+AC_CACHE_VAL(am_cv_prog_cc_stdc,
+[am_cv_prog_cc_stdc=no
ac_save_CC="$CC"
# Don't try gcc -ansi; that turns off useful extensions and
# breaks some systems' header files.
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};],
-[ac_cv_prog_cc_stdc="$ac_arg"; break])
+[am_cv_prog_cc_stdc="$ac_arg"; break])
done
CC="$ac_save_CC"
])
-AC_MSG_RESULT($ac_cv_prog_cc_stdc)
-case "x$ac_cv_prog_cc_stdc" in
+AC_MSG_RESULT($am_cv_prog_cc_stdc)
+case "x$am_cv_prog_cc_stdc" in
x|xno) ;;
- *) CC="$CC $ac_cv_prog_cc_stdc" ;;
+ *) CC="$CC $am_cv_prog_cc_stdc" ;;
esac
])
## From Franc,ois Pinard ##
## --------------------------------------------------------- ##
+# serial 1
+
AC_DEFUN(AM_PROG_INSTALL,
[AC_REQUIRE([AC_PROG_INSTALL])
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
## From Gord Matzigkeit ##
## --------------------------------------------------------- ##
+# serial 1
+
AC_DEFUN(AM_PROG_LIBTOOL,
[AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_PROG_CC])
# Holy mackerel, what a command line!
CC="$CC" LD="$LD" RANLIB="$RANLIB" OBJTYPES="$OBJTYPES" \
$srcdir/libtool --host="$host" --libdir="$am_prog_libtool_libdir" --no-validate-host \
---with-gcc="$ac_cv_prog_gcc" $am_prog_libtool_flags \
+--with-gcc="$am_cv_prog_gcc" $am_prog_libtool_flags \
configure || AC_MSG_ERROR([libtool configure failed])
])
+# serial 1
+
AC_DEFUN([AM_SYSTEM_HEADER])
dnl From Jim Meyering.
+# serial 1
+
AC_DEFUN(AM_SYS_POSIX_TERMIOS,
[AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios,
[AC_TRY_LINK([#include <sys/types.h>
# From Ulrich Drepper.
+# serial 1
+
AC_DEFUN(AM_TYPE_PTRDIFF_T,
- [AC_CACHE_CHECK([for ptrdiff_t], ac_cv_type_ptrdiff_t,
+ [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t,
[AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
- ac_cv_type_ptrdiff_t=yes, ac_cv_type_ptrdiff_t=no)])
- if test $ac_cv_type_ptrdiff_t = yes; then
+ am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
+ if test $am_cv_type_ptrdiff_t = yes; then
AC_DEFINE(HAVE_PTRDIFF_T)
fi
])
## From Franc,ois Pinard ##
## ----------------------------------- ##
+# serial 1
+
AC_DEFUN(AM_WITH_DMALLOC,
[AC_MSG_CHECKING(if malloc debugging is wanted)
AC_ARG_WITH(dmalloc,
## --------------------------------- ##
## Check if --with-regex was given. ##
-## From Franc,ois Pinard ##
## --------------------------------- ##
-# The idea is to distribute rx.[hc] and regex.[hc] together, for
-# a while. The WITH_REGEX symbol (which should also be documented
-# in acconfig.h) is used to decide which of regex.h or rx.h should
-# be included in the application. If `./configure --with-regex' is
-# given, the package will use the older regex. Else, a check is
-# made to see if rx is already installed, as with newer Linux'es.
+# serial 1
+
+# The idea is to distribute rx.[hc] and regex.[hc] together, for a while.
+# The WITH_REGEX symbol (which should also be documented in acconfig.h)
+# is used to decide which of regex.h or rx.h should be included in the
+# application. If `./configure --with-regex' is given (the default), the
+# package will use gawk's regex. If `./configure --without-regex', a
+# check is made to see if rx is already installed, as with newer Linux'es.
# If not found, the package will use the rx from the distribution.
-# If found, the package will use the system's rx which, on Linux
-# at least, will result in a smaller executable file.
+# If found, the package will use the system's rx which, on Linux at least,
+# will result in a smaller executable file.
AC_DEFUN(AM_WITH_REGEX,
-[AC_MSG_CHECKING(which of rx or regex is wanted)
+[AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted)
AC_ARG_WITH(regex,
-[ --with-regex use older regex in lieu of GNU rx for matching],
-[if test "$withval" = yes; then
- ac_with_regex=1
+[ --without-regex use GNU rx in lieu of gawk's regex for matching],
+[test "$withval" = yes && am_with_regex=1],
+[am_with_regex=1])
+if test -n "$am_with_regex"; then
AC_MSG_RESULT(regex)
AC_DEFINE(WITH_REGEX)
LIBOBJS="$LIBOBJS regex.o"
-fi])
-if test -z "$ac_with_regex"; then
+else
AC_MSG_RESULT(rx)
AC_CHECK_FUNC(re_rx_search, , [LIBOBJS="$LIBOBJS rx.o"])
fi
AUTOMAKE_OPTIONS = gnits
MAINT_CHARSET = latin1
-pkgdata_DATA = AM_C_PROTOTYPES.m4 AM_FEATURE_CTYPE.m4 \
+m4datadir = $(datadir)/aclocal
+m4data_DATA = AM_C_PROTOTYPES.m4 AM_FEATURE_CTYPE.m4 \
AM_FEATURE_ERRNO.m4 AM_FEATURE_EXIT.m4 AM_FUNC_FNMATCH.m4 \
AM_MAINTAINER_MODE.m4 AM_PATH_LISPDIR.m4 AM_PROG_CC_STDC.m4 \
AM_PROG_INSTALL.m4 AM_PROG_LIBTOOL.m4 AM_SYSTEM_HEADER.m4 \
-# Makefile.in generated automatically by automake 1.1c from Makefile.am
+# Makefile.in generated automatically by automake 1.1d from Makefile.am
# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
AUTOMAKE_OPTIONS = gnits
MAINT_CHARSET = latin1
-pkgdata_DATA = AM_C_PROTOTYPES.m4 AM_FEATURE_CTYPE.m4 \
+m4datadir = $(datadir)/aclocal
+m4data_DATA = AM_C_PROTOTYPES.m4 AM_FEATURE_CTYPE.m4 \
AM_FEATURE_ERRNO.m4 AM_FEATURE_EXIT.m4 AM_FUNC_FNMATCH.m4 \
AM_MAINTAINER_MODE.m4 AM_PATH_LISPDIR.m4 AM_PROG_CC_STDC.m4 \
AM_PROG_INSTALL.m4 AM_PROG_LIBTOOL.m4 AM_SYSTEM_HEADER.m4 \
AM_SYS_POSIX_TERMIOS.m4
mkinstalldirs = $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
-DATA = $(pkgdata_DATA)
+DATA = $(m4data_DATA)
DIST_COMMON = Makefile.am Makefile.in
Makefile: $(top_builddir)/config.status Makefile.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-install-pkgdataDATA: $(pkgdata_DATA)
- $(mkinstalldirs) $(pkgdatadir)
- list="$(pkgdata_DATA)"; for p in $$list; do \
+install-m4dataDATA: $(m4data_DATA)
+ $(mkinstalldirs) $(m4datadir)
+ list="$(m4data_DATA)"; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
- $(INSTALL_DATA) $(srcdir)/$$p $(pkgdatadir)/$$p; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p; \
else if test -f $$p; then \
- $(INSTALL_DATA) $$p $(pkgdatadir)/$$p; \
+ $(INSTALL_DATA) $$p $(m4datadir)/$$p; \
fi; fi; \
done
-uninstall-pkgdataDATA:
- list="$(pkgdata_DATA)"; for p in $$list; do \
- rm -f $(pkgdatadir)/$$p; \
+uninstall-m4dataDATA:
+ list="$(m4data_DATA)"; for p in $$list; do \
+ rm -f $(m4datadir)/$$p; \
done
tags: TAGS
TAGS:
install-exec:
-install-data: install-pkgdataDATA
+install-data: install-m4dataDATA
install: install-exec install-data all
@:
-uninstall: uninstall-pkgdataDATA
+uninstall: uninstall-m4dataDATA
all: $(DATA) Makefile
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
installdirs:
- $(mkinstalldirs) $(pkgdatadir)
+ $(mkinstalldirs) $(m4datadir)
mostlyclean-generic:
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-.PHONY: default uninstall-pkgdataDATA install-pkgdataDATA tags distdir \
+.PHONY: default uninstall-m4dataDATA install-m4dataDATA tags distdir \
info dvi check installcheck install-exec install-data install uninstall \
all installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
git://sourceware.org / automake.git / commitdiff