added g_list_nth_prev() which walks ->prev instead of ->next.
[platform/upstream/glib.git] / configure.in
index 887cc82..5cd4e33 100644 (file)
@@ -15,10 +15,10 @@ cflags_set=${CFLAGS+set}
 # we rewrite this file
 rm -f glibconfig-sysdefs.h
 
-GLIB_DIVERT_BEFORE_HELP([
+GLIB_AC_DIVERT_BEFORE_HELP([
 #
-# The following version number definitions apply to GLib, GModule, GObject and GThread
-# as a whole, so if changes occoured in any of them, they are all
+# The following version number definitions apply to GLib, GModule, GObject 
+# and GThread as a whole, so if changes occoured in any of them, they are all
 # treated with the same interface and binary age.
 #
 # Making releases:
@@ -31,7 +31,7 @@ GLIB_DIVERT_BEFORE_HELP([
 #
 GLIB_MAJOR_VERSION=1
 GLIB_MINOR_VERSION=3
-GLIB_MICRO_VERSION=1
+GLIB_MICRO_VERSION=2
 GLIB_INTERFACE_AGE=0
 GLIB_BINARY_AGE=0
 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
@@ -62,14 +62,16 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 # Specify a configuration file
 AM_CONFIG_HEADER(config.h)
 
-AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
-AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION)
-AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE)
-AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
-
-dnl Initialize libtool
-AM_PROG_LIBTOOL
+AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION,
+                  [Define to the GLIB major version])
+AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION,
+                  [Define to the GLIB minor version])
+AC_DEFINE_UNQUOTED(GLIB_MICRO_VERSION, $GLIB_MICRO_VERSION,
+                  [Define to the GLIB micro version])
+AC_DEFINE_UNQUOTED(GLIB_INTERFACE_AGE, $GLIB_INTERFACE_AGE,
+                  [Define to the GLIB interface age])
+AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE,
+                  [Define to the GLIB binary age])
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
@@ -89,59 +91,69 @@ AC_MSG_RESULT([$glib_native_beos])
 
 dnl
 
-GLIB_DIVERT_BEFORE_HELP([
+GLIB_AC_DIVERT_BEFORE_HELP([
 # figure debugging default, prior to $ac_help setup
-if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
-  debug_default=yes
-else
-  debug_default=minimum
-fi[]dnl
+case $GLIB_MINOR_VERSION in
+*[[13579]]) debug_default=yes ;;
+*)          debug_default=minimum ;;
+esac[]dnl
 ])
 
 dnl declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
 AC_ARG_ENABLE(msg-prefix, [  --enable-msg-prefix     turn on program name and PID prefixing of messages and warnings],,enable_msg_prefix=no)
-AC_ARG_ENABLE(mem_check, [  --enable-mem-check      turn on malloc/free sanity checking [default=no]],,enable_mem_check=no)
-AC_ARG_ENABLE(mem_profile, [  --enable-mem-profile    turn on malloc profiling atexit [default=no]],,enable_mem_profile=no)
 AC_ARG_ENABLE(gc_friendly, [  --enable-gc-friendly    turn on garbage collector friendliness [default=no]],,enable_gc_friendly=no)
+AC_ARG_ENABLE(mem_pools, [  --disable-mem-pools     disable all glib memory pools],,disable_mem_pools=no)
 AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
                    , enable_ansi=no)
 AC_ARG_ENABLE(threads, [  --enable-threads        turn on basic thread support [default=yes]
                           ([=no] will override --with-threads)],,enable_threads=yes)
+AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
 
 if test "x$enable_threads" != "xyes"; then
   enable_threads=no
 fi
 
-AC_MSG_CHECKING(whether to enable memory checking)
-if test "x$enable_mem_check" = "xyes"; then
-  AC_DEFINE(ENABLE_MEM_CHECK, 1)
-  AC_SUBST(ENABLE_MEM_CHECK)
+AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}",
+       [Whether glib was compiled with debugging enabled])
+
+AC_MSG_CHECKING(whether to enable garbage collector friendliness)
+if test "x$enable_gc_friendly" = "xyes"; then
+  AC_DEFINE(ENABLE_GC_FRIENDLY, 1, [Whether to enable GC friendliness])
+  AC_SUBST(ENABLE_GC_FRIENDLY)
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING(whether to enable memory profiling)
-if test "x$enable_mem_profile" = "xyes"; then
-  AC_DEFINE(ENABLE_MEM_PROFILE, 1)
-  AC_SUBST(ENABLE_MEM_PROFILE)
-  AC_MSG_RESULT(yes)
-else
+AC_MSG_CHECKING(whether to disable memory pools)
+if test "x$disable_mem_pools" = "xno"; then
   AC_MSG_RESULT(no)
+else
+  AC_DEFINE(DISABLE_MEM_POOLS, 1, [Whether to disable memory pools])
+  AC_SUBST(DISABLE_MEM_POOLS)
+  AC_MSG_RESULT(yes)
 fi
 
-AC_MSG_CHECKING(whether to enable garbage collector friendliness)
-if test "x$enable_gc_friendly" = "xyes"; then
-  AC_DEFINE(ENABLE_GC_FRIENDLY, 1)
-  AC_SUBST(ENABLE_GC_FRIENDLY)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
+if test "x$enable_msg_prefix" = "xyes"; then
+  AC_DEFINE_UNQUOTED(G_ENABLE_MSG_PREFIX, 1, 
+                    [Enable prefixing of error messages with program names])
 fi
 
+dnl Checks for programs.
+AC_PROG_CC
+
+AM_PROG_CC_STDC
+AC_PROG_INSTALL
+
 if test "x$enable_debug" = "xyes"; then
-  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
+  if test x$cflags_set != xset ; then
+      case " $CFLAGS " in
+      *[[\ \   ]]-g[[\ \       ]]*) ;;
+      *) CFLAGS="$CFLAGS -g" ;;
+      esac
+  fi
+       
   GLIB_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
@@ -149,37 +161,64 @@ else
   fi
 fi
 
-AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
-
-if test "x$enable_msg_prefix" = "xyes"; then
-  AC_DEFINE_UNQUOTED(G_ENABLE_MSG_PREFIX, 1)
+AC_CYGWIN
+AC_EXEEXT
+
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
+AC_PROG_AWK
+AC_CHECK_PROGS(PERL, perl5 perl)
+# We would like indent, but don't require it.
+AC_CHECK_PROG(INDENT, indent, indent)
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
+     test -n "$AWK" ; then
+  REBUILD=
 fi
