X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.in;h=65a6fc9aeb199eeb0c1d6d2d529ded892b4fe1fc;hb=bc54ea6edf251c7623c3afa797da8a67a882fbd2;hp=17662a7c9722b9a9640fec5bcdc1063aa1a6f9dd;hpb=b29e35c773c1b8aacddece1f957ccec6b19cbf46;p=platform%2Fupstream%2Fglib.git

diff --git a/configure.in b/configure.in
index 17662a7..65a6fc9 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 #
 GLIB_MAJOR_VERSION=2
 GLIB_MINOR_VERSION=1
-GLIB_MICRO_VERSION=0
+GLIB_MICRO_VERSION=3
 GLIB_INTERFACE_AGE=0
 GLIB_BINARY_AGE=`expr 100 '*' $GLIB_MINOR_VERSION + $GLIB_MICRO_VERSION`
 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
@@ -206,10 +206,10 @@ if test x$PKG_CONFIG = xno ; then
   AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
 fi
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.5 ; then
+if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
   :
 else
-  AC_MSG_ERROR([*** pkg-config too old; version 0.5 or better required.])
+  AC_MSG_ERROR([*** pkg-config too old; version 0.14 or better required.])
 fi
 
 if test "x$enable_debug" = "xyes"; then
@@ -222,8 +222,10 @@ if test "x$enable_debug" = "xyes"; then
 	
   GLIB_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
+  GLIB_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
+
   if test "x$enable_debug" = "xno"; then
-    GLIB_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+    GLIB_DEBUG_FLAGS="$GLIB_DEBUG_FLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
   fi
 fi
 
@@ -710,6 +712,32 @@ AC_MSG_RESULT(unsigned $glib_size_type)
 AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf unsetenv getc_unlocked)
 
 AC_FUNC_VSNPRINTF_C99
+AC_FUNC_PRINTF_UNIX98
+
+#
+# Check whether to use trio printf
+#
+
+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
+fi
+
+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])
+  AC_DEFINE(HAVE_VASPRINTF,1)
+  AC_DEFINE(HAVE_C99_VSNPRINTF,1)
+  AC_DEFINE(HAVE_UNIX98_PRINTF,1)
+else
+  AC_DEFINE(HAVE_GOOD_PRINTF,0)
+fi
 
 # Check if bcopy can be used for overlapping copies, if memmove isn't found.
 # The check is borrowed from the PERL Configure script.
@@ -2353,6 +2381,7 @@ build/win32/Makefile
 build/win32/dirent/Makefile
 glib/Makefile
 glib/libcharset/Makefile
+glib/trio/Makefile
 gmodule/gmoduleconf.h
 gmodule/Makefile
 gobject/Makefile