darwin-i386 build should include "fink"-installed packages like darwin-powerpc build does (patch included)

[Stephen C . Gilardi]

When building emacs for Mac OS X (darwin) on the   powerpc    
platform, the "configure" script automatically includes packages  
installed into the "/sw" hierarchy using "fink" (fink.sourceforge.net).

When building for Mac OS X (darwin) on the   i386   platform, the  
"fink" packages are not picked up.

They should be.

The configure line I use is "./configure --with-x".

I've enclosed a patch for "configure.in" which fixes this problem and  
improves the generated "configure" by keeping code for both darwin  
"machine"s together in one place.  The "machine" variable is set  
programmatically rather than assumed to be "powermac".  The modified  
code is also moved higher up in the case statement so it appears in  
order in the roughly alphabetic sequence of target platforms (below  
Apollo).  Note that it must appear before the generic i386-handling  
section near the bottom of the case statement.

[ Note: I made the change to "configure.in" after testing the  
corresponding patch to "configure" on both powerpc and i386.  When  
doing diffs, I noticed that "configure" and "configure.in" were out  
of sync in their support for building on intel mac--"configure"  
included some explicit support, but "configure.in" did not.  It  
looked like "configure" had been edited separately from  
configure.in.  I gather a good way to implement this patch is to  
change "configure.in" and then regenerate a new "configure" from it. ]

*** configure.in        02 Jan 2007 15:45:25 -0500      1.427
--- configure.in        02 Jan 2007 17:01:22 -0500      
***************
*** 378,383 ****
--- 378,401 ----
      machine=apollo opsys=bsd4-3
    ;;

+   ## Apple Darwin / Mac OS X
+   *-apple-darwin* )
+     case "${canonical}" in
+       i[3456]86-* )  machine=intel386 ;;
+       powerpc-* )    machine=powermac ;;
+       * )            unported=yes ;;
+     esac
+     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
+   ;;
+
    ## AT&T 3b2, 3b5, 3b15, 3b20
    we32k-att-sysv* )
      machine=att3b opsys=usg5-2-2
***************
*** 1154,1172 ****
      machine=f301 opsys=uxpv
    ;;

-   ## Darwin / Mac OS X
-   powerpc-apple-darwin* )
-     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
    x86_64-*-linux-gnu* )
      machine=amdx86-64 opsys=gnu-linux
--- 1172,1177 ----

Change log entry:

2007-01-02  Stephen C. Gilardi  <address@hidden>

	* configure.in: Detect and use fink-installed in intel-based Mac  
builds;
	change Apple Darwin section to support both PowerPC and Intel-based  
Macs