From b19f771f5216055c9c7e6c001dba7d4b6559ba21 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 30 Jul 2003 17:14:22 +0000
Subject: [PATCH] don't run autoconf automatically, it's problematic on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
build/bakefiles/Makefile | 4 ----
build/bakefiles/regenMakefile.py | 4 +---
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 00bf8bd52d..f2befb9174 100644
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -9,7 +9,6 @@ SDEPS = config.bkl common.bkl common_samples.bkl
MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
AUTOCONF_ALL = \
../../Makefile.in \
- ../../configure \
../../contrib/samples/animate/Makefile.in \
../../contrib/samples/svg/Makefile.in \
../../contrib/samples/xrc/Makefile.in \
@@ -499,7 +498,6 @@ watcom: $(WATCOM_ALL)
clean:
rm -f ../../autoconf_inc.m4
rm -f ../../Makefile.in
- rm -f ../../configure
rm -f ../../contrib/samples/animate/Makefile.in
rm -f ../../contrib/samples/svg/Makefile.in
rm -f ../../contrib/samples/xrc/Makefile.in
@@ -979,8 +977,6 @@ clean:
library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
../../autoconf_inc.m4: ../../Makefile.in
-../../configure: ../../autoconf_inc.m4
- (cd ../.. ; aclocal && autoconf)
Makefile: regenMakefile.py
./regenMakefile.py
diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 2f63fe387e..94e85d11f9 100755
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -23,7 +23,7 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
lines = {}
all = {}
-all['autoconf'] = ['../../configure']
+all['autoconf'] = []
linesCur = None
@@ -171,8 +171,6 @@ clean:
library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
../../autoconf_inc.m4: ../../Makefile.in
-../../configure: ../../autoconf_inc.m4
-\t(cd ../.. ; aclocal && autoconf)
Makefile: regenMakefile.py
\t./regenMakefile.py
--
2.47.2