+AC_SUBST(REBUILD)
 
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_PROG_INSTALL
 
-changequote(,)dnl
+dnl
+dnl gettext support
+dnl
+
+ALL_LINGUAS="de fr no ru sl tr uk"
+AM_GLIB_GNU_GETTEXT
+LIBS="$LIBS $INTLLIBS"
+
+GETTEXT_PACKAGE=glib20
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
+# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale"
+AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR,"$GLIB_LOCALE_DIR")
+
+dnl Initialize libtool
+AC_LIBTOOL_WIN32_DLL
+AM_PROG_LIBTOOL
+
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
-  *[\ \        ]-Wall[\ \      ]*) ;;
+  *[[\ \       ]]-Wall[[\ \    ]]*) ;;
   *) CFLAGS="$CFLAGS -Wall" ;;
   esac
 
   if test "x$enable_ansi" = "xyes"; then
     case " $CFLAGS " in
-    *[\ \      ]-ansi[\ \      ]*) ;;
+    *[[\ \     ]]-ansi[[\ \    ]]*) ;;
     *) CFLAGS="$CFLAGS -ansi" ;;
     esac
 
     case " $CFLAGS " in
-    *[\ \      ]-pedantic[\ \  ]*) ;;
+    *[[\ \     ]]-pedantic[[\ \        ]]*) ;;
     *) CFLAGS="$CFLAGS -pedantic" ;;
     esac
   fi
 fi
-changequote([,])dnl
 
 dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
@@ -234,7 +273,7 @@ if test x$ac_cv_sizeof_long_long = x8; then
        # long long is a 64 bit integer.
        AC_MSG_CHECKING(for format to printf and scanf a gint64)
        AC_CACHE_VAL(glib_cv_long_long_format,[
-               for format in ll q; do
+               for format in ll q I64; do
                  AC_TRY_RUN([#include <stdio.h>  
                        int main()
                        {
@@ -249,7 +288,7 @@ if test x$ac_cv_sizeof_long_long = x8; then
                        break)
                done])
        if test -n "$glib_cv_long_long_format"; then
-         AC_MSG_RESULT(%${glib_cv_long_long_format}i)
+         AC_MSG_RESULT(%${glib_cv_long_long_format}u)
         else
          AC_MSG_RESULT(none)
         fi
@@ -259,11 +298,37 @@ dnl long doubles were not used, and a portability problem
 dnl AC_C_LONG_DOUBLE
 AC_C_CONST
 
+dnl ok, here we try to check whether the systems prototypes for
+dnl malloc and friends actually match the prototypes provided
+dnl by gmem.h (keep in sync). i currently only know how to check
+dnl this reliably with gcc (-Werror), improvements for other
+dnl compilers are apprechiated.
+SANE_MALLOC_PROTOS=no
+AC_MSG_CHECKING([if malloc() and friends prototypes are gmem.h compatible])
+glib_save_CFLAGS=$CFLAGS
+if test "x$GCC" = "xyes"; then
+  CFLAGS="$CFLAGS -Werror"
+  AC_TRY_COMPILE([#include <stdlib.h>], [
+    void* (*my_calloc_p)  (size_t, size_t) = calloc;
+    void* (*my_malloc_p)  (size_t)         = malloc;
+    void  (*my_free_p)    (void*)          = free;
+    void* (*my_realloc_p) (void*, size_t)  = realloc;
+    my_calloc_p = 0;
+    my_malloc_p = 0;
+    my_free_p = 0;
+    my_realloc_p = 0;
+  ],
+    AC_DEFINE(SANE_MALLOC_PROTOS)
+    SANE_MALLOC_PROTOS=yes)
+fi
+AC_MSG_RESULT($SANE_MALLOC_PROTOS)
+CFLAGS=$glib_save_CFLAGS
+
+
 dnl AC_C_INLINE is useless to us since it bails out too early, we need to
 dnl truely know which ones of `inline', `__inline' and `__inline__' are
 dnl actually supported.
-AC_MSG_CHECKING(for __inline)
-AC_CACHE_VAL(glib_cv_has__inline,[
+AC_CACHE_CHECK([for __inline],glib_cv_has__inline,[
         AC_TRY_RUN([
        __inline int foo () { return 0; }
        int main () { return foo (); }
@@ -273,12 +338,10 @@ AC_CACHE_VAL(glib_cv_has__inline,[
        glib_cv_has__inline=no
         ,)
 ])
-AC_MSG_RESULT($glib_cv_has__inline)
 case x$glib_cv_has__inline in
-xyes) AC_DEFINE(G_HAVE___INLINE)
+xyes) AC_DEFINE(G_HAVE___INLINE,1,[Have __inline keyword])
 esac
-AC_MSG_CHECKING(for __inline__)
-AC_CACHE_VAL(glib_cv_has__inline__,[
+AC_CACHE_CHECK([for __inline__],glib_cv_has__inline__,[
         AC_TRY_RUN([
        __inline__ int foo () { return 0; }
        int main () { return foo (); }
@@ -288,12 +351,10 @@ AC_CACHE_VAL(glib_cv_has__inline__,[
        glib_cv_has__inline__=no
         ,)
 ])
-AC_MSG_RESULT($glib_cv_has__inline__)
 case x$glib_cv_has__inline__ in
-xyes) AC_DEFINE(G_HAVE___INLINE__)
+xyes) AC_DEFINE(G_HAVE___INLINE__,1,[Have __inline__ keyword])
 esac
-AC_MSG_CHECKING(for inline)
-AC_CACHE_VAL(glib_cv_hasinline,[
+AC_CACHE_CHECK([for inline], glib_cv_hasinline,[
         AC_TRY_RUN([
        inline int foo () { return 0; }
        int main () { return foo (); }
@@ -303,9 +364,8 @@ AC_CACHE_VAL(glib_cv_hasinline,[
        glib_cv_hasinline=no
         ,)
 ])
-AC_MSG_RESULT($glib_cv_hasinline)
 case x$glib_cv_hasinline in
-xyes) AC_DEFINE(G_HAVE_INLINE)
+xyes) AC_DEFINE(G_HAVE_INLINE,1,[Have inline keyword])
 esac
 
 # check for bytesex stuff
@@ -313,7 +373,7 @@ AC_C_BIGENDIAN
 
 # check for header files
 AC_CHECK_HEADERS([float.h limits.h pwd.h sys/param.h sys/poll.h sys/select.h])
-AC_CHECK_HEADERS([sys/time.h sys/times.h unistd.h values.h stdint.h])
+AC_CHECK_HEADERS([sys/time.h sys/times.h unistd.h values.h stdint.h sched.h])
 
 AC_MSG_CHECKING(whether make is GNU Make)
 STRIP_BEGIN=
@@ -352,7 +412,7 @@ GLIB_SIZEOF([$size_includes], ptrdiff_t, ptrdiff_t)
 GLIB_SIZEOF([$size_includes], intmax_t, intmax_t)
 
 # Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll getcwd)
+AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf stpcpy strcasecmp strncasecmp poll getcwd)
 
 # Check if bcopy can be used for overlapping copies, if memmove isn't found.
 # The check is borrowed from the PERL Configure script.
@@ -374,8 +434,8 @@ if test "$ac_cv_func_memmove" != "yes"; then
         }
         return(0);
       }],glib_cv_working_bcopy=yes,glib_cv_working_bcopy=no)])
-  if test "$glib_cv_working_bcopy" == "yes"; then
-    AC_DEFINE(HAVE_WORKING_BCOPY)
+  if test "$glib_cv_working_bcopy" = "yes"; then
+    AC_DEFINE(HAVE_WORKING_BCOPY,1,[Have a working bcopy])
   fi
 fi
 
@@ -388,7 +448,7 @@ sys_errlist[sys_nerr-1][0] = 0;
 ], glib_ok=yes, glib_ok=no)
 AC_MSG_RESULT($glib_ok)
 if test $glib_ok = no; then
-    AC_DEFINE(NO_SYS_ERRLIST)
+    AC_DEFINE(NO_SYS_ERRLIST,1,[global 'sys_errlist' not found])
 fi
 
 # Check for sys_siglist
@@ -399,7 +459,7 @@ exit (sys_siglist[0]);
 ], glib_ok=yes, glib_ok=no)
 AC_MSG_RESULT($glib_ok)
 if test $glib_ok = no; then
