[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108105: configure.in tweak for LD_SWITCH_SYSTEM on FreeBSD, NetBSD (bug#10313)

[Glenn Morris]

------------------------------------------------------------
revno: 108105
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 12:55:00 -0400
message:
  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.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-02 16:28:03 +0000
+++ b/ChangeLog 2012-05-02 16:55:00 +0000
@@ -1,5 +1,8 @@
 2012-05-02  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'configure.in'
--- a/configure.in      2012-05-02 07:20:29 +0000
+++ b/configure.in      2012-05-02 16:55:00 +0000
@@ -951,7 +951,9 @@
    ## 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 @@
    ;;
 
   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)