0
@@ -399,6 +399,47 @@ AC_DEFUN([MP_PATH_FRAMEWORKS],[
0
     AC_SUBST(MPFRAMEWORKSDIR)
0
 ])
0
 
0
+
0
+# MP_UNIVERSAL_OPTIONS
0
+#---------------------------------------
0
+AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
0
+
0
+    AC_ARG_WITH(universal-target,[AC_HELP_STRING([--with-universal-target=MDT], [Universal MACOSX_DEPLOYMENT_TARGET version])], UNIVERSAL_TARGET=${withval})
0
+    AC_ARG_WITH(universal-sysroot,[AC_HELP_STRING([--with-universal-sysroot=SDK], [Universal SDK sysroot (with complete path)])], UNIVERSAL_SYSROOT=${withval})
0
+    AC_ARG_WITH(universal-archs,[AC_HELP_STRING([--with-universal-archs="CPU"], [Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
0
+
0
+	if test "x$UNIVERSAL_TARGET" = "x"; then
0
+	    if [test -d /Developer/SDKs/MacOSX10.5.sdk]; then
0
+		UNIVERSAL_TARGET=10.5
0
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
0
+	    else
0
+		UNIVERSAL_TARGET=10.4
0
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk
0
+	    fi
0
+	else
0
+	    if test "x$UNIVERSAL_SYSROOT" = "x"; then
0
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${UNIVERSAL_TARGET}.sdk
0
+	    fi
0
+	fi
0
+
0
+	if test "x$UNIVERSAL_ARCHS" = "x"; then
0
+		#UNIVERSAL_ARCHS="ppc ppc64 i386 x86_64"
0
+		UNIVERSAL_ARCHS="ppc i386"
0
+	fi
0
+    
0
+    AC_MSG_CHECKING([for Universal MDT version])
0
+    AC_MSG_RESULT([$UNIVERSAL_TARGET])
0
+    AC_SUBST(UNIVERSAL_TARGET)
0
+
0
+    AC_MSG_CHECKING([for Universal SDK sysroot])
0
+    AC_MSG_RESULT([$UNIVERSAL_SYSROOT])
0
+    AC_SUBST(UNIVERSAL_SYSROOT)
0
+
0
+    AC_MSG_CHECKING([for Universal CPU architectures])
0
+    AC_MSG_RESULT([$UNIVERSAL_ARCHS])
0
+    AC_SUBST(UNIVERSAL_ARCHS)
0
+])
0
+
0
 # MP_LIB_MD5
0
 #---------------------------------------
0
 # Check for an md5 implementation

0
@@ -730,6 +730,9 @@ DSTGRP
0
 DSTMODE
0
 MPAPPLICATIONSDIR
0
 MPFRAMEWORKSDIR
0
+UNIVERSAL_TARGET
0
+UNIVERSAL_SYSROOT
0
+UNIVERSAL_ARCHS
0
 CPP
0
 READLINK_IS_NOT_P1003_1A
0
 MD5_LIBS
0
@@ -1400,6 +1403,12 @@ Optional Packages:
0
                           Specify directory mode of installed directories
0
   --with-applications-dir Applications installation directory.
0
   --with-frameworks-dir   Frameworks installation directory.
0
+  --with-universal-target=MDT
0
+                          Universal MACOSX_DEPLOYMENT_TARGET version
0
+  --with-universal-sysroot=SDK
0
+                          Universal SDK sysroot (with complete path)
0
+  --with-universal-archs="CPU"
0
+                          Universal CPU architectures (space separated)
0
   --with-x11-prefix=PREFIX
0
                           use PREFIX as the X11 base dir (default autodetect)
0
   --with-x                use the X Window System
0
@@ -6812,6 +6821,66 @@ echo "${ECHO_T}$MPFRAMEWORKSDIR" >&6; }
0
 
0
 
0
 
0
+# Check for universal options
0
+
0
+
0
+
0
+# Check whether --with-universal-target was given.
0
+if test "${with_universal_target+set}" = set; then
0
+  withval=$with_universal_target; UNIVERSAL_TARGET=${withval}
0
+fi
0
+
0
+
0
+# Check whether --with-universal-sysroot was given.
0
+if test "${with_universal_sysroot+set}" = set; then
0
+  withval=$with_universal_sysroot; UNIVERSAL_SYSROOT=${withval}
0
+fi
0
+
0
+
0
+# Check whether --with-universal-archs was given.
0
+if test "${with_universal_archs+set}" = set; then
0
+  withval=$with_universal_archs; UNIVERSAL_ARCHS=${withval}
0
+fi
0
+
0
+
0
+	if test "x$UNIVERSAL_TARGET" = "x"; then
0
+	    if test -d /Developer/SDKs/MacOSX10.5.sdk; then
0
+		UNIVERSAL_TARGET=10.5
0
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
0
+	    else
0
+		UNIVERSAL_TARGET=10.4
0
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk
0
+	    fi
0
+	else
0
+	    if test "x$UNIVERSAL_SYSROOT" = "x"; then
0
+		UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${UNIVERSAL_TARGET}.sdk
0
+	    fi
0
+	fi
0
+
0
+	if test "x$UNIVERSAL_ARCHS" = "x"; then
0
+		#UNIVERSAL_ARCHS="ppc ppc64 i386 x86_64"
0
+		UNIVERSAL_ARCHS="ppc i386"
0
+	fi
0
+
0
+    { echo "$as_me:$LINENO: checking for Universal MDT version" >&5
0
+echo $ECHO_N "checking for Universal MDT version... $ECHO_C" >&6; }
0
+    { echo "$as_me:$LINENO: result: $UNIVERSAL_TARGET" >&5
0
+echo "${ECHO_T}$UNIVERSAL_TARGET" >&6; }
0
+
0
+
0
+    { echo "$as_me:$LINENO: checking for Universal SDK sysroot" >&5
0
+echo $ECHO_N "checking for Universal SDK sysroot... $ECHO_C" >&6; }
0
+    { echo "$as_me:$LINENO: result: $UNIVERSAL_SYSROOT" >&5
0
+echo "${ECHO_T}$UNIVERSAL_SYSROOT" >&6; }
0
+
0
+
0
+    { echo "$as_me:$LINENO: checking for Universal CPU architectures" >&5
0
+echo $ECHO_N "checking for Universal CPU architectures... $ECHO_C" >&6; }
0
+    { echo "$as_me:$LINENO: result: $UNIVERSAL_ARCHS" >&5
0
+echo "${ECHO_T}$UNIVERSAL_ARCHS" >&6; }
0
+
0
+
0
+
0
 # Check for standard header files.
0
 ac_ext=c
0
 ac_cpp='$CPP $CPPFLAGS'
0
@@ -13061,6 +13130,9 @@ DSTGRP!$DSTGRP$ac_delim
0
 DSTMODE!$DSTMODE$ac_delim
0
 MPAPPLICATIONSDIR!$MPAPPLICATIONSDIR$ac_delim
0
 MPFRAMEWORKSDIR!$MPFRAMEWORKSDIR$ac_delim
0
+UNIVERSAL_TARGET!$UNIVERSAL_TARGET$ac_delim
0
+UNIVERSAL_SYSROOT!$UNIVERSAL_SYSROOT$ac_delim
0
+UNIVERSAL_ARCHS!$UNIVERSAL_ARCHS$ac_delim
0
 CPP!$CPP$ac_delim
0
 READLINK_IS_NOT_P1003_1A!$READLINK_IS_NOT_P1003_1A$ac_delim
0
 MD5_LIBS!$MD5_LIBS$ac_delim
0
@@ -13108,7 +13180,7 @@ LIBOBJS!$LIBOBJS$ac_delim
0
 LTLIBOBJS!$LTLIBOBJS$ac_delim
0
 _ACEOF
0
 
0
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
0
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
0
     break
0
   elif $ac_last_try; then
0
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

0
@@ -142,6 +142,9 @@ MP_DIRECTORY_MODE
0
 MP_PATH_APPLICATIONS
0
 MP_PATH_FRAMEWORKS
0
 
0
+# Check for universal options
0
+MP_UNIVERSAL_OPTIONS
0
+
0
 # Check for standard header files.
0
 AC_HEADER_STDC
0
 AC_HEADER_DIRENT

0
@@ -78,13 +78,13 @@ rsync_options    -rtzv --delete-after
0
 # Options for Universal Binaries (+universal variant)
0
 
0
 # MACOSX_DEPLOYMENT_TARGET
0
-universal_target	10.4
0
+universal_target	@UNIVERSAL_TARGET@
0
 
0
 # the SDK "sysroot" to use 
0
-universal_sysroot	/Developer/SDKs/MacOSX10.4u.sdk
0
+universal_sysroot	@UNIVERSAL_SYSROOT@
0
 
0
 # machine architectures
0
-universal_archs		ppc i386
0
+universal_archs		@UNIVERSAL_ARCHS@
0
 
0
 # Options for generated startup items
0
 # startupitem_type may be "default", "systemstarter", "launchd", or "none";