changeset 29954:b3377040edc1

Build fixes on OpenSolaris. Closes #11841. committer: Paul Aurich <paul@darkrain42.org>
author brian.lu@sun.com
date Sun, 16 May 2010 15:57:51 +0000
parents fb0245b8c177
children 9945fe7098f7
files ChangeLog configure.ac libpurple/protocols/gg/lib/libgadu.h
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun May 16 15:50:23 2010 +0000
+++ b/ChangeLog	Sun May 16 15:57:51 2010 +0000
@@ -1,6 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.1 (??/??/????):
+	General:
+	* Build fixes on OpenSolaris.  (Brian Lu)
+
 	Pidgin:
 	* Restore the tray icon's blinking functionality.
 
--- a/configure.ac	Sun May 16 15:50:23 2010 +0000
+++ b/configure.ac	Sun May 16 15:57:51 2010 +0000
@@ -115,6 +115,9 @@
 PKG_PROG_PKG_CONFIG
 AC_FUNC_ALLOCA
 
+dnl Check for Sun compiler
+AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
@@ -1337,6 +1340,10 @@
 	DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
 	CFLAGS="-g $CFLAGS"
 fi
+
+if test "x$SUNCC" = "xyes"; then
+        CFLAGS="-features=extensions" 
+fi
 AC_SUBST(CFLAGS)
 
 AC_PATH_PROG(pidginpath, pidgin)
--- a/libpurple/protocols/gg/lib/libgadu.h	Sun May 16 15:50:23 2010 +0000
+++ b/libpurple/protocols/gg/lib/libgadu.h	Sun May 16 15:57:51 2010 +0000
@@ -117,7 +117,7 @@
 typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
 
-#ifndef __CYGWIN__
+#if !defined(__CYGWIN__) && !defined(__SunOS)
 #define __int8_t_defined
 typedef   signed char    int8_t;
 typedef   signed short  int16_t;