long_long_format is always ll for trio.

Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 251207a..245f7a2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Dec 12 20:46:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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.
+
 2002-12-13  Matthias Clasen  <maclas@gmx.de>
 
        * glib/trio/Makefile.am (libtrio_la_LIBADD): Add -lm for pow().

diff --git a/configure.in b/configure.in
index 8ebfd12..749f365 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -701,24 +701,35 @@ AC_FUNC_PRINTF_UNIX98
 
 AC_ARG_ENABLE(included-printf, [  --enable-included-printf    use included printf [default=auto]], enable_trio="$enableval")
 
-if test "$enable_trio" != "no" ; then
-  if test "$ac_cv_func_vsnprintf_c99" != "yes" ; then
-    enable_trio=yes
-  fi
-  if test "$ac_cv_func_printf_unix98" != "yes" ; then
-    enable_trio=yes
-  fi
-  if test "x$ac_cv_sizeof_long_long" = "x8" &&
-     test -z "$glib_cv_long_long_format"; then
-    enable_trio=yes
-    glib_cv_long_long_format="ll"
-  fi
+need_trio=no
+if test "x$enable_trio" != "xyes" ; then
+  need_trio=yes
+fi
+if test "$ac_cv_func_vsnprintf_c99" != "yes" ; then
+  need_trio=yes
+fi
+if test "$ac_cv_func_printf_unix98" != "yes" ; then
+  need_trio=yes
 fi
+if test "x$ac_cv_sizeof_long_long" = "x8" &&
+   test -z "$glib_cv_long_long_format" ; then
+  need_trio=yes
+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
+*** GLib needs, but you specified --enable-trio=no.])
+fi
+
+enable_trio=$need_trio
 
 AM_CONDITIONAL(HAVE_GOOD_PRINTF, test "$enable_trio" != "yes")
 if test "$enable_trio" != "yes" ; then 
   AC_DEFINE(HAVE_GOOD_PRINTF,1,[define to use system printf])
 else
+  glib_cv_long_long_format="ll"
   AC_DEFINE(HAVE_VASPRINTF,1)
   AC_DEFINE(HAVE_C99_VSNPRINTF,1)
   AC_DEFINE(HAVE_UNIX98_PRINTF,1)