* 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

diff --git a/ChangeLog b/ChangeLog
index de619bff1e0d4c3832ca1843549da6df3cfd3631..934a084c25d8fba31d004e3b7b1e41642af33a5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ac9412a1757faa5a7c8f75b6927a58d21624855c..1728e12f3d45fd3bbbcb13805e98b88b9b9c6ad4 100644 (file)
--- 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 dd781d0aeb04860728d0d4baeb97a9d827388b25..b572c11696fbf3de8c183e740a8ae84930946571 100644 (file)
--- 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 76a2d57f68a66817e0399661058651b5e6a32e5a..9dcf9f182c9c9e9de2e3f337e934a4206bbeebca 100644 (file)
--- 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 3ac6c24db1418dadbad89c2ec64de4d3cb2671af..7c4997d26e63f7ced65ab63c9a2ad3de1d1b3d83 100644 (file)
--- 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 b6f10efc2640780142bd45e487d96d2cb528410a..44142fa7e5d21b96d1d66713e285c95cbd247d0e 100644 (file)
--- 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 ..