check for the proper dxr3 header aphabetization fixes

Original commit message from CVS:
* check for the proper dxr3 header
* aphabetization fixes

diff --git a/configure.ac b/configure.ac
index d8fe94abfe80790e222163dc0e5fa20e70d80cb6..f22e5849c0f66198c3d585c5b6dad659298166a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,7 @@ dnl ==========================================================================
 dnl *** DXR3 card ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DXR3, true)
 GST_CHECK_FEATURE(DXR3, [DXR3 hardware mpeg video decoder], dxr3videosink, [
-  AC_CHECK_HEADER(linux/em8000.h, HAVE_DXR3="yes", HAVE_DXR3="no")
+  AC_CHECK_HEADER(linux/em8300.h, HAVE_DXR3="yes", HAVE_DXR3="no")
 ])
 
 dnl *** OSS audio ***

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 8c6db9af0a96f45feda208e75385dbdd2e388cd5..92b9468dff354bfc970c931f0353724f1e8d72d8 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -40,8 +40,8 @@ else
 XVIDEO_DIR=
 endif
 
-SUBDIRS=$(OSS_DIR) $(DXR3_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \
+SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \
        $(VGA_DIR) $(XVIDEO_DIR)
 
-DIST_SUBDIRS=oss dxr3 qcam v4l vcd vga xvideo videosink
+DIST_SUBDIRS=dxr3 oss qcam v4l vcd vga xvideo videosink