GVariantType: gut g_variant_type_check()

[platform/upstream/glib.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index efe3e75..9eb02b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [33])
-m4_define([glib_micro_version], [7])
+m4_define([glib_micro_version], [11])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
@@ -883,7 +883,7 @@ fi
 AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h])
 AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
 AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
-AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h])
+AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
 AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
 AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
 AC_CHECK_HEADERS([linux/magic.h])
@@ -2598,48 +2598,48 @@ AC_ARG_ENABLE(man,
                               [generate man pages [default=auto]])],,
               enable_man=maybe)
 
-if test "$enable_man" != no; then
+AS_IF([test "$enable_man" != no], [
   AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    if test "$enable_man" = yes ; then
+  AS_IF([test -z "$XSLTPROC"], [
+    AS_IF([test "$enable_man" = yes], [
       AC_MSG_ERROR([xsltproc is required for --enable-man])
-    fi
+    ])
     enable_man=no
-  fi
-fi
+  ])
+])
 
-if test "$enable_man" != no; then
+AS_IF([ test "$enable_man" != no ], [
   dnl check for DocBook DTD in the local catalog
   JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
      [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
+  AS_IF([test "$have_docbook_dtd" != yes], [
+    AS_IF([test "$enable_man" = yes ], [
       AC_MSG_ERROR([DocBook DTD is required for --enable-man])
-    fi
+    ])
     enable_man=no
-  fi
-fi
+  ])
+])
 
-if test "$enable_man" != no; then
+AS_IF([test "$enable_man" != no], [
   dnl check for DocBook XSL stylesheets in the local catalog
   JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
      [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
+  AS_IF([ test "$have_docbook_dtd" != yes ], [
+    AS_IF([ test "$enable_man" = yes ], [
       AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
-    fi
+    ])
     enable_man=no
-  fi
-fi
+  ])
+])
 
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 
 AC_MSG_CHECKING([whether to generate man pages])
-if test "$enable_man" != no; then
+AS_IF([ test "$enable_man" != no ], [
   AC_MSG_RESULT([yes])
-else
+], [
   AC_MSG_RESULT([no])
-fi
+])
 
 dnl
 dnl Tracing