From: Glenn Morris <rgm@gnu.org>
Date: Wed, 2 May 2012 16:55:00 +0000 (-0400)
Subject: configure.in tweak for LD_SWITCH_SYSTEM on FreeBSD, NetBSD (bug#10313)
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/3c30e76668068bad00494c16a742cd9a5cb609fe

configure.in tweak for LD_SWITCH_SYSTEM on FreeBSD, NetBSD (bug#10313)

* configure.in (LD_SWITCH_SYSTEM):
Don't try to defeat the choices made by FreeBSD and NetBSD.
---

diff --git a/ChangeLog b/ChangeLog
index 3b8af27e7f..1286f7dcf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-02  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (LD_SWITCH_SYSTEM): Don't try to defeat
+	the choices made by FreeBSD and NetBSD.  (Bug#10313)
+
 	* Makefile.in (INFO_FILES): Remove variable.
 	(INFO_NONMISC): New variable.
 	(install-arch-indep, uninstall): Don't use $INFO_FILES.
diff --git a/configure.in b/configure.in
index c0a12672c6..2bf78e522e 100644
--- a/configure.in
+++ b/configure.in
@@ -951,7 +951,9 @@ case "$opsys" in
    ## Let `ld' find image libs and similar things in /usr/local/lib.
    ## The system compiler, GCC, has apparently been modified to not
    ## look there, contrary to what a stock GCC would do.
-   LD_SWITCH_SYSTEM=-L/usr/local/lib
+### It's not our place to do this.  See bug#10313#17.
+###   LD_SWITCH_SYSTEM=-L/usr/local/lib
+      :
    ;;
 
   gnu-linux)
@@ -960,7 +962,9 @@ case "$opsys" in
    ;;
 
   netbsd)
-   LD_SWITCH_SYSTEM="-Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib"
+### It's not our place to do this.  See bug#10313#17.
+###   LD_SWITCH_SYSTEM="-Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib"
+      :
    ;;
 
   openbsd)