diff options
author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 13:51:17 +0000 |
---|---|---|
committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 13:51:17 +0000 |
commit | b766a5b50c209414be7c126fc55641bc55cabdcd (patch) | |
tree | 1f9c77482b85cd5af8882ca3eab73e955632b153 /Makefile | |
parent | 1ab059f5f3eccc68f020ae06681ecf09406be10a (diff) |
Merged revisions 227091 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r227091 | oej | 2009-11-03 12:11:15 +0100 (Tis, 03 Nov 2009) | 15 lines
Merged revisions 227088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r227088 | oej | 2009-11-03 11:29:59 +0100 (Tis, 03 Nov 2009) | 7 lines
Use proper response code when violating Contact ACL's.
https://reviewboard.asterisk.org/r/415/
Thanks kpfleming for a quick review.
(EDVX-003)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@227156 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -305,7 +305,7 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree) ifneq ($(findstring darwin,$(OSARCH)),) _ASTCFLAGS+=-D__Darwin__ - SOLINK=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace + SOLINK=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace /usr/lib/bundle1.o else # These are used for all but Darwin SOLINK=-shared |