diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 74 |
1 files changed, 57 insertions, 17 deletions
diff --git a/configure.in b/configure.in index 3c78413d7..40d25b1a2 100644 --- a/configure.in +++ b/configure.in @@ -102,6 +102,8 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL dnl obsolete AC_PROG_RANLIB AC_PROG_LN_S +AC_PROG_AWK + dnl @@ -348,7 +350,7 @@ AC_ARG_WITH(xv-path,[ --with-xv-path=path Where $xv_lib is installed], xv_path="$withval", xv_path="/usr/X11R6/lib") AC_CHECK_LIB(Xv, XvShmCreateImage, - [ AC_MSG_CHECKING(for $xv_lib location) + [ AC_MSG_CHECKING(for $xv_lib location)w if test -f "$xv_path/$xv_lib"; then AC_MSG_RESULT(found in $xv_path) XV_LIB="-lXv" @@ -390,7 +392,7 @@ AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") dnl dnl Check linux framebuffer device support dnl -AC_CHECK_HEADER(linux/fb.h,have_fb=yes,) +AC_CHECK_HEADER(linux/fb.h, have_fb=yes,) AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"]) dnl @@ -429,6 +431,47 @@ dnl AM_PATH_SDL(1.1.5, AC_DEFINE(HAVE_SDL),[]) AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"]) + +dnl +dnl dxr3 / hollywood plus card +dnl +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_LIBFAME, test x"$have_libfame" = "xyes") +AM_CONDITIONAL(HAVE_LIBRTE, test x"$have_librte" = "xyes") +AM_CONDITIONAL(HAVE_ENCODER, test x"$have_encoder" = "xyes") + + +dnl +dnl Vidix/libdha +dnl +AC_ARG_ENABLE(vidix, [ --disable-vidix Do not build vidix support], + check_vidix=no, check_vidix=yes) + +enable_vidix="no" + +AC_MSG_CHECKING(for vidix support) +if test x"$check_vidix" = "xyes"; then + case "$host_or_hostalias" in + *-linux*) + enable_vidix="yes" + enable_linux="yes" + ;; + *-freebsd*) + enable_vidix="yes" + ;; + esac +fi +AC_MSG_RESULT($enable_vidix) + +AM_CONDITIONAL(HAVE_VIDIX, test x"$enable_vidix" = "xyes") +AM_CONDITIONAL(HAVE_LINUX, test x"$enable_linux" = "xyes") +AC_CHECK_PROG(MKNOD, mknod, mknod, no) +AC_CHECK_PROG(DEPMOD, depmod, depmod, no) + dnl dnl Check for divx4 dnl @@ -544,23 +587,11 @@ AM_CHECK_CDROM_IOCTLS([AC_DEFINE([HAVE_CDROM_IOCTLS])], [AC_MSG_RESULT([*** DVD and (S)VCD support will be disabled ***])]) AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"]) -dnl -dnl dxr3 / hollywood plus card -dnl -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_LIBFAME, test x"$have_libfame" = "xyes") -AM_CONDITIONAL(HAVE_LIBRTE, test x"$have_librte" = "xyes") -AM_CONDITIONAL(HAVE_ENCODER, test x"$have_encoder" = "xyes") - dnl dnl ASF build can be optional dnl -AC_ARG_ENABLE(asf, [ --disable-asf do not build ASF demuxer], +AC_ARG_ENABLE(asf, [ --disable-asf Do not build ASF demuxer], enable_asf=no, enable_asf=yes) AM_CONDITIONAL(BUILD_ASF, test x"$enable_asf" = "xyes") @@ -575,7 +606,7 @@ dnl dnl Using or not using -fPIC (override default behavior - system dependent) dnl AC_ARG_ENABLE(fpic, - [ --disable-fpic disable -fPIC on shared libs (default on x86)], + [ --disable-fpic Disable -fPIC on shared libs (default on x86)], no_fpic=yes, no_fpic=no) @@ -626,7 +657,6 @@ case "$host_or_hostalias" in i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*) - if test "$GCC" = yes; then dnl Check for gcc cpu optimization support AC_TRY_CFLAGS("-mcpu=i386", @@ -942,6 +972,13 @@ include/xine.h.tmpl src/Makefile src/audio_out/Makefile src/video_out/Makefile +src/video_out/libdha/Makefile +src/video_out/libdha/bin/Makefile +src/video_out/libdha/kernelhelper/Makefile +src/video_out/libdha/oth/Makefile +src/video_out/libdha/sysdep/Makefile +src/video_out/vidix/Makefile +src/video_out/vidix/drivers/Makefile src/demuxers/Makefile src/dxr3/Makefile src/libmpeg2/Makefile @@ -1050,6 +1087,9 @@ if test x"$have_dxr3" = "xyes"; then echo " - dxr3 (Hollywood+ and Creative dxr3, mpeg video only)" fi fi +if test x"$enable_vidix" = "xyes"; then + echo " - vidix" +fi echo "" dnl Audio plugins |