-    AC_DEFINE(NO_SYS_SIGLIST)
+    AC_DEFINE(NO_SYS_SIGLIST,1,[global 'sys_siglist' not found])
 fi
 
 # Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog)
@@ -409,7 +469,7 @@ strlen (sys_siglist[0]);
 ], glib_ok=yes, glib_ok=no)
 AC_MSG_RESULT($glib_ok)
 if test $glib_ok = no; then
-    AC_DEFINE(NO_SYS_SIGLIST_DECL)
+    AC_DEFINE(NO_SYS_SIGLIST_DECL,1,[global 'sys_siglist' not declared])
 fi
 
 # Check if <sys/select.h> needs to be included for fd_set
@@ -419,40 +479,38 @@ AC_TRY_COMPILE([#include <sys/types.h>],
 if test $gtk_ok = yes; then
     AC_MSG_RESULT([yes, found in sys/types.h])
 else
-    AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
+    AC_EGREP_HEADER(fd_set, sys/select.h, gtk_ok=yes)
     if test $gtk_ok = yes; then
-        AC_DEFINE(HAVE_SYS_SELECT_H)
+       # *** FIXME: give it a different name
+        AC_DEFINE(HAVE_SYS_SELECT_H,1,[found fd_set in sys/select.h])
         AC_MSG_RESULT([yes, found in sys/select.h])
     else
-       AC_DEFINE(NO_FD_SET)
+       AC_DEFINE(NO_FD_SET,1,[didn't find fd_set])
        AC_MSG_RESULT(no)
     fi
 fi
 
 dnl *** check for sane realloc() ***
-AC_MSG_CHECKING(whether realloc (NULL,) will work)
-AC_CACHE_VAL(glib_cv_sane_realloc,[
+AC_CACHE_CHECK([whether realloc (NULL,) will work],glib_cv_sane_realloc,[
         AC_TRY_RUN([
         #include <stdlib.h>
         int main() {
           return realloc (0, sizeof (int)) == 0;
         }],
-        glib_cv_sane_realloc=yes
-        ,
-        glib_cv_sane_realloc=no
-        ,)
+        [glib_cv_sane_realloc=yes],
+        [glib_cv_sane_realloc=no],
+       [])
 ])
 if test x$glib_cv_sane_realloc = xyes; then
-  AC_DEFINE(REALLOC_0_WORKS)
+  AC_DEFINE(REALLOC_0_WORKS,1,[whether realloc (NULL,) works])
 fi
-AC_MSG_RESULT($glib_cv_sane_realloc)
 
 dnl Check for nl_langinfo and CODESET
 
 AC_MSG_CHECKING([for nl_langinfo (CODESET)])
 AC_TRY_COMPILE([#include <langinfo.h>],
        [char *codeset = nl_langinfo (CODESET);],
-   AC_DEFINE(HAVE_CODESET)
+   AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
    have_codeset=yes,
    have_codeset=no)
 AC_MSG_RESULT($have_codeset)
@@ -471,7 +529,7 @@ char *p = malloc(10);
 ], glib_ok=yes, glib_ok=no)
 AC_MSG_RESULT($glib_ok)
 if test $glib_ok = yes; then
-    AC_DEFINE(HAVE_STRLCPY)
+    AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
 fi
   
 
@@ -480,8 +538,7 @@ dnl *** va_copy checks ***
 dnl **********************
 dnl we currently check for all three va_copy possibilities, so we get
 dnl all results in config.log for bug reports.
-AC_MSG_CHECKING(for an implementation of va_copy())
-AC_CACHE_VAL(glib_cv_va_copy,[
+AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
        AC_TRY_RUN([
        #include <stdarg.h>
        void f (int i, ...) {
@@ -496,14 +553,11 @@ AC_CACHE_VAL(glib_cv_va_copy,[
          f (0, 42);
          return 0;
        }],
-       glib_cv_va_copy=yes
-       ,
-       glib_cv_va_copy=no
-       ,)
+       [glib_cv_va_copy=yes],
+       [glib_cv_va_copy=no],
+       [])
 ])
-AC_MSG_RESULT($glib_cv_va_copy)
-AC_MSG_CHECKING(for an implementation of __va_copy())
-AC_CACHE_VAL(glib_cv___va_copy,[
+AC_CACHE_CHECK([for an implementation of __va_copy()],glib_cv___va_copy,[
        AC_TRY_RUN([
        #include <stdarg.h>
        void f (int i, ...) {
@@ -518,14 +572,23 @@ AC_CACHE_VAL(glib_cv___va_copy,[
          f (0, 42);
          return 0;
        }],
-       glib_cv___va_copy=yes
-       ,
-       glib_cv___va_copy=no
-       ,)
+       [glib_cv___va_copy=yes],
+       [glib_cv___va_copy=no],
+       [])
 ])
-AC_MSG_RESULT($glib_cv___va_copy)
-AC_MSG_CHECKING(whether va_lists can be copied by value)
-AC_CACHE_VAL(glib_cv_va_val_copy,[
+
+if test "x$glib_cv_va_copy" = "xyes"; then
+  g_va_copy_func=va_copy
+else if test "x$glib_cv___va_copy" = "xyes"; then
+  g_va_copy_func=__va_copy
+fi
+fi
+
+if test -n "$g_va_copy_func"; then
+  AC_DEFINE_UNQUOTED(G_VA_COPY,$g_va_copy_func,[A 'va_copy' style function])
+fi
+
+AC_CACHE_CHECK([whether va_lists can be copied by value],glib_cv_va_val_copy,[
        AC_TRY_RUN([
        #include <stdarg.h>
        void f (int i, ...) {
@@ -540,22 +603,14 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
          f (0, 42);
          return 0;
        }],
-       glib_cv_va_val_copy=yes
-       ,
-       glib_cv_va_val_copy=no
-       ,)
+       [glib_cv_va_val_copy=yes],
+       [glib_cv_va_val_copy=no],
+       [])
 ])
-if test "x$glib_cv_va_copy" = "xyes"; then
-  AC_DEFINE(G_VA_COPY, va_copy)
-else if test "x$glib_cv___va_copy" = "xyes"; then
-  AC_DEFINE(G_VA_COPY, __va_copy)
-fi
-fi
+
 if test "x$glib_cv_va_val_copy" = "xno"; then
-  AC_DEFINE(G_VA_COPY_AS_ARRAY)
+  AC_DEFINE(G_VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
 fi
-AC_MSG_RESULT($glib_cv_va_val_copy)
-
 
 dnl ***********************
 dnl *** g_module checks ***
@@ -566,7 +621,14 @@ G_MODULE_PLUGIN_LIBS=
 G_MODULE_LDFLAGS=
 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
 G_MODULE_NEED_USCORE=0
+G_MODULE_BROKEN_RTLD_GLOBAL=0
 G_MODULE_HAVE_DLERROR=0
+dnl *** force native WIN32 shared lib loader 
+if test -z "$G_MODULE_IMPL"; then
+  case "$host" in
+  *-*-mingw*|*-*-cygwin*) G_MODULE_IMPL=G_MODULE_IMPL_WIN32 ;;
+  esac
+fi
 dnl *** dlopen() and dlsym() in system libraries
 if test -z "$G_MODULE_IMPL"; then
        AC_CHECK_FUNC(dlopen,
@@ -577,11 +639,11 @@ fi
 dnl *** load_image (BeOS)
 if test -z "$G_MODULE_IMPL" -a "x$glib_native_beos" = "xyes"; then
   AC_CHECK_LIB(root, load_image,
-      G_MODULE_LIBS="-lbe -lroot -lglib"
+      [G_MODULE_LIBS="-lbe -lroot -lglib"
       G_MODULE_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
       G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule"
-      G_MODULE_IMPL=G_MODULE_IMPL_BEOS 
-,)
+      G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
+      [])
 fi   
 # *** dlopen() and dlsym() in libdl
 if test -z "$G_MODULE_IMPL"; then
@@ -600,9 +662,8 @@ if test -z "$G_MODULE_IMPL"; then
                 [ G_MODULE_LDFLAGS="-Wl,-E" ],[
                 LDFLAGS="$SAVED_LDFLAGS -bexpall"
                 AC_TRY_LINK(,[ return 0; ],
-                        G_MODULE_LDFLAGS="-bexpall",
-                        G_MODULE_LDFLAGS="none"
-                )
+                        [G_MODULE_LDFLAGS="-bexpall"],
+                        [G_MODULE_LDFLAGS="none"])
         ])
         LDFLAGS=$SAVED_LDFLAGS
         AC_MSG_RESULT($G_MODULE_LDFLAGS)
@@ -610,9 +671,9 @@ if test -z "$G_MODULE_IMPL"; then
                 G_MODULE_LDFLAGS=
         fi
        AC_CHECK_LIB(dld, shl_load,
-               G_MODULE_LIBS=-ldld
-               G_MODULE_IMPL=G_MODULE_IMPL_DLD
-       ,)
+               [G_MODULE_LIBS=-ldld
+               G_MODULE_IMPL=G_MODULE_IMPL_DLD],
+               [])
 fi
 dnl *** additional checks for G_MODULE_IMPL_DL
 if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
@@ -625,9 +686,39 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
        LDFLAGS_orig="$LDFLAGS"
        LIBS="$LIBS $G_MODULE_LIBS"
        LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+       AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+               glib_cv_rtldglobal_broken,[
+               AC_TRY_RUN([
+               #include <dlfcn.h>
+                #ifndef RTLD_GLOBAL
+                #define RTLD_GLOBAL 0
+                #endif
+                #ifndef RTLD_LAZY
+                #define RTLD_LAZY 0
+                #endif
+               int pthread_create;
+               int main () {
+               void *handle, *global, *local;
+               global = &pthread_create;
+               handle = dlopen ("libpthread.so", RTLD_GLOBAL | RTLD_LAZY);
+               if (!handle) return 0;
+               local = dlsym (handle, "pthread_create");
+               return global == local;
+               }],
+                       [glib_cv_rtldglobal_broken=no],
+                       [glib_cv_rtldglobal_broken=yes],
+                       [])
+               rm -f plugin.c plugin.o plugin.lo
+       ])
+       if test "x$glib_cv_rtldglobal_broken" = "xyes"; then
+               G_MODULE_BROKEN_RTLD_GLOBAL=1
+       else
+               G_MODULE_BROKEN_RTLD_GLOBAL=0
+       fi
 dnl *** check whether we need preceeding underscores
-       AC_MSG_CHECKING(for preceeding underscore in symbols)
-       AC_CACHE_VAL(glib_cv_uscore,[
+       AC_CACHE_CHECK([for preceeding underscore in symbols],
+               glib_cv_uscore,[
                AC_TRY_RUN([
                #include <dlfcn.h>
                 int glib_underscore_test (void) { return 42; }
@@ -639,12 +730,11 @@ dnl *** check whether we need preceeding underscores
                    f2 = dlsym (handle, "_glib_underscore_test");
                  } return (!f2 || f1);
                }],
-                       glib_cv_uscore=yes,
-                       glib_cv_uscore=no,
-               )
-               rm -f plugin.c plugin.o plugin.lo
+                       [glib_cv_uscore=yes],
+                       [glib_cv_uscore=no],
+                       [])
+               rm -f plugin.c plugin.$ac_objext plugin.lo
        ])
-       AC_MSG_RESULT($glib_cv_uscore)
        if test "x$glib_cv_uscore" = "xyes"; then
                G_MODULE_NEED_USCORE=1
        else
@@ -654,23 +744,122 @@ dnl *** check whether we need preceeding underscores
        LDFLAGS="$LDFLAGS_orig"
 dnl *** check for having dlerror()
        AC_CHECK_FUNC(dlerror,
-               G_MODULE_HAVE_DLERROR=1,
-               G_MODULE_HAVE_DLERROR=0)
+               [G_MODULE_HAVE_DLERROR=1],
+               [G_MODULE_HAVE_DLERROR=0])
        LIBS="$LIBS_orig"
 fi
-dnl *** done, have e got an implementation?
+dnl *** done, have we got an implementation?
 if test -z "$G_MODULE_IMPL"; then
        G_MODULE_IMPL=0
 fi
+
+AC_MSG_CHECKING(for the suffix of shared libraries)
+case "$host_os" in
+  hpux9* | hpux10* | hpux11*)  # taken from ltconfig
+    glib_gmodule_suffix='sl'
+    ;;
+  cygwin* | mingw*)
+    glib_gmodule_suffix='dll'
+    ;;
+  *)
+    glib_gmodule_suffix='so'    
+    ;;
+esac
+AC_MSG_RESULT(.$glib_gmodule_suffix)
 AC_SUBST(G_MODULE_IMPL)
 AC_SUBST(G_MODULE_LIBS)
 AC_SUBST(G_MODULE_LIBS_EXTRA)
 AC_SUBST(G_MODULE_PLUGIN_LIBS)
 AC_SUBST(G_MODULE_LDFLAGS)
 AC_SUBST(G_MODULE_HAVE_DLERROR)
+AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
 AC_SUBST(G_MODULE_NEED_USCORE)
 AC_SUBST(GLIB_DEBUG_FLAGS)
 
+dnl **********************
+dnl *** g_spawn checks ***
+dnl **********************
+
+AC_MSG_CHECKING(for gspawn implementation)
+case "$host" in
+  *-*-mingw*)
+    GSPAWN=gspawn-win32.lo
+    ;;
+  *)
+    GSPAWN=gspawn.lo
+    ;;    
+esac
+AC_MSG_RESULT($GSPAWN)
+AC_SUBST(GSPAWN)
+
+dnl *************************
+dnl *** GIOChannel checks ***
+dnl *************************
+
+AC_MSG_CHECKING(for GIOChannel implementation)
+case "$host" in
+  *-*-mingw*)
+    GIO=giowin32.lo
+    ;;
+  *)
+    GIO=giounix.lo
+    ;;    
+esac
+AC_MSG_RESULT($GIO)
+AC_SUBST(GIO)
+
+dnl ****************************************
+dnl *** platform dependent source checks ***
+dnl ****************************************
+
+AC_MSG_CHECKING(for platform-dependent source)
+case "$host" in
+  *-*-cygwin*|*-*-mingw*)
+    PLATFORMDEP=gwin32.lo
+    ;;
+  *)
+    PLATFORMDEP=
+    ;;    
+esac
+AC_MSG_RESULT($PLATFORMDEP)
+AC_SUBST(PLATFORMDEP)
+
+AC_MSG_CHECKING([whether to compile timeloop])
+case "$host" in
+  *-*-cygwin*|*-*-mingw*)
+    enable_timeloop=no
+    ;;
+  *)
+    enable_timeloop=yes
+    ;;    
+esac
+AC_MSG_RESULT($enable_timeloop)
+AM_CONDITIONAL(ENABLE_TIMELOOP, test x$enable_timeloop = xyes)
+
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_MSG_RESULT($platform_win32)
+AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+
+AC_MSG_CHECKING([if building for pure Win32])
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+    ;;
+esac
+AC_MSG_RESULT($os_win32)
+AM_CONDITIONAL(OS_WIN32, test x$os_win32 = xyes)
 
 dnl ***********************
 dnl *** g_thread checks ***
