# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1134996493 0
# Node ID e8314f98b87038b4be3a25e38aee55c5e9c20d98
# Parent  d6b513c74e1f59f6f19a01c9166dd88fef04f9a2
[gaim-migrate @ 14880]
Various changes as per SF #1384517. This should get us closer to working out of the box on IRIX, hopefully without breaking anything else.

committer: Tailor Script <tailor@pidgin.im>

diff -r d6b513c74e1f -r e8314f98b870 config.h.mingw
--- a/config.h.mingw	Mon Dec 19 11:54:17 2005 +0000
+++ b/config.h.mingw	Mon Dec 19 12:48:13 2005 +0000
@@ -44,6 +44,9 @@
 /* Define to 1 if you have the <argz.h> header file. */
 /* #undef HAVE_ARGZ_H */
 
+/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
+/* #undef HAVE_ARPA_NAMESER_COMPAT_H */
+
 /* Define to 1 if you have the `asprintf' function. */
 /* #undef HAVE_ASPRINTF */
 
diff -r d6b513c74e1f -r e8314f98b870 configure.ac
--- a/configure.ac	Mon Dec 19 11:54:17 2005 +0000
+++ b/configure.ac	Mon Dec 19 12:48:13 2005 +0000
@@ -43,7 +43,7 @@
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h regex.h)
+AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h regex.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff -r d6b513c74e1f -r e8314f98b870 src/getopt.c
--- a/src/getopt.c	Mon Dec 19 11:54:17 2005 +0000
+++ b/src/getopt.c	Mon Dec 19 12:48:13 2005 +0000
@@ -31,6 +31,11 @@
 #include "config.h"
 #endif
 
+/* Alver says we need this for IRIX. */
+#if HAVE_STRING_H
+#include "string.h"
+#endif
+
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else /* not __GNUC__ */
diff -r d6b513c74e1f -r e8314f98b870 src/protocols/gg/lib/libgadu-config.h
--- a/src/protocols/gg/lib/libgadu-config.h	Mon Dec 19 11:54:17 2005 +0000
+++ b/src/protocols/gg/lib/libgadu-config.h	Mon Dec 19 12:48:13 2005 +0000
@@ -1,6 +1,6 @@
 /* Local libgadu configuration. */
 
-/* #include "../../../config.h" */
+#include "config.h"
 
 #ifndef __GG_LIBGADU_CONFIG_H
 #define __GG_LIBGADU_CONFIG_H
@@ -32,7 +32,9 @@
 #undef __GG_LIBGADU_HAVE_OPENSSL
 
 /* Include file containing uintXX_t declarations. */
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 /* Defined if this machine has C99-compiliant vsnprintf(). */
 #ifndef _WIN32