gitignore

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

diff --git a/configure.ac b/configure.ac
index 82f5499..ead446d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [31])
-m4_define([glib_micro_version], [0])
+m4_define([glib_micro_version], [5])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
@@ -608,7 +608,7 @@ if test x$ac_cv_func_qsort_r = xyes ; then
       return 0;
     else
       return 1;
-  }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
+  }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no],[glib_cv_have_qsort_r=no])])
 fi
 
 if test x$glib_cv_have_qsort_r = xyes ; then
@@ -934,6 +934,8 @@ AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [#include <sys/statvfs.h>])
 AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,, [#include <sys/statvfs.h>])
 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[#include <time.h>])
 
+AC_STRUCT_DIRENT_D_TYPE
+
 # Checks for libcharset
 AM_LANGINFO_CODESET
 AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
@@ -1110,7 +1112,8 @@ fi
 AC_SUBST(NETWORK_LIBS)
 
 AC_CHECK_HEADER([linux/netlink.h],
-               [AC_DEFINE(HAVE_NETLINK, 1, [We have AF_NETLINK sockets])])
+               [AC_DEFINE(HAVE_NETLINK, 1, [We have AF_NETLINK sockets])],,
+               [#include <sys/socket.h>])
 AM_CONDITIONAL(HAVE_NETLINK, [test "$ac_cv_header_linux_netlink_h" = "yes"])
 
 case $host in
@@ -2652,7 +2655,7 @@ case $host in
        G_LIBS_EXTRA="-luser32 -lkernel32"
     ;;
   *-*-mingw*)
-       G_LIBS_EXTRA="-lws2_32 -lole32"
+       G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm"
     ;;
   *)
        G_LIBS_EXTRA=""
@@ -2695,7 +2698,7 @@ dnl **************************
 dnl *** Checks for gtk-doc ***
 dnl **************************
 
-GTK_DOC_CHECK([1.15])
+GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
 AC_ARG_ENABLE(man,
               [AC_HELP_STRING([--enable-man],
@@ -3358,8 +3361,8 @@ $ac_cv_sizeof_int)
   gintptr_modifier='""'
   gintptr_format='"i"'
   guintptr_format='"u"'
-  glib_gpi_cast=''
-  glib_gpui_cast=''
+  glib_gpi_cast='(gint)'
+  glib_gpui_cast='(guint)'
   ;;
 $ac_cv_sizeof_long)
   glib_intptr_type_define=long