summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-16 10:37:21 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-16 10:37:21 -0500
commit2110b60cf122a624011ade8883af07b88bb2c2bb (patch)
tree5c3686d5ea622879b165ec44998515f0bb8c36de
parent7c1d4d862240a0b01eefbccf6b85e7a365e60ada (diff)
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile rather than being merged with other packages compiler flags. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 53dcf53..a75e678 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
lib_LTLIBRARIES = libXdmcp.la
-AM_CFLAGS=-I${top_srcdir}/include $(XDMCP_CFLAGS)
+AM_CFLAGS = \
+ -I${top_srcdir}/include \
+ $(XDMCP_CFLAGS) \
+ $(CWARNFLAGS)
+
libXdmcp_la_LDFLAGS = -version-number 6:0:0 -no-undefined
libXdmcp_la_LIBADD = $(XDMCP_LIBS)
libXdmcp_la_SOURCES = \
diff --git a/configure.ac b/configure.ac
index c484186..311d31b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,9 +48,6 @@ AC_CHECK_FUNCS([srand48 lrand48])
AC_SEARCH_LIBS([recvfrom],[socket])
PKG_CHECK_MODULES(XDMCP, xproto)
-XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS"
-AC_SUBST(XDMCP_CFLAGS)
-AC_SUBST(XDMCP_LIBS)
if test -f ${srcdir}/Wraphelp.c; then
AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])