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.1@227374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Jason Parker 16 years ago
parent 026420be6d
commit 52cda4cb2c

@ -273,7 +273,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 .)

@ -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

Loading…
Cancel
Save