From 44d65ff303b17772c06ab81d9a1fac33e5c8faec Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 29 Nov 2007 16:59:35 +0000
Subject: * 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
---
 src/ejabberd_zlib/Makefile.in | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/ejabberd_zlib')

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:
-- 
cgit v1.2.3