diff options
| author | Alexandr Shadchin <alexandr.shadchin@gmail.com> | 2012-08-18 20:53:33 +0600 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-08-23 14:51:32 +1000 |
| commit | 4cb7fa8191ca41491330e4adc8c8188648ed7e11 (patch) | |
| tree | adc1efd6bb4525614333971f5577a1ec76515cf5 | |
| parent | 0249d01a2623c4f7769914fc0a7b50657a50560f (diff) | |
| download | xorg-driver-xf86-video-vesa-4cb7fa8191ca41491330e4adc8c8188648ed7e11.tar.gz | |
Remove unneeded AM_CONDITIONAL
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | 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. |