# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1607994038 0
# Node ID 6cdb907755cb11ba80d0f177488e9895d6072864
# Parent  62e5cc4bc3473f2fd7f05e9d2a0e2e837d92ba5c
Mac: Add "classic" as an optional architecure for 10.5-10.6 era fat binaries
supporting 32bit and 64bit Intel and 32-bit PowerPC. Remove "all" and "64bit"
options since there are no Xcode versions that will build these combinations.

diff -r 62e5cc4bc347 -r 6cdb907755cb configure
--- a/configure	Mon Dec 14 23:03:47 2020 +0000
+++ b/configure	Tue Dec 15 01:00:38 2020 +0000
@@ -1410,7 +1410,7 @@
   --with-dwcompat         specify this to build the optional dwcompat library
   --with-gtk2             specify this to build with GTK+ 2.x if available
   --with-deprecated       specify this to build with deprecated functions
-  --with-arch             specify MacOS architecture: one of modern, all, 32bit, 64bit, intel, arm, ppc, ppc64, x86_64, i386
+  --with-arch             specify MacOS architecture: one of modern, classic, 32bit, intel, arm, powerpc
   --with-sdk              specify this to build with an alternate MacOS SDK location
   --with-x                use the X Window System
   --with-glib-prefix=PFX  Prefix where GLIB is installed (optional)
@@ -4660,15 +4660,12 @@
          no)
             ARCH=""
             ;;
-         all)
-            ARCH="-arch ppc -arch ppc64 -arch x86_64 -arch i386 -arch arm64"
+         classic)
+            ARCH="-arch ppc -arch x86_64 -arch i386"
             ;;
          32bit)
             ARCH="-arch ppc -arch i386"
             ;;
-         64bit)
-            ARCH="-arch ppc64 -arch x86_64 -arch arm64"
-            ;;
          intel)
             ARCH="-arch i386 -arch x86_64"
             ;;
diff -r 62e5cc4bc347 -r 6cdb907755cb configure.in
--- a/configure.in	Mon Dec 14 23:03:47 2020 +0000
+++ b/configure.in	Tue Dec 15 01:00:38 2020 +0000
@@ -64,7 +64,7 @@
 
 dnl ---------------------- check for '--with-arch' switch -----------------
 AC_ARG_WITH(arch,
-   [  --with-arch             specify MacOS architecture: one of modern, all, 32bit, 64bit, intel, arm, ppc, ppc64, x86_64, i386],
+   [  --with-arch             specify MacOS architecture: one of modern, classic, 32bit, intel, arm, powerpc],
    [with_arch=$withval],
    [with_arch=no],
 )
@@ -126,15 +126,12 @@
          no)
             ARCH=""
             ;;
-         all)
-            ARCH="-arch ppc -arch ppc64 -arch x86_64 -arch i386 -arch arm64"
+         classic)
+            ARCH="-arch ppc -arch x86_64 -arch i386"
             ;;
          32bit)
             ARCH="-arch ppc -arch i386"
             ;;
-         64bit)
-            ARCH="-arch ppc64 -arch x86_64 -arch arm64"
-            ;;
          intel)
             ARCH="-arch i386 -arch x86_64"
             ;;