Skip to content

Commit

Permalink
Replace brain-dead Autoconf macros AC_ARG_{ENABLE,WITH} with something
Browse files Browse the repository at this point in the history
that's actually useful, robust, consistent.

Better plan to generate aclocal.m4 as well: use m4 include directives,
rather than cat.
  • Loading branch information
petere committed Sep 21, 2000
1 parent b4c8d47 commit 3533718
Show file tree
Hide file tree
Showing 6 changed files with 1,170 additions and 1,467 deletions.
21 changes: 1 addition & 20 deletions GNUmakefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# PostgreSQL top level makefile
#
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.11 2000/08/31 16:08:58 petere Exp $
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.12 2000/09/21 20:17:41 petere Exp $
#

subdir =
Expand Down Expand Up @@ -34,25 +34,6 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status


# These dependencies are risky because both the target and the sources
# are in CVS and CVS doesn't preserve timestamps, thus leading to
# unnecessary reruns of these rules.

AUTOCONF = autoconf

# Only use this rule if you actually said `make configure'.
ifeq ($(MAKECMDGOALS),configure)
$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
cd $(top_srcdir) && $(AUTOCONF)
endif

# This one we can leave unprotected because by default nothing depends
# on aclocal.m4. This rule is only invoked if you say `make
# aclocal.m4' or `make configure'.
$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
cat $^ > $@


##########################################################################

distdir := postgresql-$(VERSION)
Expand Down
Loading

0 comments on commit 3533718

Please sign in to comment.