From b7c342e5bae6dd215d8f9a9178421062884b7b82 Mon Sep 17 00:00:00 2001
From: Jones Desougi <jones@ingate.com>
Date: Tue, 27 Jul 2004 22:50:19 +0000
Subject: [PATCH] re PR other/15194 (Fastjar configure needlessly fails without
 long long)

2004-07-27  Jones Desougi <jones@ingate.com>
            Kelley Cook <kcook@gcc.gnu.org>

	PR bootstrap/15194
	* acinclude.m4 (gcc_AC_COMPILE_CHECK_SIZEOF): Return 0 when type
	doesn't exist.
	* aclocal.m4: Regenerate.
	* configure: Regenearate.

Co-Authored-By: Kelley Cook <kcook@gcc.gnu.org>

From-SVN: r85236
---
 fastjar/ChangeLog    |  9 +++++++++
 fastjar/acinclude.m4 |  3 ++-
 fastjar/aclocal.m4   |  3 ++-
 fastjar/configure    | 10 +++++-----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index d6742e88a1e7..98301cfc3f6e 100644
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-27  Jones Desougi <jones@ingate.com>
+            Kelley Cook <kcook@gcc.gnu.org>
+
+	PR bootstrap/15194
+	* acinclude.m4 (gcc_AC_COMPILE_CHECK_SIZEOF): Return 0 when type
+	doesn't exist.
+	* aclocal.m4: Regenerate.
+	* configure: Regenearate.
+
 2004-05-31  Release Manager
 
 	* GCC 3.3.4 Released.
diff --git a/fastjar/acinclude.m4 b/fastjar/acinclude.m4
index 0a45d735bd2f..6feb733f7ac6 100644
--- a/fastjar/acinclude.m4
+++ b/fastjar/acinclude.m4
@@ -1,6 +1,7 @@
 
 dnl Host type sizes probe.
 dnl By Kaveh R. Ghazi.  One typo fixed since.
+dnl Modified to return a size of 0 if type doesn't exist
 dnl
 AC_DEFUN([gcc_AC_COMPILE_CHECK_SIZEOF],
 [changequote(<<, >>)dnl
@@ -20,7 +21,7 @@ $2
 done
 ])
 if test x$AC_CV_NAME = x ; then
-  AC_MSG_ERROR([cannot determine a size for $1])
+  AC_CV_NAME=0
 fi
 AC_MSG_RESULT($AC_CV_NAME)
 AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
diff --git a/fastjar/aclocal.m4 b/fastjar/aclocal.m4
index 5a9b493923fb..3832bfba6f3d 100644
--- a/fastjar/aclocal.m4
+++ b/fastjar/aclocal.m4
@@ -13,6 +13,7 @@ dnl PARTICULAR PURPOSE.
 
 dnl Host type sizes probe.
 dnl By Kaveh R. Ghazi.  One typo fixed since.
+dnl Modified to return a size of 0 if type doesn't exist
 dnl
 AC_DEFUN([gcc_AC_COMPILE_CHECK_SIZEOF],
 [changequote(<<, >>)dnl
@@ -32,7 +33,7 @@ $2
 done
 ])
 if test x$AC_CV_NAME = x ; then
-  AC_MSG_ERROR([cannot determine a size for $1])
+  AC_CV_NAME=0
 fi
 AC_MSG_RESULT($AC_CV_NAME)
 AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
diff --git a/fastjar/configure b/fastjar/configure
index 4cc1b926a700..90a247412d8d 100755
--- a/fastjar/configure
+++ b/fastjar/configure
@@ -1876,7 +1876,7 @@ done
 fi
 
 if test x$ac_cv_sizeof_char = x ; then
-  { echo "configure: error: cannot determine a size for char" 1>&2; exit 1; }
+  ac_cv_sizeof_char=0
 fi
 echo "$ac_t""$ac_cv_sizeof_char" 1>&6
 cat >> confdefs.h <<EOF
@@ -1915,7 +1915,7 @@ done
 fi
 
 if test x$ac_cv_sizeof_short = x ; then
-  { echo "configure: error: cannot determine a size for short" 1>&2; exit 1; }
+  ac_cv_sizeof_short=0
 fi
 echo "$ac_t""$ac_cv_sizeof_short" 1>&6
 cat >> confdefs.h <<EOF
@@ -1954,7 +1954,7 @@ done
 fi
 
 if test x$ac_cv_sizeof_int = x ; then
-  { echo "configure: error: cannot determine a size for int" 1>&2; exit 1; }
+  ac_cv_sizeof_int=0 
 fi
 echo "$ac_t""$ac_cv_sizeof_int" 1>&6
 cat >> confdefs.h <<EOF
@@ -1993,7 +1993,7 @@ done
 fi
 
 if test x$ac_cv_sizeof_long = x ; then
-  { echo "configure: error: cannot determine a size for long" 1>&2; exit 1; }
+  ac_cv_sizeof_long=0 
 fi
 echo "$ac_t""$ac_cv_sizeof_long" 1>&6
 cat >> confdefs.h <<EOF
@@ -2032,7 +2032,7 @@ done
 fi
 
 if test x$ac_cv_sizeof_long_long = x ; then
-  { echo "configure: error: cannot determine a size for long long" 1>&2; exit 1; }
+  ac_cv_sizeof_long_long=0 
 fi
 echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
 cat >> confdefs.h <<EOF
-- 
2.47.2