[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47-fyi-automake-1-5.patch
|
From: |
Akim Demaille |
|
Subject: |
47-fyi-automake-1-5.patch |
|
Date: |
Mon, 27 Aug 2001 08:54:19 +0200 |
It is to be noted that the addition of the license/copyright performed
by Paul on Automake files is lost. I think it is Automake which
should catch up.
Index: ChangeLog
from Akim Demaille <address@hidden>
Automake 1.5.
* Makefile.am (AUTOMAKE_OPTIONS): Add 1.5 and dist-bzip2.
(AMTAR): Help automake define it.
(INSTALL, install-data-hook): The INSTALL.txt trick is no longer
needed, 1.5 can have a macro and a target with the same name.
* m4/auxdir.m4, m4/cond.m4, m4/depend.m4, m4/install-sh.m4,
* m4/strip.m4: New.
* m4/init.m4, m4/sanity.m4: Update.
* doc/Makefile.am (CLEANFILES): 1.5 knows the texi2dvi files.
* lib/autoconf/Makefile.am, lib/autotest/Makefile.am,
* lib/m4sugar/Makefile.am, lib/autoscan/Makefile.am,
* lib/Autom4te/Makefile.am, man/Makefile.am: Use dist/nodist.
Index: Makefile.am
--- Makefile.am Wed, 15 Aug 2001 18:25:22 +0200 akim
+++ Makefile.am Thu, 23 Aug 2001 23:22:34 +0200 akim
@@ -18,7 +18,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-AUTOMAKE_OPTIONS = check-news 1.4 readme-alpha
+AUTOMAKE_OPTIONS = check-news 1.5 dist-bzip2 readme-alpha
SUBDIRS = . lib bin config m4 man doc tests
@@ -29,6 +29,9 @@
BUGS INSTALL.txt \
GNUmakefile Makefile.maint
+# Automake is unable to look into our special aclocal.m4...
+AMTAR = @AMTAR@
+
## -------------------- ##
## Forwarding targets. ##
@@ -39,21 +42,15 @@
.PHONY: html pdf
-## ------------------ ##
-## Maintainer rules. ##
-## ------------------ ##
+## --------- ##
## INSTALL. ##
+## --------- ##
-# INSTALL is a special case. Automake seems to have a single name space
-# for both targets and variables. If we just use INSTALL, then the var
-# $(INSTALL) is not defined, and the install target fails.
+pkgdata_DATA = INSTALL
MAKEINFO = @MAKEINFO@ --no-headers --no-validate --no-split
-INSTALL.txt: $(top_srcdir)/doc/install.texi
- $(MAKEINFO) $(top_srcdir)/doc/install.texi
--output=$(srcdir)/INSTALL.txt
- cp $(srcdir)/INSTALL.txt $(srcdir)/INSTALL
-
-MAINTAINERCLEANFILES = INSTALL.txt
+INSTALL: $(top_srcdir)/doc/install.texi
+ $(MAKEINFO) $(top_srcdir)/doc/install.texi --output=$(srcdir)/INSTALL
maintainer-clean-local:
-rm -rf autom4te.cache
@@ -63,19 +60,6 @@ maintainer-check: maintainer-check-tests
maintainer-check-tests:
cd tests && make maintainer-check
-## ----------------------------------- ##
-## Special installation instructions. ##
-## ----------------------------------- ##
-
-install-data-hook: INSTALL.txt
- @$(NORMAL_INSTALL)
- @list='INSTALL'; for p in $$list; do \
- if test -f "$$p.txt"; then d= ; else d="$(srcdir)/"; fi; \
- f=`echo $$p | sed -e 's,^.*/,,'`; \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) ; \
- echo " $(INSTALL_DATA) $$d$$p.txt $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(INSTALL_DATA) $$d$$p.txt $(DESTDIR)$(pkgdatadir)/$$f; \
- done
## ---------------------------- ##
Index: aclocal.m4
--- aclocal.m4 Wed, 01 Aug 2001 23:34:52 +0200 akim
+++ aclocal.m4 Thu, 23 Aug 2001 23:18:04 +0200 akim
@@ -1,5 +1,10 @@
+m4_include([m4/atconfig.m4])
+m4_include([m4/auxdir.m4])
+m4_include([m4/cond.m4])
+m4_include([m4/depend.m4])
m4_include([m4/init.m4])
+m4_include([m4/install-sh.m4])
+m4_include([m4/m4.m4])
m4_include([m4/missing.m4])
m4_include([m4/sanity.m4])
-m4_include([m4/atconfig.m4])
-m4_include([m4/m4.m4])
+m4_include([m4/strip.m4])
Index: doc/Makefile.am
--- doc/Makefile.am Wed, 15 Aug 2001 18:25:22 +0200 akim
+++ doc/Makefile.am Thu, 23 Aug 2001 23:43:44 +0200 akim
@@ -28,12 +28,8 @@
# Files from texi2dvi that should be removed, but which Automake does
# not know.
-CLEANFILES = autoconf.cvs \
- autoconf.ev autoconf.evs autoconf.ac autoconf.acs \
- autoconf.ov autoconf.ovs autoconf.ms autoconf.mss \
- autoconf.at autoconf.ats autoconf.pr autoconf.prs \
- autoconf.fu autoconf.fus \
- autoconf.tmp \
+CLEANFILES = autoconf.acs autoconf.cvs autoconf.mss autoconf.prs \
+ autoconf.ats autoconf.evs autoconf.ovs autoconf.tmp \
autoconf*.html standards*.html \
autoconf*.pdf standards*.pdf
Index: lib/Autom4te/Makefile.am
--- lib/Autom4te/Makefile.am Thu, 16 Aug 2001 11:39:27 +0200 akim
+++ lib/Autom4te/Makefile.am Thu, 23 Aug 2001 23:10:18 +0200 akim
@@ -1,14 +1,13 @@
## Process this file with automake to create Makefile.in
perllibdir = $(pkgdatadir)/Autom4te
-perllib_DATA = General.pm Struct.pm
-EXTRA_DIST = $(perllib_DATA)
+dist_perllib_DATA = General.pm Struct.pm
## --------------- ##
## Building TAGS. ##
## --------------- ##
-TAGS_FILES = $(perllib_DATA)
+TAGS_FILES = $(dist_perllib_DATA)
ETAGS_ARGS = --lang=perl
Index: lib/autoconf/Makefile.am
--- lib/autoconf/Makefile.am Thu, 23 Aug 2001 23:06:00 +0200 akim
+++ lib/autoconf/Makefile.am Thu, 23 Aug 2001 23:26:16 +0200 akim
@@ -17,15 +17,12 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-distautoconflibdir = $(pkgdatadir)/autoconf
-distautoconflib_DATA = autoconf.m4 \
+autoconflibdir = $(pkgdatadir)/autoconf
+dist_autoconflib_DATA = autoconf.m4 \
general.m4 oldnames.m4 specific.m4 \
lang.m4 c.m4 fortran.m4 \
functions.m4 headers.m4 types.m4 libs.m4 programs.m4
-nodistautoconflibdir = $(pkgdatadir)/autoconf
-nodistautoconflib_DATA = autoconf.m4f
-
-EXTRA_DIST = $(distautoconflib_DATA)
+nodist_autoconflib_DATA = autoconf.m4f
@@ -33,7 +30,7 @@
## Building TAGS. ##
## --------------- ##
-TAGS_FILES = $(distautoconflib_DATA)
+TAGS_FILES = $(dist_autoconflib_DATA)
ETAGS_ARGS = --lang=none \
--regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
@@ -48,7 +45,7 @@
check-local:
if (cd $(srcdir) && \
- egrep '^_?EOF' $(distautoconflib_DATA)) >eof.log; then \
+ egrep '^_?EOF' $(dist_autoconflib_DATA)) >eof.log; then \
echo "ERROR: user EOF tags were used:" >&2; \
sed "s,^,$*.m4: ," <eof.log >&2; \
echo >&2; \
Index: lib/autotest/Makefile.am
--- lib/autotest/Makefile.am Thu, 23 Aug 2001 21:34:53 +0200 akim
+++ lib/autotest/Makefile.am Thu, 23 Aug 2001 23:26:31 +0200 akim
@@ -2,16 +2,15 @@
autotestlibdir = $(pkgdatadir)/autotest
-autotestlib_DATA = autotest.m4 general.m4
+dist_autotestlib_DATA = autotest.m4 general.m4
-EXTRA_DIST = $(autotestlib_DATA)
## --------------- ##
## Building TAGS. ##
## --------------- ##
-TAGS_FILES = $(autotestlib_DATA)
+TAGS_FILES = $(dist_autotestlib_DATA)
ETAGS_ARGS = --lang=none \
--regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
@@ -23,7 +22,7 @@
check-local:
if (cd $(srcdir) && \
- egrep '^_?EOF' $(autotestlib_DATA)) >eof.log; then \
+ egrep '^_?EOF' $(dist_autotestlib_DATA)) >eof.log; then \
echo "ERROR: user EOF tags were used:" >&2; \
sed "s,^,$*.m4: ," <eof.log >&2; \
echo >&2; \
Index: lib/autoscan/Makefile.am
--- lib/autoscan/Makefile.am Thu, 26 Jul 2001 21:23:21 +0200 akim
+++ lib/autoscan/Makefile.am Thu, 23 Aug 2001 23:33:07 +0200 akim
@@ -2,7 +2,5 @@
autoscanlibdir = $(pkgdatadir)/autoscan
-autoscanlib_DATA = headers libraries programs functions \
+dist_autoscanlib_DATA = headers libraries programs functions \
identifiers makevars
-
-EXTRA_DIST = $(autoscanlib_DATA)
Index: lib/m4sugar/Makefile.am
--- lib/m4sugar/Makefile.am Thu, 23 Aug 2001 23:06:00 +0200 akim
+++ lib/m4sugar/Makefile.am Thu, 23 Aug 2001 23:23:55 +0200 akim
@@ -1,11 +1,11 @@
## Process this file with automake to create Makefile.in
-distm4sugarlibdir = $(pkgdatadir)/m4sugar
+m4sugarlibdir = $(pkgdatadir)/m4sugar
# We ship version.m4 so that it's in src. `autoconf' wants all the sources
# at the same place...
-distm4sugarlib_DATA = version.m4 m4sugar.m4 m4sh.m4
+dist_m4sugarlib_DATA = version.m4 m4sugar.m4 m4sh.m4
-EXTRA_DIST = $(distm4sugarlib_DATA) version.in
+EXTRA_DIST = version.in
## ------------ ##
@@ -29,7 +29,7 @@
## Building TAGS. ##
## --------------- ##
-TAGS_FILES = $(m4sugarlib_DATA)
+TAGS_FILES = $(dist_m4sugarlib_DATA)
ETAGS_ARGS = --lang=none \
--regex='/\(A[CU]_DEFUN\|m4_\(defun\|define\)\|define\)(\[\([^]]*\)\]/\3/'
@@ -41,7 +41,7 @@
check-local:
if (cd $(srcdir) && \
- egrep '^_?EOF' $(distm4sugarlib_DATA)) >eof.log; then \
+ egrep '^_?EOF' $(dist_m4sugarlib_DATA)) >eof.log; then \
echo "ERROR: user EOF tags were used:" >&2; \
sed "s,^,$*.m4: ," <eof.log >&2; \
echo >&2; \
Index: m4/init.m4
--- m4/init.m4 Tue, 14 Aug 2001 01:47:02 +0200 akim
+++ m4/init.m4 Thu, 23 Aug 2001 23:13:49 +0200 akim
@@ -2,48 +2,88 @@
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
-# serial 2
+# serial 5
-# Copyright 2000 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean"
there first])
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
+# The purpose of this macro is to provide the user with a means to
+# check macros which are provided without letting her know how the
+# information is coded.
+# If this macro is not defined by Autoconf, define it here.
+ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [define([AC_PROVIDE_IFELSE],
+ [ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
+
+
+# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
+# ----------------------------------------------
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run \"make distclean\"
there first])
fi
+
+# Define the identity of the package.
+PACKAGE=$1
+AC_SUBST(PACKAGE)dnl
+VERSION=$2
+AC_SUBST(VERSION)dnl
ifelse([$3],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+ifdef([m4_pattern_allow],
+ [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
+
+# Autoconf 2.50 always computes EXEEXT. However we need to be
+# compatible with 2.13, for now. So we always define EXEEXT, but we
+# don't compute it.
+AC_SUBST(EXEEXT)
+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
+# requests that it be used. This is a bit dumb.
+: ${OBJEXT=o}
+AC_SUBST(OBJEXT)
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal)
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake)
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_][CC],
+ defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_][CXX],
+ defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
Index: m4/sanity.m4
--- m4/sanity.m4 Tue, 14 Aug 2001 01:47:02 +0200 akim
+++ m4/sanity.m4 Thu, 23 Aug 2001 23:14:17 +0200 akim
@@ -2,24 +2,11 @@
# Check to make sure that the build environment is sane.
#
-# Copyright 2000, 2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 3
-AC_DEFUN(AM_SANITY_CHECK,
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
@@ -31,12 +18,13 @@ AC_DEFUN(AM_SANITY_CHECK,
# directory).
if (
set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "[$]*" = "X"; then
+ if test "$[*]" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftest.file`
fi
- if test "[$]*" != "X $srcdir/configure conftest.file" \
- && test "[$]*" != "X conftest.file $srcdir/configure"; then
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -46,7 +34,7 @@ AC_DEFUN(AM_SANITY_CHECK,
alias in your environment])
fi
- test "[$]2" = conftest.file
+ test "$[2]" = conftest.file
)
then
# Ok.
@@ -55,5 +43,4 @@ AC_DEFUN(AM_SANITY_CHECK,
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-rm -f conftest*
-AC_MSG_RESULT([yes])])
+AC_MSG_RESULT(yes)])
Index: man/Makefile.am
--- man/Makefile.am Wed, 01 Aug 2001 23:34:52 +0200 akim
+++ man/Makefile.am Thu, 23 Aug 2001 23:12:13 +0200 akim
@@ -18,13 +18,13 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
+dist_man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
autoscan.1 autom4te.1 config.guess.1 config.sub.1
man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
autoscan.x autom4te.x config.guess.x config.sub.x
-EXTRA_DIST = $(man_MANS) $(man_aux) common.x
+EXTRA_DIST = $(man_aux) common.x
MAINTAINERCLEANFILES = $(man_MANS)
# Depend on configure.ac to get version number changes.
Index: m4/auxdir.m4
--- 0.711/m4/auxdir.m4 Fri, 24 Aug 2001 08:00:22 +0200 akim ()
+++ m4/auxdir.m4 Thu, 23 Aug 2001 23:14:33 +0200 akim
@@ -0,0 +1,44 @@
+# AM_AUX_DIR_EXPAND
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+])
Index: m4/cond.m4
--- 0.711/m4/cond.m4 Fri, 24 Aug 2001 08:00:22 +0200 akim ()
+++ m4/cond.m4 Thu, 23 Aug 2001 23:14:52 +0200 akim
@@ -0,0 +1,26 @@
+# serial 3
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+#
+# FIXME: Once using 2.50, use this:
+# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],
+ [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+ifelse([$1], [FALSE],
+ [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi])
Index: m4/depend.m4
--- 0.711/m4/depend.m4 Fri, 24 Aug 2001 08:00:22 +0200 akim ()
+++ m4/depend.m4 Thu, 23 Aug 2001 23:15:07 +0200 akim
@@ -0,0 +1,130 @@
+# serial 4 -*- Autoconf -*-
+
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ---------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX" or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
+AC_SUBST([$1DEPMODE])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+ DEPDIR=.deps
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST(DEPDIR)
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+pushdef([subst], defn([AC_SUBST]))
+subst(AMDEPBACKSLASH)
+popdef([subst])
+])
Index: m4/install-sh.m4
--- 0.711/m4/install-sh.m4 Fri, 24 Aug 2001 08:00:22 +0200 akim ()
+++ m4/install-sh.m4 Thu, 23 Aug 2001 23:14:27 +0200 akim
@@ -0,0 +1,7 @@
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
Index: m4/strip.m4
--- 0.711/m4/strip.m4 Fri, 24 Aug 2001 08:00:22 +0200 akim ()
+++ m4/strip.m4 Thu, 23 Aug 2001 23:18:34 +0200 akim
@@ -0,0 +1,11 @@
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- 47-fyi-automake-1-5.patch,
Akim Demaille <=