org.handhelds.familiar/packages/autoconf/autoconf-2.59/sizeof_types.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 Index: autoconf-2.59/lib/autoconf/types.m4
   7 ===================================================================
   8 --- autoconf-2.59.orig/lib/autoconf/types.m4    2003-05-22 14:05:14.000000000 +0200
   9 +++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200
  10 @@ -380,26 +380,66 @@
  11  # Generic checks.  #
  12  # ---------------- #
  13
  14 +# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
  15 +# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
  16 +# ------------------------------------------------------------------------
  17 +# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
  18 +AC_DEFUN([AC_CHECK_TARGET_TOOL],
  19 +[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
  20 +AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
  21 +if test -z "$ac_cv_prog_$1"; then
  22 +  if test "$build" = "$target"; then
  23 +    ac_ct_$1=$$1
  24 +    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
  25 +    $1=ac_ct_$1
  26 +  else
  27 +    $1="$3"
  28 +  fi
  29 +else
  30 +  $1="$ac_cv_prog_$1"
  31 +fi
  32 +])# AC_CHECK_TARGET_TOOL
  33 +
  34 +
  35 +AC_DEFUN([AC_PROG_SIZE],
  36 +[
  37 +  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
  38 +])
  39
  40  # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
  41  # ---------------------------------------------------------------
  42  AC_DEFUN([AC_CHECK_SIZEOF],
  43 -[AS_LITERAL_IF([$1], [],
  44 +[AC_REQUIRE([AC_PROG_SIZE])
  45 +AC_REQUIRE([AC_PROG_AWK])
  46 + AS_LITERAL_IF([$1], [],
  47                [AC_FATAL([$0: requires literal arguments])])dnl
  48  AC_CHECK_TYPE([$1], [], [], [$3])
  49  AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
  50 -[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
  51 -  # The cast to unsigned long works around a bug in the HP C Compiler
  52 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  53 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
  54 -  # This bug is HP SR number 8606223364.
  55 -  _AC_COMPUTE_INT([(long) (sizeof ($1))],
  56 -                 [AS_TR_SH([ac_cv_sizeof_$1])],
  57 -                 [AC_INCLUDES_DEFAULT([$3])],
  58 -                 [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
  59 +[
  60 +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
  61 +       if test "$cross_compiling" = yes; then
  62 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
  63 +                          [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
  64 +                          [
  65 +                            AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
  66 +                          ],
  67 +                          [
  68 +                            AS_TR_SH([ac_cv_sizeof_$1])=0
  69 +                          ])
  70 +       else
  71 +               # The cast to unsigned long works around a bug in the HP C Compiler
  72 +               # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  73 +               # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
  74 +               # This bug is HP SR number 8606223364.
  75 +               _AC_COMPUTE_INT([(long) (sizeof ($1))],
  76 +                       [AS_TR_SH([ac_cv_sizeof_$1])],
  77 +                       [AC_INCLUDES_DEFAULT([$3])],
  78 +                       [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
  79 +       fi
  80  else
  81    AS_TR_SH([ac_cv_sizeof_$1])=0
  82 -fi])dnl
  83 +fi
  84 +])dnl
  85  AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
  86                    [The size of a `$1', as computed by sizeof.])
  87  ])# AC_CHECK_SIZEOF