From 3c50d7bd88f5e5fe251b002e9c943dbcaa0f350a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 13 Dec 2002 02:09:48 +0000 Subject: [PATCH] Allow not setting glib_cv_long_long_format when cross-compiling since we Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format when cross-compiling since we assume other things that will cause us to pull in Trio anyways. * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified but the C library doesn't have the necessary features. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ configure.in | 9 +++++---- 8 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 245f7a26..76d1963b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 245f7a26..76d1963b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 245f7a26..76d1963b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 245f7a26..76d1963b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 245f7a26..76d1963b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 245f7a26..76d1963b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 245f7a26..76d1963b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ Thu Dec 12 20:46:26 2002 Owen Taylor + * configure.in: Allow not setting glib_cv_long_long_format + when cross-compiling since we assume other things that + will cause us to pull in Trio anyways. + * configure.in: long_long_format is always ll for trio. * configure.in: Error out if --disable-trio is specified diff --git a/configure.in b/configure.in index 749f365c..7a870b67 100644 --- a/configure.in +++ b/configure.in @@ -474,8 +474,9 @@ if test x$ac_cv_sizeof_long_long = x8; then exit (b!=a); } ], - glib_cv_long_long_format=${format} - break) + [glib_cv_long_long_format=${format} + break], + [],[:]) done]) if test -n "$glib_cv_long_long_format"; then AC_MSG_RESULT(%${glib_cv_long_long_format}u) @@ -702,7 +703,7 @@ AC_FUNC_PRINTF_UNIX98 AC_ARG_ENABLE(included-printf, [ --enable-included-printf use included printf [default=auto]], enable_trio="$enableval") need_trio=no -if test "x$enable_trio" != "xyes" ; then +if test "x$enable_trio" = "xyes" ; then need_trio=yes fi if test "$ac_cv_func_vsnprintf_c99" != "yes" ; then @@ -719,7 +720,7 @@ fi if test "x$enable_trio" = "xno" && test "x$need_trio" = "xyes" ; then AC_MSG_ERROR([ -*** Your C library's printf doens't appear to have the features that +*** Your C library's printf doesn't appear to have the features that *** GLib needs, but you specified --enable-trio=no.]) fi -- 2.34.1