diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-08 23:34:03 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-08 23:38:59 -0800 |
| commit | b24dce8f95cbed1a91a989a783eb1fdd36335bf1 (patch) | |
| tree | 88cd16651210e0e2cce43a859a9cab12fea16067 | |
| parent | 34ea83ac16ce3bc55aedd9d8e73e3d4a04bafdcc (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-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 9b66ea5..3947bbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xeyes -AM_CFLAGS = $(XEYES_CFLAGS) $(CWARNFLAGS) -xeyes_LDADD = $(XEYES_LIBS) -lm +AM_CFLAGS = $(XEYES_CFLAGS) $(XRENDER_CFLAGS) $(CWARNFLAGS) +xeyes_LDADD = $(XEYES_LIBS) $(XRENDER_LIBS) -lm xeyes_SOURCES = \ Eyes.c \ diff --git a/configure.ac b/configure.ac index d98b698..d4c8ed5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,21 +34,13 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL - - # Checks for pkg-config packages PKG_CHECK_MODULES(XEYES, x11 xt xext xmu) -AC_SUBST(XEYES_CFLAGS) -AC_SUBST(XEYES_LIBS) dnl Optional dependencies AC_ARG_WITH(xrender, AC_HELP_STRING([--with-xrender],[Use Xrender for rendering (Default is YES)]),use_xrender="$withval",use_xrender="try") if test x$use_xrender != xno ; then PKG_CHECK_MODULES(XRENDER, [xrender >= 0.4]) - XEYES_CFLAGS="$XEYES_CFLAGS $XRENDER_CFLAGS" - XEYES_LIBS="$XEYES_LIBS $XRENDER_LIBS" AC_DEFINE([XRENDER],1,[Define to use X Render Extension]) fi |