diff options
author | Guy Harris <guy@alum.mit.edu> | 2008-05-05 22:47:32 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2008-05-05 22:47:32 +0000 |
commit | 31cae6e4ef358e39961d5620debf04c45311ae76 (patch) | |
tree | c41aaed36ad6a43e9b359d865983e833c5e3c6c5 /acinclude.m4 | |
parent | 773e6321d8a9b05e5031a212dc5123dbd6832acb (diff) |
Require GLib 2.4 or later.
That means that G_GINT64_MODIFIER will be defined, so don't check
whether it's defined.
We don't use the PRI[douxX]64 macros, as we use the GLib print routines
and thus use G_GINT64_MODIFIER instead. Get rid of the checks for
whether inttypes.h defines PRI[douxX]64; just check whether it exists at
all.
That means we don't set INTTYPES_H_DEFINES_FORMATS, so don't check for
it.
svn path=/trunk/; revision=25243
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b6eb4b5f4f..37258ed201 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1510,48 +1510,6 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK], AC_SUBST(KRB5_LIBS) ]) -dnl -dnl Check whether a given format can be used to print 64-bit integers -dnl -AC_DEFUN([AC_WIRESHARK_CHECK_64BIT_FORMAT], -[ - AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers]) - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" - AC_RUN_IFELSE( - [ - AC_LANG_SOURCE( - [[ - #include <glib.h> - #include <glib/gprintf.h> - #include <stdio.h> - - main() - { - guint64 t = 1; - char strbuf[16+1]; - g_snprintf(strbuf, sizeof strbuf, "%016$1x", t << 32); - if (strcmp(strbuf, "0000000100000000") == 0) - exit(0); - else - exit(1); - } - ]]) - ], - [ - AC_DEFINE(G_GINT64_MODIFIER, "$1", [Format modifier for printing 64-bit numbers]) - AC_MSG_RESULT(yes) - ], - [ - AC_MSG_RESULT(no) - $2 - ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -]) - # # AC_WIRESHARK_GCC_CFLAGS_CHECK # |