re PR other/15194 (Fastjar configure needlessly fails without long long)

2004-06-25  Kelley Cook  <kcook@gcc.gnu.org>

	PR other/15194
	* configure.ac: Add check for long long.
	* jartool.h: Check for long long before using it.
	* configure: Regenerate
	* config.h.in: Regenerate.

From-SVN: r83690

fastjar/ChangeLog

+2004-06-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	PR other/15194
+	* configure.ac: Add check for long long.
+	* jartool.h: Check for long long before using it.
+	* configure: Regenerate
+	* config.h.in: Regenerate.
+
 2004-06-15  Paolo Bonzini  <bonzini@gnu.org>
 
 	* acinclude.m4: Quote first argument of AC_DEFUNs.

fastjar/config.h.in

@@ -16,6 +16,9 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if the system has the type `long long'. */
+#undef HAVE_LONG_LONG
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

fastjar/configure.ac

@@ -39,7 +39,7 @@ AC_COMPILE_CHECK_SIZEOF(char)
 AC_COMPILE_CHECK_SIZEOF(short)
 AC_COMPILE_CHECK_SIZEOF(int)
 AC_COMPILE_CHECK_SIZEOF(long)
-AC_COMPILE_CHECK_SIZEOF(long long)
+AC_CHECK_TYPES([long long],[AC_COMPILE_CHECK_SIZEOF(long long)])
 
 dnl Check byte order
 AC_C_BIGENDIAN_CROSS

fastjar/jartool.h

@@ -90,7 +90,7 @@ typedef u_int16_t ub2;
 typedef unsigned int ub4;
 #elif SIZEOF_LONG == 4
 typedef unsigned long ub4;
-#elif SIZEOF_LONG_LONG == 4
+#elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 4
 typedef unsigned long long ub4;
 #else
 typedef u_int32_t ub4;