diff options
| -rw-r--r-- | configure.ac | 85 | ||||
| -rw-r--r-- | src/legacy/i810/Makefile.am | 4 | ||||
| -rw-r--r-- | src/legacy/i810/xvmc/Makefile.am | 4 | ||||
| -rw-r--r-- | src/sna/Makefile.am | 4 | ||||
| -rw-r--r-- | src/uxa/Makefile.am | 3 | ||||
| -rw-r--r-- | xvmc/Makefile.am | 4 |
6 files changed, 79 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index eb34946d..a004ef33 100644 --- a/configure.ac +++ b/configure.ac @@ -251,7 +251,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fon AC_ARG_ENABLE(xaa, AS_HELP_STRING([--enable-xaa], - [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [Enable legacy X Acceleration Architecture (XAA) for i810 chipsets [default=auto]]), [XAA="$enableval"], [XAA=auto]) if test "x$XAA" != xno; then @@ -266,7 +266,7 @@ AC_MSG_RESULT([$XAA]) AC_ARG_ENABLE(dga, AS_HELP_STRING([--enable-dga], - [Enable legacy Direct Graphics Access (DGA) [default=auto]]), + [Enable legacy Direct Graphics Access (DGA) for i810 chipsets [default=auto]]), [DGA="$enableval"], [DGA=auto]) if test "x$DGA" != xno; then @@ -383,13 +383,14 @@ AC_SUBST(CLOCK_GETTIME_LIBS) sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` -if test "x$enable_dri" != "xno"; then - PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no) +DRI1=no +if test "x$enable_dri" != "xno" -a "x$KMS_ONLY" != "xyes"; then + PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=yes], [DRI1=no]) save_CFLAGS="$CFLAGS" save_CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" - AC_CHECK_HEADERS([dri.h sarea.h dristruct.h],, [DRI=no], + AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [DRI1=yes], [DRI1=no], [/* for dri.h */ #include <xf86str.h> /* for dristruct.h */ @@ -403,22 +404,21 @@ if test "x$enable_dri" != "xno"; then ]) CFLAGS="$save_CFLAGS $DEBUGFLAGS" CPPFLAGS="$save_CPPFLAGS" -else - DRI=no fi -AC_MSG_CHECKING([whether to include DRI support]) -AC_MSG_RESULT([${DRI-yes}]) +AC_MSG_CHECKING([whether to include DRI1 support]) +AC_MSG_RESULT([$DRI1]) -AM_CONDITIONAL(DRI, test x$DRI != xno) -if test "x$DRI" != "xno"; then - AC_DEFINE(HAVE_DRI1,1,[Enable DRI driver support]) +AM_CONDITIONAL(DRI1, test x$DRI1 != xno) +if test "x$DRI1" != "xno"; then + AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support]) + dri_msg="$dri_msg DRI1" else - DRI_CFLAGS="" - DRI_LIBS="" + DRI1_CFLAGS="" + DRI1_LIBS="" if test "x$enable_dri" = "xyes"; then - AC_MSG_ERROR([DRI requested but prerequisites not found]) + AC_MSG_ERROR([DRI1 requested but prerequisites not found]) fi fi @@ -429,7 +429,7 @@ if test "x$enable_dri" != "xno"; then if test "x$dridriverdir" = "x"; then dridriverdir="$libdir/dri" fi - AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path]) + AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) if test "x$DRI2" != "xno"; then save_CFLAGS=$CFLAGS CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS" @@ -440,6 +440,10 @@ fi AC_MSG_CHECKING([whether to include DRI2 support]) AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) AC_MSG_RESULT([$DRI2]) +if test "x$DRI2" != "xno"; then + AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support]) + dri_msg="$dri_msg DRI2" +fi if test "$XVMC" = yes; then PKG_CHECK_MODULES(XVMCLIB, [xvmc dri2proto x11], [], [XVMC=no]) @@ -450,6 +454,9 @@ AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) if test "x$XVMC" = xyes; then AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support]) + xvmc_msg=" yes" +else + xvmc_msg=" no" fi AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes) @@ -470,6 +477,7 @@ else VG=auto fi fi +debug_msg="" have_valgrind=no if test "x$VG" != xno; then PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, have_valgrind=no) @@ -484,20 +492,30 @@ if test "x$VG" != xno; then AC_MSG_RESULT([$have_valgrind ($VG)]) fi AM_CONDITIONAL(VALGRIND, test x$have_valgrind = xyes) +if test "x$have_valgrind" = xyes; then + debug_msg="$debug_msg valgrind" +fi if test "x$DEBUG" = xsync; then AC_DEFINE(DEBUG_SYNC,1,[Enable synchronous rendering for debugging]) + debug_msg="$debug_msg sync" fi if test "x$DEBUG" = xmemory; then AC_DEFINE(DEBUG_MEMORY,1,[Enable memory debugging]) + debug_msg="$debug_msg memory" fi if test "x$DEBUG" = xpixmap; then AC_DEFINE(DEBUG_PIXMAP,1,[Enable pixmap debugging]) + debug_msg="$debug_msg pixmaps" fi if test "x$DEBUG" = xfull; then AC_DEFINE(DEBUG_MEMORY,1,[Enable memory debugging]) AC_DEFINE(DEBUG_PIXMAP,1,[Enable pixmap debugging]) AC_DEFINE(HAS_DEBUG_FULL,1,[Enable all debugging]) CFLAGS="$CFLAGS -O0 -ggdb3" + debug_msg=" full" +fi +if test "x$debug_msg" = x; then + debug_msg=" none" fi DRIVER_NAME=intel @@ -523,3 +541,38 @@ AC_CONFIG_FILES([ test/Makefile ]) AC_OUTPUT + +accel_msg="" +if test "x$SNA" != "xno"; then + if test "$accel" = "sna"; then + accel_msg="$accel_msg *sna" + else + accel_msg="$accel_msg sna" + fi +fi +if test "x$UXA" != "xno"; then + if test "$accel" = "uxa"; then + accel_msg="$accel_msg *uxa" + else + accel_msg="$accel_msg uxa" + fi +fi +if test "x$GLAMOR" != "xno"; then + if test "$accel" = "glamor"; then + accel_msg="$accel_msg *glamor" + else + accel_msg="$accel_msg glamor" + fi +fi + +if test "x$dri_msg" = x; then + dri_msg=" none" +fi + +echo "" +echo "AC_PACKAGE_STRING will be compiled with:" +echo " Acceleration backends:$accel_msg" +echo " Additional debugging support?$debug_msg" +echo " Support for Direct Rendering Infrastructure:$dri_msg" +echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg" +echo "" diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am index 51489b8c..8414c5f3 100644 --- a/src/legacy/i810/Makefile.am +++ b/src/legacy/i810/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = xvmc noinst_LTLIBRARIES = liblegacy-i810.la -AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \ +AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ @PCIACCESS_CFLAGS@ \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/legacy \ $(NULL) @@ -29,7 +29,7 @@ liblegacy_i810_la_SOURCES += \ i810_dga.c endif -if DRI +if DRI1 liblegacy_i810_la_SOURCES +=\ i810_dri.c \ i810_dri.h \ diff --git a/src/legacy/i810/xvmc/Makefile.am b/src/legacy/i810/xvmc/Makefile.am index 1bac3119..7f28b8bb 100644 --- a/src/legacy/i810/xvmc/Makefile.am +++ b/src/legacy/i810/xvmc/Makefile.am @@ -5,7 +5,7 @@ endif libI810XvMC_la_SOURCES = I810XvMC.c \ I810XvMC.h -AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -DTRUE=1 -DFALSE=0 +AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ -DTRUE=1 -DFALSE=0 libI810XvMC_la_LDFLAGS = -version-number 1:0:0 -libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ +libI810XvMC_la_LIBADD = @DRI1_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am index aebbfc21..1551d31d 100644 --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am @@ -93,9 +93,9 @@ libsna_la_SOURCES = \ $(NULL) if DRI2 -AM_CFLAGS += @DRI_CFLAGS@ +AM_CFLAGS += @DRI2_CFLAGS@ libsna_la_SOURCES += sna_dri.c -libsna_la_LIBADD += $(DRI_LIBS) @CLOCK_GETTIME_LIBS@ +libsna_la_LIBADD += $(DRI2_LIBS) @CLOCK_GETTIME_LIBS@ endif if XVMC diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am index 945d7d42..dfb556fc 100644 --- a/src/uxa/Makefile.am +++ b/src/uxa/Makefile.am @@ -70,11 +70,12 @@ libuxa_la_SOURCES += \ endif if DRI2 +AM_CFLAGS += @DRI2_CFLAGS@ libuxa_la_SOURCES += \ intel_dri.c \ $(NULL) libuxa_la_LIBADD += \ - $(DRI_LIBS) \ + $(DRI2_LIBS) \ @CLOCK_GETTIME_LIBS@ \ $(NULL) endif diff --git a/xvmc/Makefile.am b/xvmc/Makefile.am index dd884a51..eaa88eac 100644 --- a/xvmc/Makefile.am +++ b/xvmc/Makefile.am @@ -24,9 +24,9 @@ libIntelXvMC_la_SOURCES = \ intel_batchbuffer.h \ $(NULL) -AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ +AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI2_CFLAGS@ \ @XVMCLIB_CFLAGS@ @XCB_CFLAGS@ \ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0 -libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XCB_LIBS@ @DRMINTEL_LIBS@ -lpthread +libIntelXvMC_la_LIBADD = @DRI2_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XCB_LIBS@ @DRMINTEL_LIBS@ -lpthread |