simplification of longlong.m4 and ulonglong.m4

[Bruno Haible]

The files longlong.m4 and ulonglong.m4 still contain some macros marked
as obsolete. I remove them (also in gettext).

2007-10-31  Bruno Haible  <address@hidden>

        * m4/intmax_t.m4 (gl_AC_TYPE_INTMAX_T, gt_AC_TYPE_INTMAX_T): Use
        AC_TYPE_LONG_LONG_INT instead of gl_AC_TYPE_LONG_LONG.
        * m4/uintmax_t.m4 (gl_AC_TYPE_UINTMAX_T): Use
        AC_TYPE_UNSIGNED_LONG_LONG_INT instead of gl_AC_TYPE_UNSIGNED_LONG_LONG.
        * m4/longlong.m4 (gl_AC_TYPE_LONG_LONG): Remove macro.
        * m4/ulonglong.m4 (gl_AC_TYPE_UNSIGNED_LONG_LONG): Remove macro.

*** m4/intmax_t.m4.orig 2007-10-31 13:08:07.000000000 +0100
--- m4/intmax_t.m4      2007-10-31 13:03:32.000000000 +0100
***************
*** 1,5 ****
! # intmax_t.m4 serial 5
! dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # intmax_t.m4 serial 6
! dnl Copyright (C) 1997-2004, 2006-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
***************
*** 18,25 ****
    AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
    AC_REQUIRE([gl_AC_HEADER_STDINT_H])
    if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
!     AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
!     test $ac_cv_type_long_long = yes \
        && ac_type='long long' \
        || ac_type='long'
      AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
--- 18,25 ----
    AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
    AC_REQUIRE([gl_AC_HEADER_STDINT_H])
    if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
!     AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
!     test $ac_cv_type_long_long_int = yes \
        && ac_type='long long' \
        || ac_type='long'
      AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
***************
*** 51,58 ****
      AC_DEFINE(HAVE_INTMAX_T, 1,
        [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
    else
!     AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
!     test $ac_cv_type_long_long = yes \
        && ac_type='long long' \
        || ac_type='long'
      AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
--- 51,58 ----
      AC_DEFINE(HAVE_INTMAX_T, 1,
        [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
    else
!     AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
!     test $ac_cv_type_long_long_int = yes \
        && ac_type='long long' \
        || ac_type='long'
      AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
*** m4/longlong.m4.orig 2007-10-31 13:08:07.000000000 +0100
--- m4/longlong.m4      2007-10-31 13:01:53.000000000 +0100
***************
*** 1,4 ****
! # longlong.m4 serial 12
  dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # longlong.m4 serial 13
  dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
***************
*** 107,120 ****
              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
              | (ullmax / ull) | (ullmax % ull));]])
  ])
- 
- # This macro is obsolescent and should go away soon.
- AC_DEFUN([gl_AC_TYPE_LONG_LONG],
- [
-   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-   ac_cv_type_long_long=$ac_cv_type_long_long_int
-   if test $ac_cv_type_long_long = yes; then
-     AC_DEFINE(HAVE_LONG_LONG, 1,
-       [Define if you have the 'long long' type.])
-   fi
- ])
--- 107,109 ----
*** m4/uintmax_t.m4.orig        2007-10-31 13:08:08.000000000 +0100
--- m4/uintmax_t.m4     2007-10-31 12:59:14.000000000 +0100
***************
*** 1,5 ****
! # uintmax_t.m4 serial 9
! dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # uintmax_t.m4 serial 10
! dnl Copyright (C) 1997-2004, 2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
***************
*** 16,23 ****
    AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
    AC_REQUIRE([gl_AC_HEADER_STDINT_H])
    if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
!     AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
!     test $ac_cv_type_unsigned_long_long = yes \
        && ac_type='unsigned long long' \
        || ac_type='unsigned long'
      AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
--- 16,23 ----
    AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
    AC_REQUIRE([gl_AC_HEADER_STDINT_H])
    if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
!     AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
!     test $ac_cv_type_unsigned_long_long_int = yes \
        && ac_type='unsigned long long' \
        || ac_type='unsigned long'
      AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
*** m4/ulonglong.m4.orig        2007-10-31 13:08:08.000000000 +0100
--- m4/ulonglong.m4     2007-10-31 13:00:16.000000000 +0100
***************
*** 1,16 ****
! # ulonglong.m4 serial 9
  dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
- 
- # This macro is obsolescent and should go away soon.
- AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
- [
-   AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-   ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
-   if test $ac_cv_type_unsigned_long_long = yes; then
-     AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-       [Define if you have the 'unsigned long long' type.])
-   fi
- ])
--- 1,5 ----
! # ulonglong.m4 serial 10
  dnl Copyright (C) 1999-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.