diff options
| author | Badlop <badlop@process-one.net> | 2009-03-07 09:52:26 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-03-07 09:52:26 +0000 |
| commit | ad7bca0e783e09a63a9a21a56412124bbfe7e8df (patch) | |
| tree | 7f1e928f634d32e13427b2d5bb554227257c464c | |
| parent | * src/ejabberd_c2s.erl: Enforce privacy rules also for (diff) | |
* src/Makefile.in: In SunOS, use different C flags (thanks to
Thomas)(EJAB-438)
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
SVN Revision: 1977
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 8 | ||||
| -rw-r--r-- | src/ejabberd_zlib/Makefile.in | 10 | ||||
| -rw-r--r-- | src/mod_irc/Makefile.in | 11 | ||||
| -rw-r--r-- | src/stringprep/Makefile.in | 11 | ||||
| -rw-r--r-- | src/tls/Makefile.in | 10 |
6 files changed, 38 insertions, 19 deletions
@@ -1,5 +1,12 @@ 2009-03-07 Badlop <badlop@process-one.net> + * src/Makefile.in: In SunOS, use different C flags (thanks to + Thomas)(EJAB-438) + * src/ejabberd_zlib/Makefile.in: Likewise + * src/mod_irc/Makefile.in: Likewise + * src/stringprep/Makefile.in: Likewise + * src/tls/Makefile.in: Likewise + * src/ejabberd_c2s.erl: Enforce privacy rules also for subscription requests (EJAB-300) * src/ejabberd_sm.erl: Likewise diff --git a/src/Makefile.in b/src/Makefile.in index ac9412a17..1728e12f3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -114,11 +114,13 @@ COOKIEFILE = $(SPOOLDIR)/.erlang.cookie # /var/log/ejabberd/ LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd -ifeq ($(shell uname),Darwin) -DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress -else # Assume Linux-style dynamic library flags DYNAMIC_LIB_CFLAGS = -fpic -shared +ifeq ($(shell uname),Darwin) + DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +endif +ifeq ($(shell uname),SunOs) + DYNAMIC_LIB_CFLAGS = -KPIC -G -z text endif all: $(ERLSHLIBS) compile-beam all-recursive diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in index dd781d0ae..b572c1169 100644 --- a/src/ejabberd_zlib/Makefile.in +++ b/src/ejabberd_zlib/Makefile.in @@ -12,11 +12,13 @@ ZLIB_LIBS = @ZLIB_LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared ifeq ($(shell uname),Darwin) - DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress -else - # Assume Linux-style dynamic library flags - DYNAMIC_LIB_CFLAGS = -fpic -shared + DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +endif +ifeq ($(shell uname),SunOs) + DYNAMIC_LIB_CFLAGS = -KPIC -G -z text endif EFLAGS += -I .. diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in index 76a2d57f6..9dcf9f182 100644 --- a/src/mod_irc/Makefile.in +++ b/src/mod_irc/Makefile.in @@ -9,12 +9,15 @@ LIBS = @LIBS@ @LIBICONV@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared ifeq ($(shell uname),Darwin) - DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress -else - # Assume Linux-style dynamic library flags - DYNAMIC_LIB_CFLAGS = -fpic -shared + DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress endif +ifeq ($(shell uname),SunOs) + DYNAMIC_LIB_CFLAGS = -KPIC -G -z text +endif + EFLAGS += -I .. EFLAGS += -pz .. diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in index 3ac6c24db..7c4997d26 100644 --- a/src/stringprep/Makefile.in +++ b/src/stringprep/Makefile.in @@ -9,12 +9,15 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared ifeq ($(shell uname),Darwin) - DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress -else - # Assume Linux-style dynamic library flags - DYNAMIC_LIB_CFLAGS = -fpic -shared + DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress endif +ifeq ($(shell uname),SunOs) + DYNAMIC_LIB_CFLAGS = -KPIC -G -z text +endif + EFLAGS += -I .. EFLAGS += -pz .. diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in index b6f10efc2..44142fa7e 100644 --- a/src/tls/Makefile.in +++ b/src/tls/Makefile.in @@ -12,11 +12,13 @@ SSL_LIBS = @SSL_LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared ifeq ($(shell uname),Darwin) - DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress -else - # Assume Linux-style dynamic library flags - DYNAMIC_LIB_CFLAGS = -fpic -shared + DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +endif +ifeq ($(shell uname),SunOs) + DYNAMIC_LIB_CFLAGS = -KPIC -G -z text endif EFLAGS += -I .. |