package/utils/xfsprogs/patches/001-automake-compat.patch

   1 commit 2222aa77e11b959e0e5a0ded3482e56799593bc2
   2 Author: Jens Muecke <jens@nons.de>
   3 Date:   Thu Jan 26 00:34:15 2012 +0100
   4
   5     001-automake-compat
   6
   7 diff --git a/configure.in b/configure.in
   8 index 664c0e9..d91b6ec 100644
   9 --- a/configure.in
  10 +++ b/configure.in
  11 @@ -2,7 +2,8 @@ AC_INIT(include/libxfs.h)
  12  AC_PREREQ(2.50)
  13  AC_CONFIG_AUX_DIR([.])
  14  AC_CONFIG_MACRO_DIR([m4])
  15 -AC_CONFIG_HEADER(include/platform_defs.h)
  16 +# Put a dummy here (http://www.mail-archive.com/automake@gnu.org/msg09241.html)
  17 +AC_CONFIG_HEADERS([doesnotexist.h include/platform_defs.h])
  18  AC_PREFIX_DEFAULT(/usr)
  19
  20  AC_PROG_LIBTOOL
  21 diff --git a/include/builddefs.in b/include/builddefs.in
  22 index 81ebfcd..5a4a0e8 100644
  23 --- a/include/builddefs.in
  24 +++ b/include/builddefs.in
  25 @@ -20,6 +20,8 @@
  26  ifndef _BUILDDEFS_INCLUDED_
  27  _BUILDDEFS_INCLUDED_ = 1
  28
  29 +SHELL = @SHELL@
  30 +
  31  DEBUG = @debug_build@
  32  OPTIMIZER = @opt_build@
  33  MALLOCLIB = @malloc_lib@
  34 diff --git a/m4/package_types.m4 b/m4/package_types.m4
  35 index 0a0e087..66a136a 100644
  36 --- a/m4/package_types.m4
  37 +++ b/m4/package_types.m4
  38 @@ -9,7 +9,7 @@ AC_DEFUN([AC_TYPE_PSINT],
  39  #include <stddef.h>
  40      ], [
  41           __psint_t  psint;
  42 -    ], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  43 +    ], AC_DEFINE([HAVE___PSINT_T], [1], [Define if __psint_t exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  44    ])
  45
  46  #
  47 @@ -23,7 +23,7 @@ AC_DEFUN([AC_TYPE_PSUNSIGNED],
  48  #include <stddef.h>
  49      ], [
  50          __psunsigned_t  psuint;
  51 -    ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  52 +    ], AC_DEFINE([HAVE___PSUNSIGNED_T], [1], [Define if __psunsigned_t exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  53    ])
  54
  55  #
  56 @@ -37,7 +37,7 @@ AC_DEFUN([AC_TYPE_U32],
  57  #include <stddef.h>
  58      ], [
  59           __u32  u32;
  60 -    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  61 +    ], AC_DEFINE([HAVE___U32], [1], [Define if __u32 exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  62    ])
  63
  64  #
  65 @@ -50,15 +50,15 @@ AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG],
  66      AC_CHECK_SIZEOF(long, 4)
  67      AC_CHECK_SIZEOF(char *, 4)
  68      if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then
  69 -      AC_DEFINE(HAVE_32BIT_LONG)
  70 +      AC_DEFINE([HAVE_32BIT_LONG], [1], [Define if long is 32bit])
  71      fi
  72      if test $ac_cv_sizeof_long -eq 8; then
  73 -      AC_DEFINE(HAVE_64BIT_LONG)
  74 +      AC_DEFINE([HAVE_64BIT_LONG], [1], [Define if long is 64bit])
  75      fi
  76      if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then
  77 -      AC_DEFINE(HAVE_32BIT_PTR)
  78 +      AC_DEFINE([HAVE_32BIT_PTR], [1], [Define if char* is 32bit])
  79      fi
  80      if test $ac_cv_sizeof_char_p -eq 8; then
  81 -      AC_DEFINE(HAVE_64BIT_PTR)
  82 +      AC_DEFINE([HAVE_64BIT_PTR], [1], [Define if char* is 64bit])
  83      fi
  84    ])