configure: Fix alignment tests when cross compiling

When inserting custom code to AC_CHECK_ALIGNOF, make sure to not replace
the default includes, but instead append to them.

This fixes ALIGNOF_GUINT32 and ALIGNOF_GUINT64 that were both 0 when cross
compiling. The third 'unsigned long' test wasn't affected because the
AC_CHECK_ALIGNOF call didn't specify the optional 2nd parameter.
This commit is contained in:
Kalev Lember 2012-03-28 12:42:49 +03:00
parent 92b84e88ab
commit 8f8fc83670

View File

@ -3405,8 +3405,10 @@ $ac_cv_sizeof___int64)
;; ;;
esac esac
AC_CHECK_ALIGNOF([guint32], [typedef unsigned $gint32 guint32;]) AC_CHECK_ALIGNOF([guint32], [AC_INCLUDES_DEFAULT
AC_CHECK_ALIGNOF([guint64], typedef unsigned $gint64 guint64;) typedef unsigned $gint32 guint32;])
AC_CHECK_ALIGNOF([guint64], [AC_INCLUDES_DEFAULT
typedef unsigned $gint64 guint64;])
AC_CHECK_ALIGNOF([unsigned long]) AC_CHECK_ALIGNOF([unsigned long])
# Check for libdbus1 - Optional - is only used in the GDBus test cases # Check for libdbus1 - Optional - is only used in the GDBus test cases