revert part of last change, run configure from the builddir or cwd, not from configur...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/tools/builder.py b/build/tools/builder.py
index c69d26ab102cf2942a671a095304328732368c68..4087cf53b376a16e0c7f94951d6e54550c0e4f8a 100755 (executable)
--- a/build/tools/builder.py
+++ b/build/tools/builder.py
@@ -153,10 +153,13 @@ class AutoconfBuilder(GNUMakeBuilder):
     def __init__(self, formatName="autoconf"):
         GNUMakeBuilder.__init__(self, formatName=formatName)
 
-    def configure(self, dir=None, options=[]):
-        if not dir:
-            dir = os.getcwd()
+    def configure(self, dir=None, options=None):
+        #olddir = os.getcwd()
+        #os.chdir(dir)
+
         configdir = dir
+        if not dir:
+            configdir = os.getcwd()
 
         configure_cmd = ""
         while os.path.exists(configdir):
@@ -175,14 +178,11 @@ class AutoconfBuilder(GNUMakeBuilder):
             sys.stderr.write("Could not find configure script at %r. Have you run autoconf?\n" % dir)
             return 1
 
-        olddir = os.getcwd()
-        os.chdir(configdir)
-
         optionsStr = " ".join(options) if options else ""
-        command = "./configure %s" % optionsStr
+        command = "%s %s" % (configure_cmd, optionsStr)
         print(command)
         result = os.system(command)
-        os.chdir(olddir)
+        #os.chdir(olddir)
         return result