* Fix some Darwin configure errors

autotools/includes/acinclude.m4

@@ -269,15 +269,7 @@ AC_CACHE_CHECK(system machine, egg_cv_var_system_machine, egg_cv_var_system_mach
 
 BUILDOS="$egg_cv_var_system_type"
 BUILDARCH="$egg_cv_var_system_machine"
-
-case "$egg_cv_var_system_machine" in
-  i*)
-    CXX="$CXX -march=i486"
-    BUILDARCH="i486"
-  ;;
-  *)
-  ;;
-esac
+USE_GENERIC_I486="yes"
 
 case "$egg_cv_var_system_type" in
   BSD/OS)
@@ -334,6 +326,7 @@ case "$egg_cv_var_system_type" in
   ;;
   Darwin)
     USE_STATIC="no"
+    USE_GENERIC_I486="no"
   ;;
   *BSD)
     # FreeBSD/OpenBSD/NetBSD
@@ -357,6 +350,18 @@ case "$egg_cv_var_system_type" in
     fi
   ;;
 esac
+
+case "$egg_cv_var_system_machine" in
+  i*)
+    if test "$USE_GENERIC_I486" = "yes"; then
+      CXX="$CXX -march=i486"
+      BUILDARCH="i486"
+    fi
+  ;;
+  *)
+  ;;
+esac
+
 AC_SUBST(BUILDOS)dnl
 AC_SUBST(BUILDARCH)dnl
 ])

configure

@@ -4379,15 +4379,7 @@ $as_echo "$egg_cv_var_system_machine" >&6; }
 
 BUILDOS="$egg_cv_var_system_type"
 BUILDARCH="$egg_cv_var_system_machine"
-
-case "$egg_cv_var_system_machine" in
-  i*)
-    CXX="$CXX -march=i486"
-    BUILDARCH="i486"
-  ;;
-  *)
-  ;;
-esac
+USE_GENERIC_I486="yes"
 
 case "$egg_cv_var_system_type" in
   BSD/OS)
@@ -4601,6 +4593,7 @@ _ACEOF
   ;;
   Darwin)
     USE_STATIC="no"
+    USE_GENERIC_I486="no"
   ;;
   *BSD)
     # FreeBSD/OpenBSD/NetBSD
@@ -4635,6 +4628,18 @@ $as_echo "Something unknown!" >&6; }
   ;;
 esac
 
+case "$egg_cv_var_system_machine" in
+  i*)
+    if test "$USE_GENERIC_I486" = "yes"; then
+      CXX="$CXX -march=i486"
+      BUILDARCH="i486"
+    fi
+  ;;
+  *)
+  ;;
+esac
+
+
 
 # Check for IPv6 support
 #EGG_IPV6_SUPPORTED