--- configure.orig	2012-09-19 09:17:45.000000000 -0400
+++ configure	2012-09-19 09:20:17.000000000 -0400
@@ -504,24 +504,8 @@
 	bool exec()
 	{
 #ifdef Q_OS_MAC
-		if(qc_getenv("QC_UNIVERSAL") == "Y")
-		{
-			qc_universal_enabled = true;
-
-			QString str =
-			"contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-			"	CONFIG += x86 ppc\n"
-			"}\n";
-
-			QString sdk = qc_getenv("QC_MAC_SDK");
-			if(!sdk.isEmpty())
-			{
-				str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
-				qc_universal_sdk = sdk;
-			}
-
-			conf->addExtra(str);
-		}
+		QString str = "CONFIG += @ARCHES@\n";
+		conf->addExtra(str);
 #endif
 		return true;
 	}
@@ -537,18 +521,7 @@
 // based on crypto.prf. any changes made to that file need to be tracked here.
 static QString internal_crypto_prf(const QString &incdir, const QString &libdir)
 {
-	QString out = QString(
-	"CONFIG *= qt\n"
-	"INCLUDEPATH += %1/QtCrypto\n"
-	"LIBS += -L%2\n"
-	"\n"
-	"LINKAGE = -lqca\n"
-	"CONFIG(debug, debug|release) {\n"
-        "	windows:LINKAGE = -lqcad\n"
-        "	mac:LINKAGE = -lqca_debug\n"
-	"}\n"
-	"LIBS += \$\$LINKAGE\n"
-	).arg(incdir, libdir);
+	QString out = QString("CONFIG *= crypto\n");
 	return out;
 }