1 diff -ru gawk-3.1.4/configure.ac gawk-3.1.4.new/configure.ac
2 --- gawk-3.1.4/configure.ac 2004-08-02 09:09:52.000000000 +0000
3 +++ gawk-3.1.4.new/configure.ac 2005-04-17 12:54:53.000000000 +0000
9 -jm_AC_TYPE_UNSIGNED_LONG_LONG
11 +gl_AC_TYPE_UNSIGNED_LONG_LONG
14 AC_CHECK_TYPE(ssize_t, int)
15 diff -ru gawk-3.1.4/m4/gettext.m4 gawk-3.1.4.new/m4/gettext.m4
16 --- gawk-3.1.4/m4/gettext.m4 2004-02-19 21:08:40.000000000 +0000
17 +++ gawk-3.1.4.new/m4/gettext.m4 2005-04-17 12:54:53.000000000 +0000
19 AC_REQUIRE([AC_C_INLINE])dnl
20 AC_REQUIRE([AC_TYPE_OFF_T])dnl
21 AC_REQUIRE([AC_TYPE_SIZE_T])dnl
22 - AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
23 + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
24 AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
25 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
26 AC_REQUIRE([gt_TYPE_WINT_T])dnl
27 diff -ru gawk-3.1.4/m4/intmax_t.m4 gawk-3.1.4.new/m4/intmax_t.m4
28 --- gawk-3.1.4/m4/intmax_t.m4 2003-03-28 08:30:36.000000000 +0000
29 +++ gawk-3.1.4.new/m4/intmax_t.m4 2005-04-17 12:54:53.000000000 +0000
32 AC_DEFUN([jm_AC_TYPE_INTMAX_T],
34 - AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
35 + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
36 AC_CHECK_TYPE(intmax_t, ,
37 [test $ac_cv_type_long_long = yes \
38 && ac_type='long long' \
41 AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
43 - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
44 + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
45 AC_CHECK_TYPE(uintmax_t, ,
46 [test $ac_cv_type_unsigned_long_long = yes \
47 && ac_type='unsigned long long' \
48 diff -ru gawk-3.1.4/m4/longlong.m4 gawk-3.1.4.new/m4/longlong.m4
49 --- gawk-3.1.4/m4/longlong.m4 2004-02-19 21:08:40.000000000 +0000
50 +++ gawk-3.1.4.new/m4/longlong.m4 2005-04-17 12:54:53.000000000 +0000
53 # Define HAVE_LONG_LONG if 'long long' works.
55 -AC_DEFUN([jm_AC_TYPE_LONG_LONG],
56 +AC_DEFUN([gl_AC_TYPE_LONG_LONG],
58 AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
59 [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
60 diff -ru gawk-3.1.4/m4/uintmax_t.m4 gawk-3.1.4.new/m4/uintmax_t.m4
61 --- gawk-3.1.4/m4/uintmax_t.m4 2004-02-19 21:08:41.000000000 +0000
62 +++ gawk-3.1.4.new/m4/uintmax_t.m4 2005-04-17 12:54:53.000000000 +0000
64 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
65 AC_REQUIRE([jm_AC_HEADER_STDINT_H])
66 if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
67 - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
68 + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
69 test $ac_cv_type_unsigned_long_long = yes \
70 && ac_type='unsigned long long' \
71 || ac_type='unsigned long'
72 diff -ru gawk-3.1.4/m4/ulonglong.m4 gawk-3.1.4.new/m4/ulonglong.m4
73 --- gawk-3.1.4/m4/ulonglong.m4 2004-02-19 21:08:41.000000000 +0000
74 +++ gawk-3.1.4.new/m4/ulonglong.m4 2005-04-17 12:54:53.000000000 +0000
77 # Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
79 -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
80 +AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
82 AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
83 [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],