@@ -697,7 +886,7 @@ THREAD_NO_IMPLEMENTATION="You do not have any known thread system on your
                 computer. GLib will not have a default thread implementation."
 
 FLAG_DOES_NOT_WORK="I can't find the MACRO to enable thread safety on your
-                platform (normaly it's "_REENTRANT"). I'll not use any flag on
+                platform (normally it's "_REENTRANT"). I'll not use any flag on
                 compilation now, but then your programs might not work.
                 Please provide information on how it is done on your system."
 
@@ -740,20 +929,20 @@ if test "x$want_threads" = xyes || test "x$want_threads" = xsolaris; then
 fi
 if test "x$want_threads" = xyes || test "x$want_threads" = xposix \
                                || test "x$want_threads" = xdce; then
-       # -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
+       # -D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
        # -U_OSF_SOURCE is for Digital UNIX 4.0d
-       GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE"
+       GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE"
        glib_save_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
         if test "x$have_threads" = xnone; then
-                AC_EGREP_HEADER([(^|[^a-zA-Z_])pthread_attr_init[^a-zA-Z_]],
-                       pthread.h,
+                AC_TRY_COMPILE([#include <pthread.h>],
+                       [pthread_attr_t attr; pthread_attr_init(&attr);],
                        have_threads=posix)
         fi
         if test "x$have_threads" = xnone; then
-                AC_EGREP_HEADER([(^|[^a-zA-Z_])pthread_attr_create[^a-zA-Z_]],
-                       pthread.h,
-                       have_threads=dce)
+                AC_TRY_COMPILE([#include <pthread.h>],
+                       [pthread_attr_t attr; pthread_attr_create(&attr);],
+                       have_threads=posix)
         fi
        CPPFLAGS="$glib_save_CPPFLAGS"
 fi
@@ -799,6 +988,8 @@ if test x"$have_threads" != xnone; then
                        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -pthread"
                fi      
                ;;
+       *-dg-dgux*)  # DG/UX
+               G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_POSIX4A_DRAFT10_SOURCE"
     esac
 
     # if we are not finding the ctime_r function, then we probably are
@@ -807,9 +998,11 @@ if test x"$have_threads" != xnone; then
     glib_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
 
-    # Note: Digital UNIX 4.0d #defines ctime_r to _Pctime_r for gcc.
-    AC_EGREP_HEADER([[^a-zA-Z_](_P)?ctime_r[^a-zA-Z_]], time.h, ,
-       AC_MSG_WARN($FLAG_DOES_NOT_WORK))
+    AC_TRY_COMPILE([#include <time.h>],
+       [time_t t; char b[30]; ctime_r (&t, b);], ,
+           [AC_TRY_COMPILE([#include <time.h>],
+               [time_t t; char b[30]; ctime_r (&t, b, 30);], ,
+                       AC_MSG_WARN($FLAG_DOES_NOT_WORK))])
 
     CPPFLAGS="$glib_save_CPPFLAGS"
 
@@ -824,7 +1017,9 @@ dnl ******************************
 mutex_has_default=no
 case $have_threads in
         posix|dce)
-          G_THREAD_LIBS=error
+          glib_save_CPPFLAGS="$CPPFLAGS"
+          CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
+           G_THREAD_LIBS=error
           glib_save_LIBS="$LIBS"
           case $host in
             *-sysv5uw7*) # UnixWare 7 
@@ -835,7 +1030,7 @@ case $have_threads in
                fi      
                ;;
              *)
-               for thread_lib in "" pthread pthreads c_r thread dce; do
+               for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
                        if test x"$thread_lib" = x; then
                                add_thread_lib=""
                                IN=""
@@ -844,7 +1039,7 @@ case $have_threads in
                                IN=" in -l$thread_lib"
                        fi
                        if test x"$have_threads" = xposix; then
-                               defattr=NULL
+                               defattr=0
                        else
                                defattr=pthread_attr_default
                        fi
@@ -858,7 +1053,7 @@ case $have_threads in
                                 main()
                                { pthread_t t; 
                                  void *ret;
-                                 pthread_create (&t, $defattr, func, NULL);
+                                 pthread_create (&t, $defattr, func, 0);
                                  pthread_join (t, &ret);
                                  exit (check_me != 42);
                                }],
@@ -870,7 +1065,7 @@ case $have_threads in
                if test "x$G_THREAD_LIBS" = xerror; then
                  AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
                fi
-               for thread_lib in "" rt; do
+               for thread_lib in "" rt rte; do
                        if test x"$thread_lib" = x; then
                                add_thread_lib=""
                                IN=""
@@ -909,6 +1104,7 @@ case $have_threads in
             have_threads="posix"
           fi
           AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES)
+           CPPFLAGS="$glib_save_CPPFLAGS"
            ;;
         solaris)
           G_THREAD_LIBS=error
