[Emacs-diffs] /srv/bzr/emacs/trunk r108283: Stop adding Fink directories to search path on OS X

[Glenn Morris]

------------------------------------------------------------
revno: 108283
fixes bug(s): http://debbugs.gnu.org/2280
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-18 00:14:45 -0700
message:
  Stop adding Fink directories to search path on OS X
  
  * configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
  No longer unconditonally add /sw directories. 
  
  * etc/NEWS: Mention this.
modified:
  ChangeLog
  configure.in
  etc/NEWS

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-18 07:00:09 +0000
+++ b/ChangeLog 2012-05-18 07:14:45 +0000
@@ -1,5 +1,8 @@
 2012-05-18  Glenn Morris  <address@hidden>
 
+       * configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
+       No longer unconditonally add /sw directories.  (Bug#2280)
+
        * Makefile.in (install-arch-dep): Depend on install-arch-indep.
        (install-arch-indep): Depend on install-leim.
        (install): Remove explicit install-leim dependence.

=== modified file 'configure.in'
--- a/configure.in      2012-05-17 06:07:26 +0000
+++ b/configure.in      2012-05-18 07:14:45 +0000
@@ -492,12 +492,12 @@
       * )            unported=yes ;;
     esac
     opsys=darwin
-    # Use fink packages if available.
-    # FIXME?  Is it really our business to decide this for the user?
-    if test -d /sw/include && test -d /sw/lib; then
-      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-    fi
+    ## Use fink packages if available.
+    ## FIXME find a better way to do this: http://debbugs.gnu.org/11507
+##    if test -d /sw/include && test -d /sw/lib; then
+##      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+##      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+##    fi
   ;;
 
   ## HP 9000 series 700 and 800, running HP/UX

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-05-15 17:38:41 +0000
+++ b/etc/NEWS  2012-05-18 07:14:45 +0000
@@ -37,6 +37,10 @@
 /usr/pkg/lib to the linker search path.  You must add them yourself if
 you want them.
 
+---
+** On Mac OS X, configure no longer automatically adds the Fink /sw
+directories to the search path.  You must add them yourself if you want them.
+
 
 * Startup Changes in Emacs 24.2