From: Steven Tamm <steventamm@mac.com>
Date: Tue, 25 Oct 2005 01:09:39 +0000 (+0000)
Subject: Fix darwin386 configuration issue
X-Git-Tag: emacs-pretest-22.0.90~6314
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eae5401854b60c4189f051fca5389d85955a3550;p=emacs.git

Fix darwin386 configuration issue
---

diff --git a/ChangeLog b/ChangeLog
index 5fe69b9824b..6a3343afb0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-24  Steven Tamm  <steventamm@mac.com>
+
+	* configure.in: Fix darwin386 configuration issue
+	* configure: Regenerate
+
 2005-10-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* INSTALL.CVS: Add mh-autoloads to the partial rebuild procedure.
diff --git a/configure b/configure
index dd440dc2b79..d19ecefe27c 100755
--- a/configure
+++ b/configure
@@ -2571,7 +2571,7 @@ _ACEOF
     machine=intel386
     case "${canonical}" in
       *-cygwin )                opsys=cygwin ;;
-      *-darwin )                opsys=darwin
+      *-darwin* )               opsys=darwin
                                 CPP="${CC-cc} -E -no-cpp-precomp"
  				;;
       *-isc1.* | *-isc2.[01]* )	opsys=386-ix ;;
@@ -2629,12 +2629,6 @@ _ACEOF
     machine=powermac opsys=darwin
     # Define CPP as follows to make autoconf work correctly.
     CPP="${CC-cc} -E -no-cpp-precomp"
-    # Use fink packages if available.
-    if test -d /sw/include && test -d /sw/lib; then
-	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-        CPP="${CPP} ${GCC_TEST_OPTIONS}"
-	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-    fi
   ;;
 
   ## AMD x86-64 Linux-based GNU system
diff --git a/configure.in b/configure.in
index 4c1dda68896..628bfcad4d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1089,7 +1089,7 @@ dnl see the `changequote' comment above.
     machine=intel386
     case "${canonical}" in
       *-cygwin )                opsys=cygwin ;;
-      *-darwin )                opsys=darwin
+      *-darwin* )               opsys=darwin
                                 CPP="${CC-cc} -E -no-cpp-precomp"
  				;;
       *-isc1.* | *-isc2.[01]* )	opsys=386-ix ;;