Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3533718

Browse files
committed
Replace brain-dead Autoconf macros AC_ARG_{ENABLE,WITH} with something
that's actually useful, robust, consistent. Better plan to generate aclocal.m4 as well: use m4 include directives, rather than cat.
1 parent b4c8d47 commit 3533718

File tree

6 files changed

+1170
-1467
lines changed

6 files changed

+1170
-1467
lines changed

GNUmakefile.in

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.11 2000/08/31 16:08:58 petere Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.12 2000/09/21 20:17:41 petere Exp $
55
#
66

77
subdir =
@@ -34,25 +34,6 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
3434
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
3535

3636

37-
# These dependencies are risky because both the target and the sources
38-
# are in CVS and CVS doesn't preserve timestamps, thus leading to
39-
# unnecessary reruns of these rules.
40-
41-
AUTOCONF = autoconf
42-
43-
# Only use this rule if you actually said `make configure'.
44-
ifeq ($(MAKECMDGOALS),configure)
45-
$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
46-
cd $(top_srcdir) && $(AUTOCONF)
47-
endif
48-
49-
# This one we can leave unprotected because by default nothing depends
50-
# on aclocal.m4. This rule is only invoked if you say `make
51-
# aclocal.m4' or `make configure'.
52-
$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
53-
cat $^ > $@
54-
55-
5637
##########################################################################
5738

5839
distdir := postgresql-$(VERSION)

0 commit comments

Comments
 (0)