config: Remove unnecessary calls from configure.ac

AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS variables
AC_HEADERS_STDC result was never used
No headers exist in $(top_srcdir)/src, so no point including -I in CFLAGS

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith
2011-05-02 19:25:41 -07:00
parent 47812d4f46
commit 28cb0b4aa5
2 changed files with 1 additions and 8 deletions

View File

@@ -46,7 +46,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
@@ -61,11 +60,4 @@ AC_SUBST(inputdir)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
# Checks for header files.
AC_HEADER_STDC
AC_OUTPUT([Makefile src/Makefile man/Makefile])

View File

@@ -24,6 +24,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@