ce9289a4af8b5f5e76ed7d82d2f36807613f00e8
[openwrt/openwrt.git] / 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 --- 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
18 AC_PROG_LIBTOOL
19 --- a/include/builddefs.in
20 +++ b/include/builddefs.in
21 @@ -20,6 +20,8 @@
22 ifndef _BUILDDEFS_INCLUDED_
23 _BUILDDEFS_INCLUDED_ = 1
24
25 +SHELL = @SHELL@
26 +
27 DEBUG = @debug_build@
28 OPTIMIZER = @opt_build@
29 MALLOCLIB = @malloc_lib@
30 --- a/m4/package_types.m4
31 +++ b/m4/package_types.m4
32 @@ -9,7 +9,7 @@ AC_DEFUN([AC_TYPE_PSINT],
33 #include <stddef.h>
34 ], [
35 __psint_t psint;
36 - ], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
37 + ], AC_DEFINE([HAVE___PSINT_T], [1], [Define if __psint_t exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
38 ])
39
40 #
41 @@ -23,7 +23,7 @@ AC_DEFUN([AC_TYPE_PSUNSIGNED],
42 #include <stddef.h>
43 ], [
44 __psunsigned_t psuint;
45 - ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
46 + ], AC_DEFINE([HAVE___PSUNSIGNED_T], [1], [Define if __psunsigned_t exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
47 ])
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 #
59 @@ -50,15 +50,15 @@ AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG],
60 AC_CHECK_SIZEOF(long, 4)
61 AC_CHECK_SIZEOF(char *, 4)
62 if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then
63 - AC_DEFINE(HAVE_32BIT_LONG)
64 + AC_DEFINE([HAVE_32BIT_LONG], [1], [Define if long is 32bit])
65 fi
66 if test $ac_cv_sizeof_long -eq 8; then
67 - AC_DEFINE(HAVE_64BIT_LONG)
68 + AC_DEFINE([HAVE_64BIT_LONG], [1], [Define if long is 64bit])
69 fi
70 if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then
71 - AC_DEFINE(HAVE_32BIT_PTR)
72 + AC_DEFINE([HAVE_32BIT_PTR], [1], [Define if char* is 32bit])
73 fi
74 if test $ac_cv_sizeof_char_p -eq 8; then
75 - AC_DEFINE(HAVE_64BIT_PTR)
76 + AC_DEFINE([HAVE_64BIT_PTR], [1], [Define if char* is 64bit])
77 fi
78 ])