@@ -954,52 +1150,53 @@ if test x"$have_threads" != xnone; then
        # LIBS="$LIBS $G_THREAD_LIBS"
        AC_CHECK_FUNCS(localtime_r)
        if test "$ac_cv_header_pwd_h" = "yes"; then
-               AC_MSG_CHECKING([for getpwuid_r])
-               AC_CACHE_VAL(ac_cv_func_getpwuid_r,
+               AC_CACHE_CHECK([for posix getpwuid_r],
+                       ac_cv_func_posix_getpwuid_r,
                        [AC_TRY_RUN([#include <errno.h>
-                               int main () { char buffer[10000], *pointer; 
-                               char getpwuid_r (long, void*, void*,
-                                       int, void*);
-                               int error;
-                               errno = 0;
-                               error = getpwuid_r (0, &buffer, &buffer, 
-                                       sizeof (buffer), &pointer);
-                               return errno == ENOSYS || error == ENOSYS;}],
-                               [ac_cv_func_getpwuid_r=yes],
-                               [ac_cv_func_getpwuid_r=no])])
-               if test "$ac_cv_func_getpwuid_r" = yes; then
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_GETPWUID_R)
+                                #include <pwd.h>
+                                int main () { char buffer[10000];
+                                struct passwd pwd, *pwptr = &pwd;
+                                int error;
+                                errno = 0;
+                                error = getpwuid_r (0, &pwd, buffer, 
+                                        sizeof (buffer), &pwptr);
+                                return (error < 0 && errno == ENOSYS) 
+                                       || error == ENOSYS; }],
+                               [ac_cv_func_posix_getpwuid_r=yes],
+                               [ac_cv_func_posix_getpwuid_r=no])])
+               if test "$ac_cv_func_posix_getpwuid_r" = yes; then
+                       AC_DEFINE(HAVE_POSIX_GETPWUID_R,1,
+                               [Have POSIX function getpwuid_r])
                else
