--- gforth/configure.in	2003/01/20 17:07:37	1.102
+++ gforth/configure.in	2003/01/22 17:12:49	1.103
@@ -89,93 +89,6 @@ dnl    no_dynamic_default=1
 dnl    AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
 dnl fi
 
-dnl the following macro produces a warning with autoconf-2.1
-AC_CHECK_SIZEOF(char *)
-case "$ac_cv_sizeof_char_p" in
-  2)
-    wordsize=16
-    ;;
-  4)
-    wordsize=32
-    ;;
-  8)
-    wordsize=64
-    ;;
-esac
-
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(intptr_t)
-AC_CHECK_SIZEOF(int128_t)
-
-AC_MSG_CHECKING([for a C type for cells])
-ac_cv_int_type_cell=none
-case "$ac_cv_sizeof_char_p" in
-  $ac_cv_sizeof_int)
-    ac_cv_int_type_cell=int
-    ;;
-  $ac_cv_sizeof_short)
-    ac_cv_int_type_cell=short
-    ;;
-  $ac_cv_sizeof_char)
-    ac_cv_int_type_cell=char
-    ;;
-  $ac_cv_sizeof_long)
-    ac_cv_int_type_cell=long
-    ;;
-  $ac_cv_sizeof_long_long)
-    ac_cv_int_type_cell="long long"
-    ;;
-  $ac_cv_sizeof_intptr_t)
-    ac_cv_int_type_cell="intptr_t"
-    ;;
-  $ac_cv_sizeof_int128_t)
-    ac_cv_int_type_cell="int128_t"
-    ;;
-esac
-AC_MSG_RESULT($ac_cv_int_type_cell)
-AC_DEFINE_UNQUOTED(CELL_TYPE,$ac_cv_int_type_cell,[an integer type that is as long as a pointer])
-
-AC_MSG_CHECKING([for a C type for double-cells])
-ac_cv_int_type_double_cell=none
-case `expr 2 '*' "$ac_cv_sizeof_char_p"` in
-  $ac_cv_sizeof_short)
-    ac_cv_int_type_double_cell=short
-    ;;
-  $ac_cv_sizeof_int)
-    ac_cv_int_type_double_cell=int
-    ;;
-  $ac_cv_sizeof_long)
-    ac_cv_int_type_double_cell=long
-    ;;
-  $ac_cv_sizeof_long_long)
-    ac_cv_int_type_double_cell="long long"
-    ;;
-  $ac_cv_sizeof_intptr_t)
-    ac_cv_int_type_double_cell="intptr_t"
-    ;;
-  $ac_cv_sizeof_int128_t)
-    ac_cv_int_type_double_cell="int128_t"
-    ;;
-esac
-AC_MSG_RESULT($ac_cv_int_type_double_cell)
-if test "$ac_cv_int_type_double_cell" = none; then
-	AC_MSG_WARN([Emulating double-cell arithmetic. This may be slow.])
-	AC_LIBOBJ(dblsub)
-	AC_DEFINE(BUGGY_LONG_LONG,,[define this if there is no working DOUBLE_CELL_TYPE on your machine])
-else
-	AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer])
-fi
-
-AC_TYPE_OFF_T
-AC_CHECK_SIZEOF(off_t)
-test $ac_cv_sizeof_off_t -gt $ac_cv_sizeof_char_p
-ac_small_off_t=$?
-AC_DEFINE_UNQUOTED(SMALL_OFF_T,$ac_small_off_t,[1 if off_t fits in a Cell])
-
 AC_MSG_CHECKING([whether the linker accepts -export-dynamic])
 OLDLDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS -export-dynamic"
@@ -253,6 +166,8 @@ case "$host_cpu" in
 		machine=power
 		$srcdir/mkinstalldirs arch/power
 		AC_CHECK_FUNC(_sync_cache_range,true,AC_LIBOBJ(../arch/power/_sync_cache_range))
+		#long long is broken on (at least) gcc-2.95.* for PPC
+		ac_cv_sizeof_long_long=0
 		;;
 	*)
 		AC_MSG_WARN([Using a generic machine description])
@@ -266,6 +181,93 @@ esac
 AC_SUBST(host)
 AC_SUBST(ENGINE_FLAGS)
 
+dnl the following macro produces a warning with autoconf-2.1
+AC_CHECK_SIZEOF(char *)
+case "$ac_cv_sizeof_char_p" in
+  2)
+    wordsize=16
+    ;;
+  4)
+    wordsize=32
+    ;;
+  8)
+    wordsize=64
+    ;;
+esac
+
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(intptr_t)
+AC_CHECK_SIZEOF(int128_t)
+
+AC_MSG_CHECKING([for a C type for cells])
+ac_cv_int_type_cell=none
+case "$ac_cv_sizeof_char_p" in
+  $ac_cv_sizeof_int)
+    ac_cv_int_type_cell=int
+    ;;
+  $ac_cv_sizeof_short)
+    ac_cv_int_type_cell=short
+    ;;
+  $ac_cv_sizeof_char)
+    ac_cv_int_type_cell=char
+    ;;
+  $ac_cv_sizeof_long)
+    ac_cv_int_type_cell=long
+    ;;
+  $ac_cv_sizeof_long_long)
+    ac_cv_int_type_cell="long long"
+    ;;
+  $ac_cv_sizeof_intptr_t)
+    ac_cv_int_type_cell="intptr_t"
+    ;;
+  $ac_cv_sizeof_int128_t)
+    ac_cv_int_type_cell="int128_t"
+    ;;
+esac
+AC_MSG_RESULT($ac_cv_int_type_cell)
+AC_DEFINE_UNQUOTED(CELL_TYPE,$ac_cv_int_type_cell,[an integer type that is as long as a pointer])
+
+AC_MSG_CHECKING([for a C type for double-cells])
+ac_cv_int_type_double_cell=none
+case `expr 2 '*' "$ac_cv_sizeof_char_p"` in
+  $ac_cv_sizeof_short)
+    ac_cv_int_type_double_cell=short
+    ;;
+  $ac_cv_sizeof_int)
+    ac_cv_int_type_double_cell=int
+    ;;
+  $ac_cv_sizeof_long)
+    ac_cv_int_type_double_cell=long
+    ;;
+  $ac_cv_sizeof_long_long)
+    ac_cv_int_type_double_cell="long long"
+    ;;
+  $ac_cv_sizeof_intptr_t)
+    ac_cv_int_type_double_cell="intptr_t"
+    ;;
+  $ac_cv_sizeof_int128_t)
+    ac_cv_int_type_double_cell="int128_t"
+    ;;
+esac
+AC_MSG_RESULT($ac_cv_int_type_double_cell)
+if test "$ac_cv_int_type_double_cell" = none; then
+	AC_MSG_WARN([Emulating double-cell arithmetic. This may be slow.])
+	AC_LIBOBJ(dblsub)
+	AC_DEFINE(BUGGY_LONG_LONG,,[define this if there is no working DOUBLE_CELL_TYPE on your machine])
+else
+	AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer])
+fi
+
+AC_TYPE_OFF_T
+AC_CHECK_SIZEOF(off_t)
+test $ac_cv_sizeof_off_t -gt $ac_cv_sizeof_char_p
+ac_small_off_t=$?
+AC_DEFINE_UNQUOTED(SMALL_OFF_T,$ac_small_off_t,[1 if off_t fits in a Cell])
+
 # Try if GCC understands -fno-cross-jump
 
 CFLAGS_1="$CFLAGS"