libupkg: Make decodeindex test accept an empty string.

[upkg.git] / m4 / glib.m4

diff --git a/m4/glib.m4 b/m4/glib.m4
index 30712898b6f15260f7ad352f1c61f71ca7e43020..a3253ff63f36166a76cfb31882b36a49e7d90f9a 100644 (file)
--- a/m4/glib.m4
+++ b/m4/glib.m4
@@ -6,11 +6,12 @@ dnl without any warranty.
 
 dnl _GLIB_TRY_VERSION(min-version)
 AC_DEFUN([_GLIB_TRY_VERSION], [dnl
-sedhead='s/@<:@0-9@:>@@<:@0-9@:>@*/<<<&>>>/'
-sedtail='s/.*<<<\(.*\)>>>.*/\1/;t;s/.*/0/'
-glib_min_major=`printf   '%s' '$1' | sed -e "$sedhead"1 -e "$sedtail"`
-glib_min_minor=`printf   '%s' '$1' | sed -e "$sedhead"2 -e "$sedtail"`
-glib_min_release=`printf '%s' '$1' | sed -e "$sedhead"3 -e "$sedtail"`
+shead='s/@<:@0-9@:>@@<:@0-9@:>@*/<<<&>>>/'
+sbody='s/.*<<<\(.*\)>>>.*/\1/;t'
+stail='s/.*/0/'
+glib_min_major=`printf   '%s' '$1' | sed -e "$shead"1 -e "$sbody" -e "$stail"`
+glib_min_minor=`printf   '%s' '$1' | sed -e "$shead"2 -e "$sbody" -e "$stail"`
+glib_min_release=`printf '%s' '$1' | sed -e "$shead"3 -e "$sbody" -e "$stail"`
 
 AC_CACHE_CHECK([for glib version at least $1],
        [glib_cv_sufficient_ver],
@@ -43,6 +44,12 @@ g_type_init();
 ])
 ])
 
+ifelse([$1], [gthread], [dnl
+       m4_append([_GLIB_MAIN], [dnl
+g_thread_init(NULL);
+])
+])
+
 if test x"$PKG_CONFIG" != x; then
        AC_MSG_CHECKING([pkg-config database for $1-2.0])
        _PKG_CONFIG([lib$1_cflags], [cflags], [$1-2.0])
@@ -81,6 +88,7 @@ GLIB_LIBS=
 
 _GLIB_MODULE([glib], [glib])
 _GLIB_MODULE([gobject], [$2])
+_GLIB_MODULE([gthread], [$2])
 
 AC_LANG_PUSH([C])
 old_cflags=$CFLAGS