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

Change-Id: Ie0b592ad8915d0d01b3d4ac2f9c5d823b73fe4eb
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

diff --git a/Makefile.am b/Makefile.am
index 9b66ea5..3947bbf 100644 (file)
--- 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 (file)
--- 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