* src/configure.ac: Don't hardcode gcc and options (EJAB-436)

* src/Makefile.in:
* src/ejabberd_zlib/Makefile.in:
* src/eldap/Makefile.in:
* src/mod_irc/Makefile.in:
* src/mod_muc/Makefile.in:
* src/mod_proxy65/Makefile.in:
* src/mod_pubsub/Makefile.in:
* src/odbc/Makefile.in:
* src/pam/Makefile.in:
* src/stringprep/Makefile.in:
* src/tls/Makefile.in:
* src/web/Makefile.in:

SVN Revision: 1000

diff --git a/ChangeLog b/ChangeLog
index 6b38c68b7cc81be7842a58d9235f2c01acb5a055..38aca9c4e44766701a6348c372eacaa5b8fa590d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2007-11-29  Badlop  <badlop@process-one.net>
 
+       * src/configure.ac: Don't hardcode gcc and options (EJAB-436)
+       * src/Makefile.in: 
+       * src/ejabberd_zlib/Makefile.in: 
+       * src/eldap/Makefile.in: 
+       * src/mod_irc/Makefile.in: 
+       * src/mod_muc/Makefile.in: 
+       * src/mod_proxy65/Makefile.in: 
+       * src/mod_pubsub/Makefile.in: 
+       * src/odbc/Makefile.in: 
+       * src/pam/Makefile.in: 
+       * src/stringprep/Makefile.in: 
+       * src/tls/Makefile.in: 
+       * src/web/Makefile.in: 
+
        * src/mod_muc/mod_muc_room.erl: Hide the option 'Make room
        moderated' because it isn't implemented, and set the default value
        of 'moderated' to true because that is the behaviour

diff --git a/src/Makefile.in b/src/Makefile.in
index 14a26077f47b123125a5fdbff87e69edde77eb74..b327ecb54577bdb76985a435df9e9763a2104eaf 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -82,7 +82,7 @@ mostlyclean-recursive maintainer-clean-recursive:
        @ERLC@ -W $(ERLC_FLAGS) $*.erl
 
 $(ERLSHLIBS):  %.so:   %.c
-                       gcc -Wall $(CFLAGS) $(LDFLAGS) $(LIBS) \
+                       $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) \
                        $(subst ../,,$(subst .so,.c,$@)) \
                        $(EXPAT_LIBS) $(EXPAT_CFLAGS) \
                        $(ERLANG_LIBS) $(ERLANG_CFLAGS) \

diff --git a/src/configure.ac b/src/configure.ac
index 490ca2bdf1fbfae817bda0a5c88ee102330254de..0924f21a2c4f623e626b5aaed67226df04a85907 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -8,6 +8,10 @@ AC_INIT(ejabberd.erl,, ejabberd@process-one.net)
 AC_PROG_CC
 AC_PROG_MAKE_SET
 
+if test "x$GCC" = "xyes"; then
+    CFLAGS="$CFLAGS -Wall"
+fi
+
 #locating erlang
 AM_WITH_ERLANG
 #locating iconv

diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in
index 7b123395e7f96e54aad391801c00ab6527e2841a..2de36f45f9d72d2cbd4c4a7959880f522a7cbca3 100644 (file)
--- a/src/ejabberd_zlib/Makefile.in
+++ b/src/ejabberd_zlib/Makefile.in
@@ -1,10 +1,16 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ZLIB_CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
 DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
@@ -36,8 +42,10 @@ $(OUTDIR)/%.beam:       %.erl
 #      erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
 
 $(ERLSHLIBS):  ../%.so:        %.c
