From: Jason Parker <jparker@digium.com>
Date: Tue, 3 Nov 2009 20:00:27 +0000 (+0000)
Subject: Merged revisions 227372 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acf67fef9ae572490d35cbd474c4b91e2e6b7456;p=thirdparty%2Fasterisk.git

Merged revisions 227372 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r227372 | qwell | 2009-11-03 13:59:46 -0600 (Tue, 03 Nov 2009) | 9 lines

  Fix some build issues on Solaris.

  (closes issue #14517)
  (SWP-109)
  Reported by: asgaroth
  Patches:
        bug_14517.diff uploaded by snuffy (license 35)
  Tested by: asgaroth, snuffy, dougm, qwell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@227373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index eb6331ca64..ebc4e961f7 100644
--- a/Makefile
+++ b/Makefile
@@ -271,7 +271,7 @@ ifeq ($(OSARCH),OpenBSD)
 endif
 
 ifeq ($(OSARCH),SunOS)
-  _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
+  _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
 endif
 
 ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
diff --git a/main/Makefile b/main/Makefile
index f147abd669..f9c54b73cf 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -91,7 +91,7 @@ ifeq ($(OSARCH),OpenBSD)
 endif
 
 ifeq ($(OSARCH),SunOS)
-  AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
+  AST_LIBS+=-lpthread -ldl -lrt -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
   ASTLINK=
 endif