Commit 4737362e authored by Glenn Morris's avatar Glenn Morris

Remove LD_SWITCH_X_SITE_AUX, which is no longer used

* configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
parent 74dd3a6b
2012-05-01 Glenn Morris <rgm@gnu.org>
* configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
2012-04-26 Glenn Morris <rgm@gnu.org>
* make-dist: No more doc/lispref/tindex.pl.
......
......@@ -973,7 +973,7 @@ AC_SUBST(LD_SWITCH_SYSTEM)
ac_link="$ac_link $LD_SWITCH_SYSTEM"
## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_AUX,
## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_AUX_RPATH,
## which has not been defined yet. When this was handled with cpp,
## it was expanded to null when configure sourced the s/*.h file.
## Thus LD_SWITCH_SYSTEM had different values in configure and the Makefiles.
......@@ -985,7 +985,6 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
## LD_SWITCH_SYSTEM_TEMACS.
case "$opsys" in
netbsd|openbsd)
## _AUX_RPATH is like _AUX, but uses -rpath instead of -R.
LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_AUX_RPATH) $LD_SWITCH_SYSTEM" ;;
esac
......@@ -1500,13 +1499,11 @@ else
window_system=x11
fi
LD_SWITCH_X_SITE_AUX=
LD_SWITCH_X_SITE_AUX_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e 's/-R/-Wl,-rpath,/'`
LD_SWITCH_X_SITE_AUX_RPATH=-Wl,-rpath`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath/g"`
fi
x_default_search_path=""
x_search_path=${x_libraries}
......@@ -1529,7 +1526,6 @@ ${x_library}/X11/%T/%N%S"
fi
done
fi
AC_SUBST(LD_SWITCH_X_SITE_AUX)
AC_SUBST(LD_SWITCH_X_SITE_AUX_RPATH)
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
......@@ -1858,9 +1854,9 @@ if test "${HAVE_X11}" = "yes"; then
CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS"
# On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.
# This is handled by LD_SWITCH_X_SITE_AUX during the real build,
# but it's more convenient here to set LD_RUN_PATH
# since this also works on hosts that don't understand LD_SWITCH_X_SITE_AUX.
# This is handled by LD_SWITCH_X_SITE_AUX_RPATH during the real build,
# but it's more convenient here to set LD_RUN_PATH since this
# also works on hosts that don't understand LD_SWITCH_X_SITE_AUX_RPATH.
if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH
export LD_RUN_PATH
......@@ -3510,9 +3506,10 @@ case "$opsys" in
LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
;;
## LD_SWITCH_X_SITE_AUX is a -R option saying where to find X at run-time.
## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at
## the point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_AUX
## LD_SWITCH_X_SITE_AUX_RPATH is a -rpath option saying where to
## find X at run-time.
## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at the
## point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_AUX_RPATH
## 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.
......
2012-05-01 Glenn Morris <rgm@gnu.org>
* Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
2012-04-30 Andreas Schwab <schwab@linux-m68k.org>
* .gdbinit (xpr): Remove checks for no longer existing misc types.
......
......@@ -94,10 +94,8 @@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE.
LD_SWITCH_X_SITE=
## Next two must come before LD_SWITCH_SYSTEM.
## If needed, a -R option that says where to find X windows at run time.
LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@
## As above, but using -rpath instead.
## This must come before LD_SWITCH_SYSTEM.
## If needed, a -rpath option that says where to find X windows at run time.
LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@
## System-specific LDFLAGS.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment