diff options
| author | Eduard Hasenleithner <ehasenle@users.sourceforge.net> | 2001-07-22 10:58:32 +0000 |
|---|---|---|
| committer | Eduard Hasenleithner <ehasenle@users.sourceforge.net> | 2001-07-22 10:58:32 +0000 |
| commit | 399c1ad333b1618d1f671404305d36f50ac58d2c (patch) | |
| tree | 0c7676f61d18e0c1b1cde12f4f794ce006bbcf01 | |
| parent | 8d2216a2097f2df48e4db1548a4303856787bde6 (diff) | |
| download | xine-lib-399c1ad333b1618d1f671404305d36f50ac58d2c.tar.gz xine-lib-399c1ad333b1618d1f671404305d36f50ac58d2c.tar.bz2 | |
Moved check for dxr3 to _xine.m4.
Made the linux path accessible.
CVS patchset: 319
CVS date: 2001/07/22 10:58:32
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | m4/_xine.m4 | 22 | ||||
| -rw-r--r-- | src/dxr3/Makefile.am | 2 |
3 files changed, 26 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 6fa1f87fa..1dc974af5 100644 --- a/configure.in +++ b/configure.in @@ -302,18 +302,10 @@ AM_CONDITIONAL(HAVE_CDROM_IOCTLS, test x"$have_cdrom_ioctls" = "xyes") dnl dnl dxr3 / hollywood plus card dnl -AC_ARG_WITH(linux-path, - [ --with-linux-path=PATH Where the linux sources are located], - linux_path="$withval", linux_path="/usr/src/linux") +AC_LINUX_PATH(/usr/src/linux) +AC_SUBST(LINUX_INCLUDE) -AC_ARG_ENABLE(dxr3, - [ --enable-dxr3 Turn on DXR3/HW+ decoder support], - enable_dxr3=yes, enable_dxr3=no) - -if test x$enable_dxr3 = xyes; then - AC_CHECK_HEADER($linux_path/include/linux/em8300.h, have_dxr3=yes, - AC_MSG_ERROR(DXR3 headers not found)) -fi +AC_CHECK_DXR3() AM_CONDITIONAL(HAVE_DXR3, test "x$have_dxr3" = xyes) dnl diff --git a/m4/_xine.m4 b/m4/_xine.m4 index 187d4f1a5..afdcc7ac5 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -54,6 +54,28 @@ AC_DEFUN([AC_CHECK_LIRC], ]) +dnl AC_LINUX_PATH(DEFAULT PATH) +AC_DEFUN(AC_LINUX_PATH, + [AC_ARG_WITH(linux-path, + [ --with-linux-path=PATH Where the linux sources are located], + linux_path="$withval", linux_path="$1") + LINUX_INCLUDE="-I$linux_path/include" +]) + +dnl AC_CHECK_DXR3() +AC_DEFUN(AC_CHECK_DXR3, + [ + AC_ARG_ENABLE(dxr3, + [ --enable-dxr3 Turn on DXR3/HW+ decoder support], + enable_dxr3=yes, enable_dxr3=no) + + if test x$enable_dxr3 = xyes; then + AC_CHECK_HEADER($linux_path/include/linux/em8300.h, have_dxr3=yes, + AC_MSG_ERROR(DXR3 headers not found)) + fi +]) + + dnl AC_C_ATTRIBUTE_ALIGNED dnl define ATTRIBUTE_ALIGNED_MAX to the maximum alignment if this is supported AC_DEFUN([AC_C_ATTRIBUTE_ALIGNED], diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 4052eba9a..ae7488487 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS = @GLOBAL_CFLAGS@ +CFLAGS = @GLOBAL_CFLAGS@ $(LINUX_INCLUDE) EXTRA_DIST = dxr3_decoder.c video_out_dxr3.c |