-                       AC_MSG_RESULT(no)
-               fi
-               if test "$ac_cv_func_getpwuid_r" = "yes"; then
-                       AC_MSG_CHECKING(whether getpwuid_r is posix like)
-                       # The signature for the POSIX version is:
-                       # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **)
-                       AC_TRY_COMPILE([#include <pwd.h>
-                               #include <sys/types.h>
-                               #include <stdlib.h>],
-                               [getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);],
-                               [AC_DEFINE(HAVE_GETPWUID_R_POSIX)
-                               AC_MSG_RESULT(yes)],
-                               [AC_MSG_RESULT(no)])
+                       AC_CACHE_CHECK([for nonposix getpwuid_r],
+                               ac_cv_func_nonposix_getpwuid_r,
+                               [AC_TRY_COMPILE([#include <pwd.h>],
+                                       [char buffer[10000];
+                                       struct passwd pwd;
+                                       getpwuid_r (0, &pwd, buffer, 
+                                                       sizeof (buffer));],
+                                       [ac_cv_func_nonposix_getpwuid_r=yes],
+                                       [ac_cv_func_nonposix_getpwuid_r=no])])
+                       if test "$ac_cv_func_nonposix_getpwuid_r" = yes; then
+                               AC_DEFINE(HAVE_NONPOSIX_GETPWUID_R,1,
+                                       [Have non-POSIX function getpwuid_r])
+                       fi
                fi
        fi
        LIBS="$LIBS $G_THREAD_LIBS"
        if test x"$have_threads" = xposix; then
                glib_save_CPPFLAGS="$CPPFLAGS"
                CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
-               GLIB_SIZEOF([#include <pthread.h>],
-                       pthread_t,
-                       system_thread)
+               dnl we might grow sizeof(pthread_t) later on, so use a dummy name here
+               GLIB_SIZEOF([#include <pthread.h>], pthread_t, system_thread)
                # This is not AC_CHECK_FUNC to also work with function
                # name mangling in header files.
                AC_MSG_CHECKING(for pthread_attr_setstacksize)
                AC_TRY_LINK([#include <pthread.h>],
                        [pthread_attr_t t; pthread_attr_setstacksize(&t,0)],
                        [AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE)],
+                       AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE,1,
+                                 [Have function pthread_attr_setstacksize])],
                        [AC_MSG_RESULT(no)])
                AC_MSG_CHECKING(for minimal/maximal thread priority)
                if test x"$posix_priority_min" = xnone; then
@@ -1021,8 +1218,8 @@ if test x"$have_threads" != xnone; then
                        posix_priority_max=-1
                else
                        AC_MSG_RESULT($posix_priority_min/$posix_priority_max)
-                       AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min)
-                       AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max)
+                       AC_DEFINE_UNQUOTED(POSIX_MIN_PRIORITY,$posix_priority_min,[Minimum POSIX RT priority])
+                       AC_DEFINE_UNQUOTED(POSIX_MAX_PRIORITY,$posix_priority_max,[Maximum POSIX RT priority])
                fi
                posix_yield_func=none
                AC_MSG_CHECKING(for posix yield function)
