<osf>: Use NON_GNU_CPP='cpp' always.

1 files changed, 7 insertions, 5 deletions

diff --git a/configure.in b/configure.in
index f5a425c886a..210caf797b8 100644
--- a/configure.in
+++ b/configure.in
@@ -259,11 +259,13 @@ case "${canonical}" in
     NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
     GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
     case "${canonical}" in
-    # This is necessary on 5.0 to avoid mangling src/Makefile.
-    # Separated out in case it causes problems on earlier versions.
-    alpha*-dec-osf[5-9]*)
-      opsys=osf5-0
-      NON_GNU_CPP='cpp' ;;
+    # This is necessary on 5.0 to avoid mangling src/Makefile due to
+    # non-traditional preprocessing with the current compiler defaults.
+    # OSF 4 can also have that compiler version, and there seems always
+    # to have been a usable /usr/bin/cpp.
+    NON_GNU_CPP='cpp'
+    alpha*-dec-osf[4-9]*)
+      opsys=osf5-0 ;;
     esac
   ;;