$NetBSD: patch-aa,v 1.8 2012/10/24 15:32:56 joerg Exp $

--- configure.py.orig	2009-06-16 08:47:29.000000000 +0000
+++ configure.py
@@ -195,7 +195,7 @@ class ConfigurePyQt3(ConfigureBase):
     """This class defines the methods to configure PyQt v3.
     """
     def check_modules(self):
-        pyqt_modules.append("qt")
+        #pyqt_modules.append("qt")
 
         check_module("qtcanvas", "qcanvas.h", "QCanvas()")
         check_module("qtnetwork", "qsocket.h", "QSocket()")
@@ -212,8 +212,6 @@ class ConfigurePyQt3(ConfigureBase):
                 if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
                     check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
 
-        if qsci_version:
-            check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
 
         if opt_qtpetag:
             pyqt_modules.append("qtpe")
@@ -258,27 +256,27 @@ class ConfigurePyQt3(ConfigureBase):
         }
 
     def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
-        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
+        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void")
 
         if "qtext" in pyqt_modules:
-            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
+            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, extra_cxxflags="-DANY=void")
 
         if "qtgl" in pyqt_modules:
-            generate_code("qtgl", opengl=1)
+            generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void")
 
         if "qtpe" in pyqt_modules:
-            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags)
+            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void")
 
         if "qtui" in pyqt_modules:
-            generate_code("qtui", extra_libs=["qui"])
+            generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void")
 
         if "qtaxcontainer" in pyqt_modules:
-            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"])
+            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void")
 
         # The rest don't need special handling.
         for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"):
             if m in pyqt_modules:
-                generate_code(m)
+                generate_code(m, extra_cxxflags="-DANY=void")
 
     def tools(self):
         tool_dirs = []
@@ -286,65 +284,6 @@ class ConfigurePyQt3(ConfigureBase):
         if qt_version >= 0x030000:
             # The Professional Edition needs special handling.
             prof = (qt_edition == "professional")
-
-            sipconfig.inform("Creating pyuic Makefile...")
-
-            if prof or "qtxml" not in pyqt_modules:
-                buildfile= "pyuic-prof.sbf"
-
-                for xml in ("qdom.cpp", "qxml.cpp"):
-                    shutil.copyfile(qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
-            else:
-                buildfile= "pyuic.sbf"
-
-            makefile = sipconfig.ProgramMakefile(
-                configuration=sipcfg,
-                build_file=buildfile,
-                dir="pyuic3",
-                install_dir=opt_pyqtbindir,
-                console=1,
-                qt=1,
-                warnings=1
-            )
-
-            makefile.extra_defines.append("UIC")
-            makefile.extra_defines.append("QT_INTERNAL_XML")
-
-            if prof or "qtxml" not in pyqt_modules:
-                makefile.extra_defines.append("QT_MODULE_XML")
-
-            if qt_version < 0x030100:
-                makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
-
-            makefile.generate()
-            tool_dirs.append("pyuic3")
-
-            sipconfig.inform("Creating pylupdate Makefile...")
-
-            if prof or "qtxml" not in pyqt_modules:
-                buildfile= "pylupdate-prof.sbf"
-
-                shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
-            else:
-                buildfile= "pylupdate.sbf"
-
-            makefile = sipconfig.ProgramMakefile(
-                configuration=sipcfg,
-                build_file=buildfile,
-                dir="pylupdate3",
-                install_dir=opt_pyqtbindir,
-                console=1,
-                qt=1,
-                warnings=1
-            )
-
-            makefile.extra_defines.append("QT_INTERNAL_XML")
-
-            if prof or "qtxml" not in pyqt_modules:
-                makefile.extra_defines.append("QT_MODULE_XML")
-
-            makefile.generate()
-            tool_dirs.append("pylupdate3")
         elif qt_version >= 0x020000:
             sipconfig.inform("Creating pyuic Makefile...")
 
@@ -1010,7 +949,7 @@ Type 'no' to decline the terms of the li
 
 """)
 
-    while 1:
+    while 0:
         try:
             resp = raw_input("Do you accept the terms of the license? ")
         except:
@@ -1392,7 +1331,7 @@ def main(argv):
     check_license()
 
     # Check for QScintilla.
-    check_qscintilla()
+    #check_qscintilla()
 
     # Check which modules to build.
     qtmod_lib = pyqt.check_modules()