diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-31 09:07:54 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-31 09:07:54 -0700 |
| commit | 40f4a42e5da2c78f15c8ea389a79eb3c7619abaf (patch) | |
| tree | 4d4b8f0219e4657f59ed8aa17066268821820f75 | |
| parent | 86935597bece223a5008235770610fe27cb36e13 (diff) | |
config: Remove unnecessary calls from configure.ac
AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6a08335..87dec28 100644 --- a/configure.ac +++ b/configure.ac @@ -14,16 +14,10 @@ XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) # Check for progs -AC_PROG_CC AC_PROG_LIBTOOL # Checks for pkg-config packages PKG_CHECK_MODULES(XEVIE, xproto x11 xextproto xext evieproto) -XEVIE_CFLAGS="$CWARNFLAGS $XEVIE_CFLAGS" -AC_SUBST(XEVIE_CFLAGS) -AC_SUBST(XEVIE_LIBS) - -XORG_CHECK_MALLOC_ZERO AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 4b19edd..3b94ce0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ libXevie_la_SOURCES = Xevie.c libXevie_la_LIBADD = $(XEVIE_LIBS) -AM_CFLAGS = $(XEVIE_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XEVIE_CFLAGS) INCLUDES = -I$(top_srcdir)/include |