From: Nathan Scott <nathans@sgi.com>
Date: Mon, 19 Jan 2004 23:05:49 +0000 (+0000)
Subject: Fix up autoconf/configure issues, esp. mishandling the AC_CHECK_SIZEOF macro.
X-Git-Tag: v2.7.0~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1be3ba146922141a2713a074d64392e19c3b74b;p=thirdparty%2Fxfsprogs-dev.git

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

diff --git a/aclocal.m4 b/aclocal.m4
index 598cca86c..b376d02f9 100644
--- 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 1bd697510..91db64e98 100644
--- 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