diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | m4/_xine.m4 | 19 | ||||
| -rw-r--r-- | m4/arts.m4 | 6 | ||||
| -rw-r--r-- | m4/irixal.m4 | 2 | ||||
| -rw-r--r-- | src/dxr3/Makefile.am | 4 | ||||
| -rw-r--r-- | src/dxr3/dxr3_decoder.c | 4 | ||||
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 4 |
7 files changed, 22 insertions, 19 deletions
diff --git a/configure.in b/configure.in index b64daef1d..06edc6009 100644 --- a/configure.in +++ b/configure.in @@ -306,7 +306,7 @@ AC_LINUX_PATH(/usr/src/linux) AC_SUBST(LINUX_INCLUDE) AC_CHECK_DXR3() -AM_CONDITIONAL(HAVE_DXR3, test "x$have_dxr3" = xyes) +AM_CONDITIONAL(HAVE_DXR3, test x"$have_dxr3" = "xyes") dnl dnl ip_mreqn diff --git a/m4/_xine.m4 b/m4/_xine.m4 index afdcc7ac5..0410ecad5 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -65,14 +65,17 @@ AC_DEFUN(AC_LINUX_PATH, 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 + AC_ARG_WITH(dxr3-path, + [ --with-dxr3-path=path Where em8300.h is located], + em8300_path="$withval", em8300_path="$linux_path/include/linux") + + AC_CHECK_HEADER($em8300_path/em8300.h, + have_dxr3=yes + EM8300_INCLUDE_PATH="-I`eval echo $em8300_path`", + have_dxr3=no + AC_MSG_RESULT(*** DXR3 support disabled ***)) + + AC_SUBST(EM8300_INCLUDE_PATH) ]) diff --git a/m4/arts.m4 b/m4/arts.m4 index 2f4151a1a..7f0b624c5 100644 --- a/m4/arts.m4 +++ b/m4/arts.m4 @@ -9,11 +9,11 @@ AC_DEFUN(AM_PATH_ARTS, [dnl dnl Get the cflags and libraries from the artsc-config script dnl -AC_ARG_WITH(arts-prefix,[ --with-arts-prefix=PFX Prefix where ARTS is installed (optional)], +AC_ARG_WITH(arts-prefix,[ --with-arts-prefix=PFX Prefix where ARTS is installed (optional)], arts_prefix="$withval", arts_prefix="") -AC_ARG_WITH(arts-exec-prefix,[ --with-arts-exec-prefix=PFX Exec prefix where ARTS is installed (optional)], +AC_ARG_WITH(arts-exec-prefix,[ --with-arts-exec-prefix=PFX Exec prefix where ARTS is installed (optional)], arts_exec_prefix="$withval", arts_exec_prefix="") -AC_ARG_ENABLE(artstest, [ --disable-artstest Do not try to compile and run a test ARTS program], +AC_ARG_ENABLE(artstest, [ --disable-artstest Do not try to compile and run a test ARTS program], , enable_artstest=yes) if test x$arts_exec_prefix != x ; then diff --git a/m4/irixal.m4 b/m4/irixal.m4 index a613eb4d4..31d5caf5a 100644 --- a/m4/irixal.m4 +++ b/m4/irixal.m4 @@ -5,7 +5,7 @@ AC_DEFUN(AM_PATH_IRIXAL, dnl replace by test AC_ARG_ENABLE(irixal, [ --enable-irixal Turn on IRIX AL audio support.], enable_irixal=yes, enable_irixal=no) - AC_ARG_WITH(irixal-prefix,[ --irixal-prefix=pfx Prefix where al is installed (optional)], + AC_ARG_WITH(irixal-prefix,[ --irixal-prefix=pfx Prefix where al is installed (optional)], irixal_prefix="$withval", irixal_prefix="") AC_MSG_CHECKING([for IRIX AL support]) diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index ae7488487..906eb1c96 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS = @GLOBAL_CFLAGS@ $(LINUX_INCLUDE) +CFLAGS = @GLOBAL_CFLAGS@ $(EM8300_INCLUDE_PATH) $(LINUX_INCLUDE) EXTRA_DIST = dxr3_decoder.c video_out_dxr3.c @@ -19,7 +19,7 @@ xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(EM8300_INCLUDE_PATH) $(LINUX_INCLUDE)" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c index 833fa8b4f..197c813c1 100644 --- a/src/dxr3/dxr3_decoder.c +++ b/src/dxr3/dxr3_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decoder.c,v 1.1 2001/07/20 17:28:21 ehasenle Exp $ + * $Id: dxr3_decoder.c,v 1.2 2001/07/24 15:02:05 f1rmb Exp $ * * dxr3 video and spu decoder plugin. Accepts the video and spu data * from XINE and sends it directly to the corresponding dxr3 devices. @@ -32,7 +32,7 @@ #include <buffer.h> #include <xine_internal.h> #include <linux/soundcard.h> -#include <linux/em8300.h> +#include <em8300.h> #include <stdio.h> #include <errno.h> diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index af1a36b1b..ac7bc7934 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_dxr3.c,v 1.2 2001/07/24 13:26:18 ehasenle Exp $ + * $Id: video_out_dxr3.c,v 1.3 2001/07/24 15:02:05 f1rmb Exp $ * * Dummy video out plugin for the dxr3. Is responsible for setting * tv_mode, bcs values and the aspectratio. @@ -33,7 +33,7 @@ #include <fcntl.h> #include <errno.h> -#include <linux/em8300.h> +#include <em8300.h> #include "video_out.h" #include <pthread.h> |