summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJon Nettleton <jon.nettleton@gmail.com>2007-06-14 18:24:51 +0000
committerJon Nettleton <jon.nettleton@gmail.com>2007-06-14 18:24:51 +0000
commitdb6b8ff3de7d43a63caf7178670af9bd27811898 (patch)
treef8345cda8d5acfcdbdcb41e6209d2775b6640827 /configure.ac
parentd45b190b7f1ac61d708a1e1a16584aaadd6f1ac5 (diff)
merge unmerged changes from experimental branch
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac30
1 files changed, 26 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 7c477b2a61dd..6f8c199900cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,9 +33,9 @@ AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-AC_DISABLE_STATIC
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
@@ -52,12 +52,22 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
[DRI="$enableval"],
[DRI=auto])
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
+ [Enable debugging support [[default=no]]]),
+ [DEBUG="$enableval"],
+ [DEBUG=no])
+
+AC_ARG_ENABLE(xv-debug, AC_HELP_STRING([--enable-xv-debug],
+ [Enable XVideo debugging support [[default=no]]]),
+ [XV_DEBUG="$enableval"],
+ [XV_DEBUG=no])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-XORG_DRIVER_CHECK_EXT(XV, videoproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $REQUIRED_MODULES])
@@ -91,7 +101,7 @@ AC_MSG_RESULT([$DRI])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
- PKG_CHECK_MODULES(DRI, [libdrm >= 1.0.5 xf86driproto])
+ PKG_CHECK_MODULES(DRI, [libdrm xf86driproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
case "$host_cpu" in
@@ -102,6 +112,8 @@ if test "$DRI" = yes; then
*)
XVMC=no ;;
esac
+else
+ XVMC="no"
fi
if test "x$XVMC" = xyes; then
@@ -133,7 +145,7 @@ AC_MSG_CHECKING([whether to use old Xv ABI])
else
OLD_XVABI=yes
echo -n "xf86Module.h not found, "
-fi;
+fi
CPPFLAGS="$SAVE_CPPFLAGS"
@@ -144,6 +156,16 @@ else
AC_DEFINE(USE_NEW_XVABI, 1, [Use new Xv ABI (7.1RC1+)])
fi
+AM_CONDITIONAL(DEBUG, test x$DEBUG = xyes)
+if test "$DEBUG" = yes; then
+ AC_DEFINE(HAVE_DEBUG,1,[Enable debug support])
+fi
+
+AM_CONDITIONAL(XV_DEBUG, test x$XV_DEBUG = xyes)
+if test "$XV_DEBUG" = yes; then
+ AC_DEFINE(XV_DEBUG,1,[Enable XVideo debug support])
+fi
+
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])