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