-                       $(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+                       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
                        $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+                       $(ZLIB_LIBS) $(ZLIB_CFLAGS) \
+                       $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
                        -o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:

diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index 76d7314440e287a1969bea5d702dbe972c24e9f7..6953929ff04ae2b5e261dfd84411b47ac7540bc3 100644 (file)
--- a/src/eldap/Makefile.in
+++ b/src/eldap/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@ 
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS = 
 

diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in
index e30933b093e50813e414572b49c60321bfed7331..10eb9939a7bfa5e0c09189db53fe658cf1fef4f4 100644 (file)
--- a/src/mod_irc/Makefile.in
+++ b/src/mod_irc/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
-
+ 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@ @LIBICONV@
+LIBS = @LIBS@ @LIBICONV@
+ 
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
 DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
@@ -38,8 +41,9 @@ $(OUTDIR)/%.beam:       %.erl
 #      erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
 
 $(ERLSHLIBS):  ../%.so:        %.c
-                       $(CC) -Wall $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
+                       $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
                        $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+                       $(ERLANG_CFLAGS) $(ERLANG_LIBS) \
                        -o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:

diff --git a/src/mod_muc/Makefile.in b/src/mod_muc/Makefile.in
index 4e5d728ea3f51c7a2c005287c88ffcab4b85df72..cd3575b288b4cdc2d7816243db639bc2458b9bd8 100644 (file)
--- a/src/mod_muc/Makefile.in
+++ b/src/mod_muc/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
-CC = @CC@ 
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CC = @CC@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS = 
 

diff --git a/src/mod_proxy65/Makefile.in b/src/mod_proxy65/Makefile.in
index bb70ac5cb19368f6ad1ea93a3213c36b60378eaf..ca245b7defcc7edb41e37f3d958bc3c51408862f 100644 (file)
--- a/src/mod_proxy65/Makefile.in
+++ b/src/mod_proxy65/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
-CC = @CC@ 
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CC = @CC@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+ 
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS = 
 

diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in
index 0b296ee4183112104daf829dc6a3c1cbfe775c0c..95d0a131c11d0e2194ddfe0f72cbe2e89b2ab4b7 100644 (file)
--- a/src/mod_pubsub/Makefile.in
+++ b/src/mod_pubsub/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS = 
 

diff --git a/src/odbc/Makefile.in b/src/odbc/Makefile.in
index 777713633e2b242231d1b169dd8b5ac991a514e5..e29115003110b1fdeffece8f37175713e1141c4d 100644 (file)
--- a/src/odbc/Makefile.in
+++ b/src/odbc/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS = 
 

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 00650f94c591b306da2a0075fd6535b1ab55e0ee..64aff30b94d6519622272297c82b5d1f8ec8d8c8 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -1,10 +1,13 @@
 # $Id: Makefile.in 775 2007-05-29 14:31:12Z mremond $
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @PAM_CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@ @PAM_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @PAM_LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@ @PAM_LIBS@
+ 
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS = 
 
@@ -29,8 +32,9 @@ $(OUTDIR)/%.beam:       %.erl
 #      erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
 
 $(ERLSHLIBS):  ../%:   %.c
-                       $(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+                       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
                        $(subst ../,,$(subst ,.c,$@)) $(LIBS) \
+                       $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
                        -o $@ -lpthread
 
 clean:

diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in
index 5de176bd7847b9dfadd1b4b6708dcafb81125f6f..d69a2772e1dd5d8cc257ee0e5e700285378cd239 100644 (file)
--- a/src/stringprep/Makefile.in
+++ b/src/stringprep/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
 DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
@@ -37,8 +40,9 @@ $(OUTDIR)/%.beam:       %.erl
 #      erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
 
 $(ERLSHLIBS):  ../%.so:        %.c uni_data.c uni_norm.c
-                       gcc -Wall -O2 $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
+                       $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
                        $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+                       $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
                        -o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:

diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in
index 60505a56cec1090e7fe65b53ed54323121584fa5..60ab319854cec2ce48a95fb7402badfbd281daf8 100644 (file)
--- a/src/tls/Makefile.in
+++ b/src/tls/Makefile.in
@@ -1,10 +1,16 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @SSL_CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @SSL_LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+SSL_CFLAGS = @SSL_CFLAGS@
+SSL_LIBS = @SSL_LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
 DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
@@ -36,9 +42,11 @@ $(OUTDIR)/%.beam:       %.erl
 #      erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
 
 $(ERLSHLIBS):  ../%.so:        %.c
-                       $(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+                       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
                        $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
-                       -o $@ -fpic $(DYNAMIC_LIB_CFLAGS)
+                       $(SSL_LIBS) $(SSL_CFLAGS) \
+                       $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
+                       -o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:
        rm -f $(OBJS) $(ERLSHLIBS)

diff --git a/src/web/Makefile.in b/src/web/Makefile.in
index bc5c2da0f36d316e0ff7a2a6947ecf4d0239e5b9..6549b66770b1ed124d49685c5379de22b0b48865 100644 (file)
--- a/src/web/Makefile.in
+++ b/src/web/Makefile.in
@@ -1,10 +1,13 @@
 # $Id$
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
+CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @ERLANG_LIBS@
+LIBS = @LIBS@
+
+ERLANG_CFLAGS = @ERLANG_CFLAGS@
+ERLANG_LIBS = @ERLANG_LIBS@
 
 SUBDIRS =