@@ -1041,18 +1238,37 @@ if test x"$have_threads" != xnone; then
                        AC_MSG_RESULT($posix_yield_func)
                        posix_yield_func="$posix_yield_func()"
                fi
-               AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func)
+               AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield function])
                CPPFLAGS="$glib_save_CPPFLAGS"
+
+               AC_MSG_CHECKING(whether to use the PID niceness surrogate for thread priorities)
+               AC_TRY_RUN([#include <pthread.h> 
+                       #include <sys/types.h>
+                       #include <unistd.h>
+                       pid_t other_pid = 0;
+
+                       void* func(void* data) {other_pid = getpid();}
+                       main()
+                       { pthread_t t; 
+                         void *ret;
+                         pthread_create (&t, $defattr, func, NULL);
+                         pthread_join (t, &ret);
+                         exit (getpid()==other_pid || 
+                               $posix_priority_min != $posix_priority_max);
+                       }],
+                       [AC_MSG_RESULT(yes),
+                         AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities])
+                        ],
+                       [AC_MSG_RESULT(no)])
        else # solaris threads
-               GLIB_SIZEOF([#include <thread.h>],
-                       thread_t,
-                       system_thread)
+               GLIB_SIZEOF([#include <thread.h>], thread_t, system_thread)
        fi
 
        LIBS="$glib_save_LIBS"
 
        # now spit out all the warnings.
-       if test "$ac_cv_func_getpwuid_r" != "yes"; then
+       if test "$ac_cv_func_posix_getpwuid_r" != "yes" && 
+          test "$ac_cv_func_nonposix_getpwuid_r" != "yes"; then
                AC_MSG_WARN($FUNC_NO_GETPWUID_R)
        fi
        if test "$ac_cv_func_localtime_r" != "yes"; then
@@ -1064,7 +1280,8 @@ else
        GLIB_SIZEOF(, void*, system_thread)
 fi     
 
-AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c")
+AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c",
+                  [Source file containing theread implementation])
 AC_SUBST(G_THREAD_CFLAGS)
 AC_SUBST(G_THREAD_LIBS)
 AC_SUBST(G_THREAD_LIBS_EXTRA)
@@ -1108,6 +1325,67 @@ GLIB_SYSDEFS(
        glibconfig-sysdefs.h,
        =)
 
+dnl **********************
+dnl *** Win32 API libs ***
+dnl **********************
+
+case $host in
+  *-*-cygwin*)
+       G_LIBS_EXTRA="-luser32 -lwsock32 -lkernel32"
+    ;;
+  *-*-mingw*)
+       G_LIBS_EXTRA="-lwsock32"
+    ;;
+  *)
+       G_LIBS_EXTRA=""
+    ;;
+esac
+AC_SUBST(G_LIBS_EXTRA)
+
+dnl ***********************
+dnl *** Tests for iconv ***
+dnl ***********************
+
+AC_ARG_WITH(libiconv, [ --with-libiconv     Use the libiconv library ],,with_libiconv=maybe)
+
+found_iconv=no
+
+if test "x$with_libiconv" != "xyes" ; then
+   # 
+   # Check in the C library 
+   #
+   AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
+fi
+
+if test "x$with_libiconv" != "xno" ; then
+   #
+   # Check for libiconv
+   #
+   AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=yes; found_iconv=yes)
+fi
+
+if test "x$found_iconv" = "xno" ; then
+   AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
+fi
+
+if test "x$with_libiconv" = "xyes" ; then
+  ICONV_LIBS="-liconv"
+  AC_DEFINE(USE_LIBICONV)
+fi
+AC_SUBST(ICONV_LIBS)
+
+dnl If the system doesn't define EILSEQ, we should define EILSEQ ourselves
+dnl since we need it for g_iconv()
+
+AC_MSG_CHECKING([for EILSEQ])
+AC_TRY_COMPILE([
+#include <errno.h>
+],
+[
+int error = EILSEQ;
+], have_eilseq=yes, have_eilseq=no);
+AC_MSG_RESULT($have_eilseq)
+
 dnl **************************
 dnl *** Checks for gtk-doc ***
 dnl **************************
