For purposes of backwards compatibility, Debian provides both autoconf 2.52
and autoconf 2.13 and autodetects whether features from autoconf 2.50 are
required.  PHP CVS has a stated dependency on autoconf 2.50, but this
dependency isn't obvious enough for the autodetection to pick up on it.
Debian defaults to autoconf 2.13 when invoked, and PHP fails to build.

One way to make this dependency on autoconf 2.50 more obvious is to rename
configure.in to configure.ac.  This is the preferred name for the m4 sources
under autoconf 2.50, so it would be a good move to make anyway.

This patch makes the changes necessary to support moving configure.in to
configure.ac.  It should of course be accompanied by an actual rename of that
file in CVS.

Steve Langasek
postmodern programmer

Index: build/build2.mk
RCS file: /repository/php4/build/build2.mk,v
retrieving revision 1.21
diff -u -w -r1.21 build2.mk
--- build/build2.mk     10 Jun 2001 13:51:18 -0000      1.21
+++ build/build2.mk     4 Sep 2001 02:24:55 -0000
@@ -45,7 +45,7 @@
        @echo rebuilding $@
        cat $(acconfig_h_SOURCES) > $@

-$(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_files)
+$(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.ac $(config_m4_files)
        @echo rebuilding Makefile templates
        @for i in $(LT_TARGETS); do \
                if test -f "$$i"; then \
@@ -57,7 +57,7 @@
        automake -a $$flag $(AMFLAGS) $(makefile_files) 2>&1 | $(SUPPRESS_WARNINGS)
        @for i in $(LT_TARGETS); do mv $$i.bak $$i; done

-aclocal.m4: configure.in acinclude.m4 dynlib.m4
+aclocal.m4: configure.ac acinclude.m4 dynlib.m4
        aclocal 2>&1 | $(SUPPRESS_WARNINGS)

 SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow 
cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*|defined 
in acinclude.m4 but never used)'||true)
@@ -72,6 +72,6 @@
        touch $(TOUCH_FILES)

-configure: aclocal.m4 configure.in $(config_m4_files)
+configure: aclocal.m4 configure.ac $(config_m4_files)
        @echo rebuilding $@
        @autoconf 2>&1 | $(SUPPRESS_WARNINGS)

PHP Development Mailing List <http://www.php.net/>
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Reply via email to