1
0

001-automake-compat.patch 2.4 KB

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