diff options
| author | Chong Yidong | 2012-04-20 16:48:50 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-20 16:48:50 +0800 |
| commit | c07a4c0b599e0debfb10acdf02ac6559b998a88a (patch) | |
| tree | f87bca47c21f04b43cca2347a21ed89c57b67958 /autogen | |
| parent | 6cf2a23e297b8a57a70c2a1dab5aa28b73461b0b (diff) | |
| parent | 50e5ebca7edcf5299b89ff74499991de01e22046 (diff) | |
| download | emacs-c07a4c0b599e0debfb10acdf02ac6559b998a88a.tar.gz emacs-c07a4c0b599e0debfb10acdf02ac6559b998a88a.zip | |
Merge from emacs-24 branch
Diffstat (limited to 'autogen')
| -rwxr-xr-x | autogen/configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/autogen/configure b/autogen/configure index 08f35898ff4..0d9d1abdaa4 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -22866,7 +22866,7 @@ case "$opsys" in | |||
| 22866 | ## had not yet been defined and was expanded to null. Hence LD_SWITCH_SYSTEM | 22866 | ## had not yet been defined and was expanded to null. Hence LD_SWITCH_SYSTEM |
| 22867 | ## had different values in configure (in ac_link) and src/Makefile.in. | 22867 | ## had different values in configure (in ac_link) and src/Makefile.in. |
| 22868 | ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. | 22868 | ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. |
| 22869 | gnu-linux) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX)" ;; | 22869 | gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX_RPATH)" ;; |
| 22870 | 22870 | ||
| 22871 | *) LD_SWITCH_SYSTEM_TEMACS= ;; | 22871 | *) LD_SWITCH_SYSTEM_TEMACS= ;; |
| 22872 | esac | 22872 | esac |