Merge from emacs-24 branch

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index 21b8c9d2b8f40b2106becc87bd70356e0dd83821..1554e10145f40efeef857589c32746315e738818 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3510,7 +3510,7 @@ case "$opsys" in
   ## had not yet been defined and was expanded to null.  Hence LD_SWITCH_SYSTEM
   ## had different values in configure (in ac_link) and src/Makefile.in.
   ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS.
-  gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;;
+  gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX_RPATH)" ;;
 
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac