From: Stig Bakken <ssb@php.net>
Date: Wed, 21 Apr 1999 13:47:05 +0000 (+0000)
Subject: autoheader must be called after autoconf, automake after autoheader
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~259
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02f9dc6460ee3e2ee996cb268a253d71a56ada51;p=php

autoheader must be called after autoconf, automake after autoheader
---

diff --git a/buildconf b/buildconf
index 297e2c9aca..99957a764b 100755
--- a/buildconf
+++ b/buildconf
@@ -2,12 +2,6 @@
 
 ./scripts/preconfig
 
-if test -f mkinstalldirs; then
-    automake
-else
-    automake --add-missing
-fi
-
 mv aclocal.m4 aclocal.m4.old 2>/dev/null
 aclocal
 if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
@@ -26,5 +20,8 @@ else
     echo created or modified configure
 fi
 
+autoheader
+automake --add-missing --include-deps
+
 cd libzend; ./buildconf
 
diff --git a/scripts/preconfig b/scripts/preconfig
index 40d182d8f0..dbba3147c3 100755
--- a/scripts/preconfig
+++ b/scripts/preconfig
@@ -19,7 +19,6 @@ if test "$confighfiles" != "ext/*/config.h.stub"; then
 fi
 if ! cmp acconfig.h acconfig.h.new > /dev/null 2>&1; then
     mv acconfig.h.new acconfig.h
-    autoheader
 else
     rm -f acconfig.h.new
 fi