HAVE_VLC=0
if test -r src/interface/main.c; then
HAVE_VLC=1
- VLC_VERSION=0.2.83
+ VLC_VERSION=0.2.90
AC_SUBST(VLC_VERSION)
VLC_CODENAME=Ourumov
AC_SUBST(VLC_CODENAME)
HAVE_LIBDVDCSS=1
LIBDVDCSS_VERSION=0.0.3
AC_SUBST(LIBDVDCSS_VERSION)
+ if test -r extras/libdvdcss/csskeys.h; then
+ AC_DEFINE(HAVE_CSSKEYS,1,css decryption with player keys)
+ fi
fi
dnl Save CFLAGS and LDFLAGS
fi
fi
+dnl Checks for __attribute__(aligned()) directive
+AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
+ [ac_cv_c_attribute_aligned],
+ [ac_cv_c_attribute_aligned=0
+ CFLAGS="${save_CFLAGS} -Werror"
+ for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
+ AC_TRY_COMPILE([],
+ [static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;],
+ [ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
+ done])
+if test x"$ac_cv_c_attribute_aligned" != x"0"; then
+ AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
+ [$ac_cv_c_attribute_aligned],[Maximum supported data alignment])
+fi
+
dnl End of the bizarre compilation tests
CFLAGS="${save_CFLAGS}"
LDFLAGS="${save_LDFLAGS}"
AC_TYPE_SIZE_T
AC_HEADER_TIME
-dnl Checks for __attribute__(aligned()) directive
-AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
- [ac_cv_c_attribute_aligned],
- [ac_cv_c_attribute_aligned=0
- for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
- AC_TRY_COMPILE([],
- [static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;],
- [ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
- done])
-if test x"$ac_cv_c_attribute_aligned" != x"0"; then
- AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
- [$ac_cv_c_attribute_aligned],[Maximum supported data alignment])
-fi
-
-
ARCH=${target_cpu}
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
[ac_cv_mmx_inline],
- [AC_TRY_COMPILE(,[void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],
+ [AC_TRY_COMPILE(,[void quux(){void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));}],
ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
if test x"$ac_cv_mmx_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly],
[ac_cv_mmxext_inline],
- [AC_TRY_COMPILE(,[void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],
+ [AC_TRY_COMPILE(,[void quux(){void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));}],
ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
if test x"$ac_cv_mmxext_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly],
[ac_cv_3dnow_inline],
- [AC_TRY_COMPILE(,[void quux(){void *p;asm("pfadd %%mm1,%%mm2"::"r"(p));}],
+ [AC_TRY_COMPILE(,[void quux(){void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));}],
ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
if test x"$ac_cv_3dnow_inline" != x"no"; then
+ AC_DEFINE(HAVE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
fi
AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
[ac_cv_sse_inline],
- [AC_TRY_COMPILE(,[void quux(){void *p;asm("xorps %%xmm1,%%xmm2"::"r"(p));}],
+ [AC_TRY_COMPILE(,[void quux(){void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));}],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
if test x"$ac_cv_sse_inline" != x"no"; then
+ AC_DEFINE(HAVE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi
AC_CACHE_CHECK([if \$CC groks Altivec inline assembly],
[ac_cv_altivec_inline],
- [AC_TRY_COMPILE(,[void quux(){asm("vperm 0,1,2,3");}],
+ [AC_TRY_COMPILE(,[void quux(){asm volatile("vperm 0,1,2,3");}],
ac_cv_altivec_inline=yes,
[save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Wa,-m7400"
- AC_TRY_COMPILE(,[void quux(){asm("vperm 0,1,2,3");}],
+ AC_TRY_COMPILE(,[void quux(){asm volatile("vperm 0,1,2,3");}],
[ac_cv_altivec_inline=yes; CFLAGS_ALTIVEC="-Wa,-m7400"],
ac_cv_altivec_inline=no)
CFLAGS=$save_CFLAGS
])])
if test x"$ac_cv_altivec_inline" != x"no"; then
+ AC_DEFINE(HAVE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
fi
AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h)
BSD_DVD_STRUCT=0
LINUX_DVD_STRUCT=0
+ OPENBSD_DVD_STRUCT=0
dnl
dnl Old FreeBSD: sys/cdio.h
dnl
- AC_EGREP_HEADER(dvd_struct,sys/dvdio.h,[
- AC_DEFINE(DVD_STRUCT_IN_SYS_DVDIO_H, 1,
- Define if <sys/dvdio.h> defines dvd_struct.)
- BSD_DVD_STRUCT=1
+ AC_EGREP_HEADER(dvd_struct,sys/cdio.h,[
+ AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1,
+ Define if <sys/cdio.h> defines dvd_struct.)
+ AC_EGREP_HEADER(struct dvd_struct,sys/cdio.h,[
+ BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1; OPENBSD_DVD_STRUCT=1])
])
dnl
dnl Newer FreeBSD: sys/dvdio.h
dnl
- AC_EGREP_HEADER(dvd_struct,sys/cdio.h,[
- AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1,
- Define if <sys/cdio.h> defines dvd_struct.)
- BSD_DVD_STRUCT=1
+ AC_EGREP_HEADER(dvd_struct,sys/dvdio.h,[
+ AC_DEFINE(DVD_STRUCT_IN_SYS_DVDIO_H, 1,
+ Define if <sys/dvdio.h> defines dvd_struct.)
+ AC_EGREP_HEADER(struct dvd_struct,sys/dvdio.h,[
+ BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1])
])
dnl
dnl Linux: linux/cdrom.h
if test x$LINUX_DVD_STRUCT = x1; then
AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
Define if Linux-like dvd_struct is defined.)
+ if test x$OPENBSD_DVD_STRUCT = x1; then
+ AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
+ Define if OpenBSD-like dvd_struct is defined.)
+ fi
else
if test x$BSD_DVD_STRUCT = x1; then
AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
- Define if BSD-like dvd_struct is defined.)
+ Define if FreeBSD-like dvd_struct is defined.)
fi
fi
])
if test "x$withval" != "x"; then
TUNING=$withval
else
- if test x$ARCH = xi686; then TUNING="pentiumpro"
+ if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro"
else
- if test x$ARCH = ppc; then TUNING="750"; fi
+ if test x${target_cpu} = xpowerpc; then TUNING="750"; fi
fi
fi
+dnl
+dnl Enable release-specific flags
+dnl
+AC_ARG_ENABLE(release,
+[ --enable-release Activate extra optimizations (default disabled)],
+[ if test x$enableval = xyes; then RELEASE=1; fi ],
+[ VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`";
+ LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ])
+
dnl
dnl MMX acceleration
dnl
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
fi ])
+dnl
+dnl VCD module
+dnl
+AC_ARG_ENABLE(vcd,
+ [ --enable-vcd VCD support for Linux (default enabled)])
+
+if test x$enable_vcd != xno
+then
+ AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
+ BUILTINS="${BUILTINS} vcd"
+ ])
+fi
+
+if test x$enable_vcd != xno -a "${SYS}" = "bsdi"
+then
+ BUILTINS="${BUILTINS} vcd"
+fi
+
dnl
dnl dummy plugin
dnl
[if test x$enable_macosx = xyes
then
BUILTINS="${BUILTINS} macosx"
- LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
- LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
- LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
+ LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
+ LIB="${LIB} -ObjC"
fi],
- [AC_CHECK_HEADERS(Carbon/Carbon.h,
+ [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
BUILTINS="${BUILTINS} macosx"
- LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
- LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
- LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
+ LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
+ LIB="${LIB} -ObjC"
)])
dnl
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
- PLUGINS="${PLUGINS} xvideo"
+ BUILTINS="${BUILTINS} xvideo"
LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
CFLAGS_X11="-I$x_includes"
]
AC_SUBST(GPROF)
AC_SUBST(OPTIMS)
AC_SUBST(TUNING)
+AC_SUBST(RELEASE)
AC_SUBST(NEED_GETOPT)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
system : ${SYS}
architecture : ${ARCH}
optimizations : ${OPTIMS}
-tuning: : ${TUNING}"
+tuning: : ${TUNING}
+release: : ${RELEASE}"
if test x${HAVE_VLC} = x1
then