From 136c45eee75126157bd45683ba94de50b6888a14 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 18 May 2012 00:14:45 -0700 Subject: [PATCH] Stop adding Fink directories to search path on OS X * configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) : No longer unconditonally add /sw directories. * etc/NEWS: Mention this. Fixes: debbugs:2280 --- ChangeLog | 3 +++ configure.in | 12 ++++++------ etc/NEWS | 4 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6f13a4f07c..e8bd7061222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-18 Glenn Morris + * configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) : + 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. diff --git a/configure.in b/configure.in index 0844cc2ecb6..6b16b4356b0 100644 --- a/configure.in +++ b/configure.in @@ -492,12 +492,12 @@ case "${canonical}" in * ) 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 diff --git a/etc/NEWS b/etc/NEWS index d27b27cb138..f6a5bcda480 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -37,6 +37,10 @@ may be useful. /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 -- 2.39.2