@@ -1122,8 +1400,23 @@ fi
 
 AC_SUBST(HTML_DIR)
 
-
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+
+gtk_doc_min_version=0.6
+if $GTKDOC ; then 
+    gtk_doc_version=`gtkdoc-mkdb --version`
+    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
+    if perl <<EOF ; then
+      exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &&
+            ("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1);
+EOF
+      AC_MSG_RESULT(yes)
+   else
+      AC_MSG_RESULT(no)
+      GTKDOC=false
+   fi
+fi
+
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
 AC_SUBST(HAVE_GTK_DOC)
 
@@ -1175,8 +1468,10 @@ case "$CONFIG_OTHER" in
  * This is a generated file.  Please modify 'configure.in'
  */
 
-#ifndef GLIBCONFIG_H
-#define GLIBCONFIG_H
+#ifndef __G_LIBCONFIG_H__
+#define __G_LIBCONFIG_H__
+
+#include <gmacros.h>
 
 _______EOF
 
@@ -1189,11 +1484,8 @@ _______EOF
        if test x$glib_values_h = xyes; then
          echo '#include <values.h>' >> $outfile
        fi
-       if test x$g_mutex_header_file != x; then
-         echo '#include <'"$g_mutex_header_file"'>' >> $outfile
-       fi
        if test "$glib_header_alloca_h" = "yes"; then
-         echo  '#include <alloca.h>' >> $outfile
+         echo '#define GLIB_HAVE_ALLOCA_H' >> $outfile
        fi
        if test x$glib_sys_poll_h = xyes; then
          echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
@@ -1201,9 +1493,7 @@ _______EOF
 
        cat >> $outfile <<_______EOF
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define G_MINFLOAT     $glib_mf
 #define G_MAXFLOAT     $glib_Mf
@@ -1266,6 +1556,13 @@ _______EOF
                fi
        fi
 
+        cat >>$outfile <<_______EOF
+
+#define GLIB_SIZEOF_VOID_P $glib_void_p
+#define GLIB_SIZEOF_LONG   $glib_long
+
+_______EOF
+
        case x$glib_size_t in
         x2) echo "typedef gint16  gssize;" >> $outfile
             echo "typedef guint16 gsize;"  >> $outfile
@@ -1311,6 +1608,20 @@ $glib_inline
 _______EOF
 
        echo >>$outfile
+       if test x$g_have_eilseq = xno; then
+               cat >>$outfile <<_______EOF
+#ifndef EILSEQ
+/* On some systems, like SunOS and NetBSD, EILSEQ is not defined.
+ * The correspondence between this and the corresponding definition
+ * in libiconv is essential.
+ */
+#  define EILSEQ ENOENT
+#endif
+_______EOF
+
+       fi
+
+       echo >>$outfile
        if test x$g_mutex_has_default = xyes; then
                cat >>$outfile <<_______EOF
 $g_enable_threads_def G_THREADS_ENABLED
@@ -1319,17 +1630,14 @@ typedef struct _GStaticMutex GStaticMutex;
 struct _GStaticMutex
 {
   struct _GMutex *runtime_mutex;
-  struct {
-    union {
-      char   pad[$g_mutex_sizeof];
-      double dummy_double;
-      void  *dummy_pointer;
-      long   dummy_long;
-    } mutex;
-    void *debug_info;
+  union {
+    char   pad[$g_mutex_sizeof];
+    double dummy_double;
+    void  *dummy_pointer;
+    long   dummy_long;
   } static_mutex;
 };
-#define        G_STATIC_MUTEX_INIT     { NULL, { { { $g_mutex_contents} }, NULL } }
+#define        G_STATIC_MUTEX_INIT     { NULL, { { $g_mutex_contents} } }
 #define        g_static_mutex_get_mutex(mutex) \
   (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \
    g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
@@ -1392,9 +1700,9 @@ _______EOF
 
        cat >>$outfile <<_______EOF
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#define G_MODULE_SUFFIX "$g_module_suffix"
+
+G_END_DECLS
 
 #endif /* GLIBCONFIG_H */
 _______EOF
@@ -1503,6 +1811,8 @@ $ac_cv_sizeof_long_long)
   ;;
 esac
 glib_size_t=$glib_cv_sizeof_size_t
+glib_void_p=$ac_cv_sizeof_long
+glib_long=$ac_cv_sizeof_void_p
 
 gintbits=`expr $ac_cv_sizeof_int \* 8`
 glongbits=`expr $ac_cv_sizeof_long \* 8`
@@ -1590,6 +1900,8 @@ x$ac_cv_c_bigendian)
   ;;
 esac
 
+g_have_eilseq=$have_eilseq
+
 case x$have_threads in
 xnone) g_enable_threads_def="#undef";;
 *)     g_enable_threads_def="#define";;
@@ -1602,14 +1914,21 @@ g_mutex_sizeof="$glib_cv_sizeof_gmutex"
 g_system_thread_sizeof="$glib_cv_sizeof_system_thread"
 g_mutex_contents="$glib_cv_byte_contents_gmutex"
 
+g_module_suffix="$glib_gmodule_suffix"
+
 case $host in
   *-*-beos*)
     glib_os="#define G_OS_BEOS"
     ;;
   *-*-cygwin*)
     glib_os="#define G_OS_UNIX
+#define G_PLATFORM_WIN32
 #define G_WITH_CYGWIN"
-v    ;;
+    ;;
+  *-*-mingw*)
+    glib_os="#define G_OS_WIN32
+#define G_PLATFORM_WIN32"
+    ;;
   *)
     glib_os="#define G_OS_UNIX"
     ;;
@@ -1618,18 +1937,19 @@ esac
 
 AC_OUTPUT([
 glib-2.0.pc
+glib-config-2.0
 gmodule-2.0.pc
 gthread-2.0.pc
 gobject-2.0.pc
 glib.spec
 Makefile
-glib-config-2.0
 build/Makefile
 build/win32/Makefile
 gmodule/gmoduleconf.h
 gmodule/Makefile
 gobject/Makefile
 gthread/Makefile
+po/Makefile.in
 docs/Makefile
 docs/glib-config.1
 docs/reference/Makefile
@@ -1656,4 +1976,3 @@ echo "do development with GLib 1.2 any longer."
 echo ""
 echo " *** You should be using GLib 1.2 instead. ***"
 ])
-