aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-12-11 17:17:41 +0000
committerDave Love2000-12-11 17:17:41 +0000
commit349790558bb24b712abcf45b40e2e05acb099a27 (patch)
tree5d05c41d1936ad6a3143146bb1fc7214728efe29
parent557dcfd7735cc960421c47d7be44339297afaddd (diff)
downloademacs-349790558bb24b712abcf45b40e2e05acb099a27.tar.gz
emacs-349790558bb24b712abcf45b40e2e05acb099a27.zip
*** empty log message ***
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 74d82f2f727..bb4d0366f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12000-12-11 Dave Love <fx@gnu.org>
2
3 * configure.in <alpha*-dec-osf*>: Use full path for NON_GNU_CPP.
4
12000-12-11 Paul Eggert <eggert@twinsun.com> 52000-12-11 Paul Eggert <eggert@twinsun.com>
2 6
3 * aclocal.m4 (AC_SYS_LARGEFILE, AC_SYS_LARGEFILE_MACRO_VALUE): 7 * aclocal.m4 (AC_SYS_LARGEFILE, AC_SYS_LARGEFILE_MACRO_VALUE):
diff --git a/configure b/configure
index 6db2bcd9c35..54ac42a301a 100755
--- a/configure
+++ b/configure
@@ -885,11 +885,11 @@ case "${canonical}" in
885 # This is needed to find X11R6.1 libraries for certain tests. 885 # This is needed to find X11R6.1 libraries for certain tests.
886 NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib 886 NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
887 GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib 887 GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
888 # This is necessary on 5.0 to avoid mangling src/Makefile due to 888 # NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile
889 # non-traditional preprocessing with the current compiler defaults. 889 # due to non-traditional preprocessing with the current compiler
890 # OSF 4 can also have that compiler version, and there seems always 890 # defaults. OSF 4 can also have that compiler version, and there
891 # to have been a usable /usr/bin/cpp. 891 # seems always to have been a usable /usr/bin/cpp.
892 NON_GNU_CPP='cpp' 892 NON_GNU_CPP=/usr/bin/cpp
893 case "${canonical}" in 893 case "${canonical}" in
894 alpha*-dec-osf[5-9]*) 894 alpha*-dec-osf[5-9]*)
895 opsys=osf5-0 ;; 895 opsys=osf5-0 ;;