25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00

* 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
This commit is contained in:
Badlop 2009-03-07 09:52:26 +00:00
parent 787d225f1e
commit ad7bca0e78
6 changed files with 38 additions and 19 deletions

View File

@ -1,5 +1,12 @@
2009-03-07 Badlop <badlop@process-one.net> 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 * src/ejabberd_c2s.erl: Enforce privacy rules also for
subscription requests (EJAB-300) subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise * src/ejabberd_sm.erl: Likewise

View File

@ -114,11 +114,13 @@ COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
# /var/log/ejabberd/ # /var/log/ejabberd/
LOGDIR = $(DESTDIR)@localstatedir@/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 # Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared 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 endif
all: $(ERLSHLIBS) compile-beam all-recursive all: $(ERLSHLIBS) compile-beam all-recursive

View File

@ -12,11 +12,13 @@ ZLIB_LIBS = @ZLIB_LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
else endif
# Assume Linux-style dynamic library flags ifeq ($(shell uname),SunOs)
DYNAMIC_LIB_CFLAGS = -fpic -shared DYNAMIC_LIB_CFLAGS = -KPIC -G -z text
endif endif
EFLAGS += -I .. EFLAGS += -I ..

View File

@ -9,12 +9,15 @@ LIBS = @LIBS@ @LIBICONV@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
else
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
endif endif
ifeq ($(shell uname),SunOs)
DYNAMIC_LIB_CFLAGS = -KPIC -G -z text
endif
EFLAGS += -I .. EFLAGS += -I ..
EFLAGS += -pz .. EFLAGS += -pz ..

View File

@ -9,12 +9,15 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
else
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
endif endif
ifeq ($(shell uname),SunOs)
DYNAMIC_LIB_CFLAGS = -KPIC -G -z text
endif
EFLAGS += -I .. EFLAGS += -I ..
EFLAGS += -pz .. EFLAGS += -pz ..

View File

@ -12,11 +12,13 @@ SSL_LIBS = @SSL_LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
else endif
# Assume Linux-style dynamic library flags ifeq ($(shell uname),SunOs)
DYNAMIC_LIB_CFLAGS = -fpic -shared DYNAMIC_LIB_CFLAGS = -KPIC -G -z text
endif endif
EFLAGS += -I .. EFLAGS += -I ..