summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-11-20 15:24:00 -0500
committerMartin-Éric Racine <martin-eric.racine@iki.fi>2011-11-21 10:33:11 +0200
commit40aae069bb15cda123f5e08b757ca93166e62db8 (patch)
treebeac5228fc9a44bb385c50bee22752e0b7ac12d2
parentfa0e88bfe00baa648ab3b1184b56f7dc5536aa21 (diff)
config: remove a few dead/obsolete lines of code
HAVE_XEXTPROTO_71 not used in Makefile. AC_HEADER_STD is very obsolete. AC_SUBST([XORG_CFLAGS]) is redundant. DRIVER_NAME is correctly no longer used. AC_SUBST([moduledir]) has just been moved up. Any erroneously removed statements above would result in a configuration failure. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--configure.ac11
1 files changed, 1 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 582eb46..7a90b80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+AC_SUBST([moduledir])
AC_ARG_ENABLE(geodegx-panel,
AC_HELP_STRING([--disable-geodegx-panel],
@@ -117,7 +118,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
-AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
@@ -127,20 +127,11 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[#include "xorg-server.h"])
CPPFLAGS="$SAVE_CPPFLAGS"
-# Checks for header files.
-AC_HEADER_STDC
-
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
fi
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([moduledir])
-
-DRIVER_NAME=geode
-AC_SUBST([DRIVER_NAME])
-
AC_OUTPUT([
Makefile
src/Makefile