[PATCH vesa 1/2] Remove unneeded AM_CONDITIONAL

Alexandr Shadchin alexandr.shadchin at gmail.com
Sat Aug 18 07:53:33 PDT 2012


Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
---
 configure.ac |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6317acd..08e0571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,9 +60,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 # Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 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" ])
+                  HAVE_XEXTPROTO_71="yes", HAVE_XEXTPROTO_71="no")
+
+if test "x$HAVE_XEXTPROTO_71" = xyes; then
+    AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available])
+fi
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS"
@@ -90,7 +92,6 @@ CFLAGS="$save_CFLAGS"
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
 fi
-AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 # Checks for libraries.
 
-- 
1.7.6



More information about the xorg-devel mailing list