diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-07-24 15:02:05 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-07-24 15:02:05 +0000 |
| commit | 523046933e5f65f9a569277a596d827a0d8c7c7a (patch) | |
| tree | 8985aa6b2ebacd6cd722e4bcf2502e1d2dddc2c6 /m4 | |
| parent | d74d967493ad374657b2d7a6f5c8be858a7c63bc (diff) | |
| download | xine-lib-523046933e5f65f9a569277a596d827a0d8c7c7a.tar.gz xine-lib-523046933e5f65f9a569277a596d827a0d8c7c7a.tar.bz2 | |
Change DXR3 checkings. Some cosmetic changes.
CVS patchset: 339
CVS date: 2001/07/24 15:02:05
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/_xine.m4 | 19 | ||||
| -rw-r--r-- | m4/arts.m4 | 6 | ||||
| -rw-r--r-- | m4/irixal.m4 | 2 |
3 files changed, 15 insertions, 12 deletions
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]) |