diff --git a/ChangeLog b/ChangeLog index 6b38c68b7..38aca9c4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2007-11-29 Badlop + * 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 14a26077f..b327ecb54 100644 --- 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 490ca2bdf..0924f21a2 100644 --- 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 7b123395e..2de36f45f 100644 --- 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 76d731444..6953929ff 100644 --- 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 e30933b09..10eb9939a 100644 --- 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 4e5d728ea..cd3575b28 100644 --- 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 bb70ac5cb..ca245b7de 100644 --- 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 0b296ee41..95d0a131c 100644 --- 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 777713633..e29115003 100644 --- 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 00650f94c..64aff30b9 100644 --- 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 5de176bd7..d69a2772e 100644 --- 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 60505a56c..60ab31985 100644 --- 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 bc5c2da0f..6549b6677 100644 --- 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 =