Fix up autoconf/configure issues, esp. mishandling the AC_CHECK_SIZEOF macro.

diff --git a/aclocal.m4 b/aclocal.m4
index 598cca86c4efc147299276ad7af5e2b7fbae3ee0..b376d02f9ad62dfa63d62abb981e9728b1eea7b8 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -257,13 +257,13 @@ AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG],
     fi
     AC_CHECK_SIZEOF(long, 4)
     AC_CHECK_SIZEOF(char *, 4)
-    if test $ac_cv_sizeof_long -eq 4; then
+    if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then
       AC_DEFINE(HAVE_32BIT_LONG)
     fi
     if test $ac_cv_sizeof_long -eq 8; then
       AC_DEFINE(HAVE_64BIT_LONG)
     fi
-    if test $ac_cv_sizeof_char_p -eq 4; then
+    if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then
       AC_DEFINE(HAVE_32BIT_PTR)
     fi
     if test $ac_cv_sizeof_char_p -eq 8; then

diff --git a/m4/package_types.m4 b/m4/package_types.m4
index 1bd69751096c26e0260ab32dc60461293d4cb5ca..91db64e987e601ccd654be0d77ce5fdde30e44b7 100644 (file)
--- a/m4/package_types.m4
+++ b/m4/package_types.m4
@@ -35,13 +35,13 @@ AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG],
     fi
     AC_CHECK_SIZEOF(long, 4)
     AC_CHECK_SIZEOF(char *, 4)
-    if test $ac_cv_sizeof_long -eq 4; then
+    if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then
       AC_DEFINE(HAVE_32BIT_LONG)
     fi
     if test $ac_cv_sizeof_long -eq 8; then
       AC_DEFINE(HAVE_64BIT_LONG)
     fi
-    if test $ac_cv_sizeof_char_p -eq 4; then
+    if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then
       AC_DEFINE(HAVE_32BIT_PTR)
     fi
     if test $ac_cv_sizeof_char_p -eq 8; then