diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-23 03:33:52 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-23 03:33:52 +0000 |
| commit | b29d0c534a631b211f1f94168e7672c604c8f815 (patch) | |
| tree | de1a41fed08e83a6b04cdbd211fef6054326999b /configure.in | |
| parent | b3a3969897930eeda308113acbbb3f98069ee1ab (diff) | |
2003-04-22 Havoc Pennington <hp@redhat.com>
* dbus/dbus-message.c, dbus/dbus-marshal.c: add 64-bit integer
support, and do some code cleanups to share more code and
speed up array marshal/demarshal.
* dbus-1.0.pc.in (Cflags): put libdir include file in cflags
* configure.in: generate dbus-arch-deps.h
* dbus/dbus-protocol.h (DBUS_TYPE_INT64, DBUS_TYPE_UINT64): add
64-bit typecodes
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 12d8d8ea..faac0553 100644 --- a/configure.in +++ b/configure.in @@ -146,23 +146,50 @@ AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(__int64) -### this is only used in decode-gcov.c right now +### See what our 64 bit type is called +AC_MSG_CHECKING([64-bit integer type]) + case 8 in $ac_cv_sizeof_int) dbusint64=int + dbusint64_constant='(val)' + dbusuint64_constant='(val)' ;; $ac_cv_sizeof_long) dbusint64=long + dbusint64_constant='(val##L)' + dbusuint64_constant='(val##UL)' ;; $ac_cv_sizeof_long_long) dbusint64='long long' + dbusint64_constant='(val##LL)' + dbusuint64_constant='(val##ULL)' ;; $ac_cv_sizeof___int64) dbusint64=__int64 + dbusint64_constant='(val##i64)' + dbusuint64_constant='(val##ui64)' ;; esac -AC_DEFINE_UNQUOTED(DBUS_INT64_TYPE, $dbusint64, [64-bit integer type]) +if test -z "$dbusint64" ; then + DBUS_INT64_TYPE="no_int64_type_detected" + DBUS_HAVE_INT64=0 + DBUS_INT64_CONSTANT= + DBUS_UINT64_CONSTANT= + AC_MSG_RESULT([none found]) +else + DBUS_INT64_TYPE="$dbusint64" + DBUS_HAVE_INT64=1 + DBUS_INT64_CONSTANT="$dbusint64_constant" + DBUS_UINT64_CONSTANT="$dbusuint64_constant" + AC_MSG_RESULT($DBUS_INT64_TYPE) +fi + +AC_SUBST(DBUS_INT64_TYPE) +AC_SUBST(DBUS_INT64_CONSTANT) +AC_SUBST(DBUS_UINT64_CONSTANT) +AC_SUBST(DBUS_HAVE_INT64) ## byte order AC_C_BIGENDIAN @@ -521,6 +548,7 @@ bus/session.conf bus/messagebus Makefile dbus/Makefile +dbus/dbus-arch-deps.h glib/Makefile qt/Makefile bus/Makefile |