*** ./configure.ORIG	Mon Dec 14 12:47:03 2009
--- ./configure	Mon Dec 14 12:47:45 2009
***************
*** 39893,39898 ****
--- 39893,39902 ----
        *-*-cygwin*|*-*-darwin*)
           # skip cygwin and darwin -pthread or -pthreads test
           ;;
+       *-aix*)
+         G_THREAD_CFLAGS="-qthreaded -D_THREAD_SAFE"
+         G_THREAD_LIBS="-lpthread"
+         ;;
        *-solaris*)
          # These compiler/linker flags work with both Sun Studio and gcc
  	# Sun Studio expands -mt to -D_REENTRANT and -lthread
*** ./gio/libasyncns/asyncns.c.ORIG	Mon Dec 14 12:57:55 2009
--- ./gio/libasyncns/asyncns.c	Mon Dec 14 12:58:13 2009
***************
*** 41,48 ****
--- 41,50 ----
  #include <resolv.h>
  #include <dirent.h>
  
+ #ifndef _AIX
  #if HAVE_ARPA_NAMESER_COMPAT_H
  #include <arpa/nameser_compat.h>
+ #endif
  #endif
  
  #ifdef HAVE_SYS_PRCTL_H
*** ./gio/gsocket.c.ORIG	Mon Dec 14 12:59:08 2009
--- ./gio/gsocket.c	Mon Dec 14 13:02:18 2009
***************
*** 363,375 ****
      }
  
    g_assert (G_STRUCT_OFFSET (struct sockaddr, sa_family) +
! 	    sizeof address.ss_family <= addrlen);
!   switch (address.ss_family)
      {
       case G_SOCKET_FAMILY_IPV4:
       case G_SOCKET_FAMILY_IPV6:
       case G_SOCKET_FAMILY_UNIX:
!       socket->priv->family = address.ss_family;
        break;
  
       default:
--- 363,375 ----
      }
  
    g_assert (G_STRUCT_OFFSET (struct sockaddr, sa_family) +
! 	    sizeof address.__ss_family <= addrlen);
!   switch (address.__ss_family)
      {
       case G_SOCKET_FAMILY_IPV4:
       case G_SOCKET_FAMILY_IPV6:
       case G_SOCKET_FAMILY_UNIX:
!       socket->priv->family = address.__ss_family;
        break;
  
       default: