001-automake-compat.patch 2.7 KB

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