diff options
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | dbind/dbind-config.h.in | 16 |
2 files changed, 18 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 31733bd4..cb8e89a2 100644 --- a/configure.ac +++ b/configure.ac @@ -192,14 +192,16 @@ AC_SUBST(LIBTOOL_EXPORT_OPTIONS) dnl find sizes & alignments orig_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS" -DBIND_CHECK_ALIGNOF(char) -DBIND_CHECK_ALIGNOF(dbus_bool_t) -DBIND_CHECK_ALIGNOF(dbus_int16_t) -DBIND_CHECK_ALIGNOF(dbus_int32_t) -DBIND_CHECK_ALIGNOF(dbus_int64_t) -DBIND_CHECK_ALIGNOF(double) -DBIND_CHECK_ALIGNOF(dbind_pointer) -DBIND_CHECK_ALIGNOF(dbind_struct) +AC_CHECK_ALIGNOF(char) +AC_CHECK_ALIGNOF(dbus_bool_t, [#include <dbus/dbus.h>]) +AC_CHECK_ALIGNOF(dbus_int16_t, [#include <dbus/dbus.h>]) +AC_CHECK_ALIGNOF(dbus_int32_t, [#include <dbus/dbus.h>]) +AC_CHECK_ALIGNOF(dbus_int64_t, [#include <dbus/dbus.h>]) +AC_CHECK_ALIGNOF(double, [#include <dbus/dbus.h>]) +AC_CHECK_ALIGNOF(dbind_pointer, [AC_INCLUDES_DEFAULT +typedef void *dbind_pointer;]) +AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT +typedef struct {char s1;} dbind_struct;]) GTK_DOC_CHECK([1.09]) diff --git a/dbind/dbind-config.h.in b/dbind/dbind-config.h.in index 3da421e1..779c4c6c 100644 --- a/dbind/dbind-config.h.in +++ b/dbind/dbind-config.h.in @@ -1,8 +1,8 @@ -#define DBIND_ALIGNOF_CHAR @DBIND_ALIGNOF_CHAR@ -#define DBIND_ALIGNOF_DBIND_POINTER @DBIND_ALIGNOF_DBIND_POINTER@ -#define DBIND_ALIGNOF_DBIND_STRUCT @DBIND_ALIGNOF_DBIND_STRUCT@ -#define DBIND_ALIGNOF_DBUS_BOOL_T @DBIND_ALIGNOF_DBUS_BOOL_T@ -#define DBIND_ALIGNOF_DBUS_INT16_T @DBIND_ALIGNOF_DBUS_INT16_T@ -#define DBIND_ALIGNOF_DBUS_INT32_T @DBIND_ALIGNOF_DBUS_INT32_T@ -#define DBIND_ALIGNOF_DBUS_INT64_T @DBIND_ALIGNOF_DBUS_INT64_T@ -#define DBIND_ALIGNOF_DOUBLE @DBIND_ALIGNOF_DOUBLE@ +#define DBIND_ALIGNOF_CHAR ALIGNOF_CHAR +#define DBIND_ALIGNOF_DBIND_POINTER ALIGNOF_DBIND_POINTER +#define DBIND_ALIGNOF_DBIND_STRUCT ALIGNOF_DBIND_STRUCT +#define DBIND_ALIGNOF_DBUS_BOOL_T ALIGNOF_DBUS_BOOL_T +#define DBIND_ALIGNOF_DBUS_INT16_T ALIGNOF_DBUS_INT16_T +#define DBIND_ALIGNOF_DBUS_INT32_T ALIGNOF_DBUS_INT32_T +#define DBIND_ALIGNOF_DBUS_INT64_T ALIGNOF_DBUS_INT64_T +#define DBIND_ALIGNOF_DOUBLE ALIGNOF_DOUBLE |