HAVE_VLC=0
if test -r src/interface/main.c; then
HAVE_VLC=1
- VLC_VERSION=0.2.83
+ VLC_VERSION=0.2.91
AC_SUBST(VLC_VERSION)
VLC_CODENAME=Ourumov
AC_SUBST(VLC_CODENAME)
HAVE_LIBDVDCSS=0
if test -r extras/libdvdcss/libdvdcss.c; then
HAVE_LIBDVDCSS=1
- LIBDVDCSS_VERSION=0.0.3
+ LIBDVDCSS_VERSION=1.0.0
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
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_CPP
-AC_PROG_RANLIB
+AC_CHECK_TOOL(RANLIB, ranlib, :)
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
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}"
dnl Check for boolean_t
AC_CACHE_CHECK([for boolean_t in sys/types.h],
[ac_cv_c_boolean_t_sys_types_h],
- [AC_TRY_COMPILE([#include <sys/types.h>], [void quux() { boolean_t foo; }],
+ [AC_TRY_COMPILE([#include <sys/types.h>], [boolean_t foo;],
ac_cv_c_boolean_t_sys_types_h=yes, ac_cv_c_boolean_t_sys_types_h=no)])
if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
AC_CACHE_CHECK([for boolean_t in pthread.h],
[ac_cv_c_boolean_t_pthread_h],
- [AC_TRY_COMPILE([#include <pthread.h>], [void quux() { boolean_t foo; }],
+ [AC_TRY_COMPILE([#include <pthread.h>], [boolean_t foo;],
ac_cv_c_boolean_t_pthread_h=yes, ac_cv_c_boolean_t_pthread_h=no)])
if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
AC_CACHE_CHECK([for boolean_t in cthreads.h],
[ac_cv_c_boolean_t_cthreads_h],
- [AC_TRY_COMPILE([#include <cthreads.h>], [void quux() { boolean_t foo; }],
+ [AC_TRY_COMPILE([#include <cthreads.h>], [boolean_t foo;],
ac_cv_c_boolean_t_cthreads_h=yes, ac_cv_c_boolean_t_cthreads_h=no)])
if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
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}
dnl
dnl default modules
dnl
-BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix"
-PLUGINS="${PLUGINS}"
+BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
+PLUGINS="${PLUGINS} ac3_spdif spu_dec"
dnl
dnl Accelerated modules
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 *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 *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 *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 *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(,[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(,[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
[save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -faltivec"
# Darwin test
- AC_TRY_COMPILE(,[void quux(){vec_mtvscr((vector unsigned int)(0));}],
+ AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
ac_cv_c_altivec=-faltivec, [
# Linux/PPC test
CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec"
- AC_TRY_COMPILE(,[void quux(){vec_mtvscr((vector unsigned int)(0));}],
+ AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
[ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
])
CFLAGS=$save_CFLAGS
if test x"$ac_cv_c_altivec" != x"no"; then
AC_DEFINE(HAVE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.)
CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_c_altivec"
+ ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
fi
AC_CACHE_CHECK([if linker needs -framework vecLib],
LIB_ALTIVEC="-framework vecLib"
fi
+dnl
+dnl Check the operating system
+dnl
+case ${target_os} in
+ bsdi*)
+ SYS=bsdi
+ ;;
+ darwin*)
+ SYS=darwin
+ ;;
+ *mingw32*)
+ SYS=mingw32
+ ;;
+ *)
+ SYS=${target_os}
+ ;;
+esac
+
+dnl
+dnl Windoze specific section
+dnl
+if test $SYS = mingw32; then
+AC_CHECK_TOOL(WINDRES, windres, :)
+fi
+
dnl
dnl libdvdcss: check for DVD ioctls
dnl
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
])
-
-dnl
-dnl Check the operating system
-dnl
-case ${target_os} in
- bsdi*)
- SYS=bsdi
- ;;
- darwin*)
- SYS=darwin
- ;;
- *)
- SYS=${target_os}
- ;;
-esac
-
dnl
dnl Special arch tuning
dnl
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
dnl
dnl OSS /dev/dsp module
+dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(dsp,
[ --disable-dsp Linux /dev/dsp support (default enabled)])
-if test x$enable_dsp != xno
+if test x$enable_dsp != xno &&
+ (test $SYS != mingw32 || test x$enable_dsp = xyes)
then
if test -c /dev/dsp
then
if test x${ESD_CONFIG} != xno
then
PLUGINS="${PLUGINS} esd"
+ CFLAGS_ESD="`${ESD_CONFIG} --cflags`"
LIB_ESD="`${ESD_CONFIG} --libs`"
fi
fi])
+dnl
+dnl aRts module
+dnl
+AC_ARG_ENABLE(arts,
+ [ --enable-arts aRts sound server (default disabled)],
+ [if test x$enable_arts = xyes
+ then
+ AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
+ if test x${ARTS_CONFIG} != xno
+ then
+ PLUGINS="${PLUGINS} arts"
+ CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`"
+ LIB_ARTS="`${ARTS_CONFIG} --libs `"
+ fi
+ fi])
+
dnl
dnl Darwin module
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
dnl
dnl Windows DirectX module
dnl
-AC_ARG_WITH(directx,
- [ --with-directx[=name] Windows DirectX support (default enabled)],
- [ if test "x$withval" != "xno"
+AC_ARG_ENABLE(directx,
+ [ --disable-directx Windows DirectX support (default enabled on WIN32)],
+ [ if test "x$enableval" != "xno"
then
PLUGINS="${PLUGINS} directx"
- if test "x$withval" != "xyes"
+ if test "x$enableval" = "xyes"
then
+ AC_ARG_WITH(directx,
+ [--with-directx=[name] Windows DirectX support (default enabled)])
+ if test "x$withval" = "x"
+ then
+ AC_CHECK_HEADERS(directx.h, [LIB_DIRECTX="-lgdi32 -ldxguid"],
+ AC_MSG_ERROR([Cannot find DirectX headers !]))
+ else
LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
INCLUDE="${INCLUDE} -I"$withval"/include"
+ fi
else
- AC_CHECK_HEADERS(directx.h, ,
- AC_MSG_ERROR([Cannot find DirectX headers !])
- )
- LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"
+ AC_MSG_CHECKING(for directX headers in ${enableval})
+ if test -f ${enableval}/include/directx.h
+ then
+ LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid"
+ INCLUDE="${INCLUDE} -I${enableval}/include"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([Cannot find ${enableval}/include/directx.h!])
+ fi
fi
- fi ])
- if test "x$withval" = "x"
+ fi ],
+ [ if test $SYS = mingw32
then
AC_CHECK_HEADERS(directx.h,
- [PLUGINS="${PLUGINS} directx"
- LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"])
- fi
+ [ PLUGINS="${PLUGINS} directx"
+ LIB_DIRECTX="-lgdi32 -ldxguid" ],
+ [ echo "Cannot find DirectX headers !" ])
+ fi ])
dnl
dnl Glide module
[ --disable-gtk Gtk+ support (default enabled)])
if test x$enable_gtk != xno
then
+ GTK_PATH=$PATH
+ AC_ARG_WITH(gtk-config-path,
+ [ --with-gtk-config-path=path gtk-config path (default search in \$PATH)],
+ [ if test "x$withval" != "xno"
+ then
+ GTK_PATH=$withval:$PATH
+ fi ])
# look for gtk-config
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH)
if test -x ${GTK_CONFIG}
then
CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
dnl
dnl X11 module
+dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(x11,
[ --disable-x11 X11 support (default enabled)])
-if test x$enable_x11 != xno; then
+if test x$enable_x11 != xno &&
+ (test $SYS != mingw32 || test x$enable_x11 = xyes); then
if test x$x_includes = xNONE; then
x_includes=/usr/X11R6/include
fi
dnl
dnl XVideo module
+dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(xvideo,
[ --disable-xvideo XVideo support (default enabled)])
-if test x$enable_xvideo != xno; then
+if test x$enable_xvideo != xno &&
+ (test $SYS != mingw32 || test x$enable_xvideo = xyes); then
if test x$x_includes = xNONE; then
x_includes=/usr/X11R6/include
fi
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)
AC_SUBST(LIB)
AC_SUBST(LIB_ALSA)
AC_SUBST(LIB_ALTIVEC)
+AC_SUBST(LIB_ARTS)
AC_SUBST(LIB_BEOS)
AC_SUBST(LIB_DARWIN)
AC_SUBST(LIB_DVD)
AC_SUBST(CFLAGS_ALTIVEC)
AC_SUBST(CFLAGS_DVD)
AC_SUBST(CFLAGS_LIBDVDCSS)
+AC_SUBST(CFLAGS_ARTS)
+AC_SUBST(CFLAGS_ESD)
AC_SUBST(CFLAGS_GTK)
AC_SUBST(CFLAGS_SDL)
AC_SUBST(CFLAGS_X11)
system : ${SYS}
architecture : ${ARCH}
optimizations : ${OPTIMS}
-tuning: : ${TUNING}"
+tuning: : ${TUNING}
+release: : ${RELEASE}"
if test x${HAVE_VLC} = x1
then
projects / vlc / blobdiff