[vidalia-svn] r1421: Add a --enable-fat-binary switch to configure.in, to build V (trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-11-03 16:02:29 -0500 (Fri, 03 Nov 2006)
New Revision: 1421

Modified:
   trunk/Vidalia.pro
   trunk/configure.in
Log:
Add a --enable-fat-binary switch to configure.in, to build Vidalia as a Universal binary.


Modified: trunk/Vidalia.pro
===================================================================
--- trunk/Vidalia.pro	2006-11-03 20:01:14 UTC (rev 1420)
+++ trunk/Vidalia.pro	2006-11-03 21:02:29 UTC (rev 1421)
@@ -45,6 +45,13 @@
   # Set the deployment target so we stop getting linker warnings
   # not having this set. (target Panther and newer)
   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
+  
+  !isEmpty(UNIVERSAL_BINARY) {
+    # Build a Universal binary
+    CONFIG += x86 ppc
+    QMAKE_SDK_PATH=/Developer/SDKs/MacOSX10.4u.sdk
+    QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+  }
 }
 unix {
   # Setup the `make install` target

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-11-03 20:01:14 UTC (rev 1420)
+++ trunk/configure.in	2006-11-03 21:02:29 UTC (rev 1421)
@@ -79,9 +79,9 @@
 saved_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="-I$QTDATA/include -I$QTDATA/include/QtCore -I$QTDATA/include/QtGui"
 
-# On Mac, we need to see if Qt is built as a series of frameworks
 os=`uname -s`
 if test $os = "Darwin"; then
+  # On Mac, we need to see if Qt is built as a series of frameworks
   AC_CACHE_CHECK([if Qt is built as a framework], ac_cv_qt_is_framework, [
     saved_LDFLAGS="$LDFLAGS"
     saved_LIBS="$LIBS"
@@ -97,6 +97,17 @@
   if test "$ac_cv_qt_is_framework" = yes; then
     framework=yes
   fi
+  
+  # Determine whether we are supposed to build a Universal binary
+  AC_ARG_ENABLE(fat_binary,
+    AC_HELP_STRING(--enable-fat-binary, Build a Mac OS X Universal binary))
+  AC_MSG_CHECKING([if we are building a Universal binary])
+  if test x$enable_fat_binary = xyes; then
+    AC_MSG_RESULT(yes)
+    QFLAGS="$QFLAGS UNIVERSAL_BINARY=yes"
+  else
+    AC_MSG_RESULT(no)
+  fi
 fi
 
 # Determine whether we should link to the debug versions of Qt or not
@@ -131,6 +142,7 @@
 fi
 AC_MSG_NOTICE([Building in $BUILDMODE mode])
 CXXFLAGS="$saved_CXXFLAGS"
+QFLAGS="$QFLAGS -config $BUILDMODE"
 
 # Clean out an existing Makefile
 AC_CHECK_FILE(Makefile, [rm Makefile])
@@ -158,11 +170,15 @@
 AC_MSG_NOTICE([Processing language translations...])
 $LRELEASE $PROFILE
 
+# Pass the installation prefix to qmake
+QFLAGS="$QFLAGS PREFIX=$prefix"
+
 # Make sure ${prefix} (which can be contained in $mandir) is evaluted 
 # before passing it to qmake
 MANPAGEDIR=`eval echo $mandir`
+QFLAGS="$QFLAGS MANDIR=$MANPAGEDIR"
 
 # Run qmake to generate the Makefile
 AC_MSG_NOTICE([Running qmake...])
-$QMAKE -config $BUILDMODE PREFIX=$prefix MANDIR=$MANPAGEDIR $PROFILE
+$QMAKE $QFLAGS $PROFILE