summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2000-09-29 09:32:42 +0000
committerDave Love <fx@gnu.org>2000-09-29 09:32:42 +0000
commita55b799a749ae03ed5f0fb043d8f4c699852d717 (patch)
treec90afd1b3e80825923c607f253ea464fdd09a682
parentd5c898bbe29295dcc132766b3aec60c5f5eb7f6b (diff)
downloademacs-a55b799a749ae03ed5f0fb043d8f4c699852d717.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d96bf143e04..b7d993f6c50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-29 Dave Love <fx@gnu.org>
+
+ * configure.in: Fix alpha*-dec-osf4 using the osf5 config.
+
2000-09-26 Gerd Moellmann <gerd@gnu.org>
* make-dist: Adapt to the change of leim/Makefile which was
diff --git a/configure b/configure
index 4d8b6504e8e..5173c405b29 100755
--- a/configure
+++ b/configure
@@ -891,7 +891,7 @@ case "${canonical}" in
# to have been a usable /usr/bin/cpp.
NON_GNU_CPP='cpp'
case "${canonical}" in
- alpha*-dec-osf[4-9]*)
+ alpha*-dec-osf[5-9]*)
opsys=osf5-0 ;;
esac
;;
@@ -3504,7 +3504,7 @@ else
int main() {
/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
/* SunOS 4.1.1 cc rejects this. */
char const *const *ccp;
char **p;
@@ -4152,7 +4152,7 @@ if test x"${REL_ALLOC}" = x; then
REL_ALLOC=${GNU_MALLOC}
fi
-in
+
for ac_hdr in stdlib.h unistd.h sys/stat.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -5652,7 +5652,7 @@ else
#include "confdefs.h"
#include <alloca.h>
int main() {
-char *p = alloca(2 * sizeof(int));
+void *p = alloca(2 * sizeof(int));
; return 0; }
EOF
if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then