HAVE_VLC=0
if test -r src/interface/main.c; then
HAVE_VLC=1
- VLC_VERSION=0.2.81
+ VLC_VERSION=0.2.83
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.2
+ LIBDVDCSS_VERSION=0.0.3
AC_SUBST(LIBDVDCSS_VERSION)
fi
AC_CHECK_FUNCS(sigrelse)
dnl Check for getopt
-GETOPT=0
+NEED_GETOPT=0
AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[ # FreeBSD has a gnugetopt library for this:
AC_CHECK_LIB([gnugetopt],[getopt_long],
[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"],
- [GETOPT=1])])
+ [NEED_GETOPT=1])])
AC_FUNC_MMAP
AC_TYPE_SIGNAL
AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
-AC_CHECK_LIB(dvd,dvd_cdrom_ioctl,LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd")
CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
CFLAGS="${CFLAGS} -I/usr/local/include"
dnl Check for pthreads - borrowed from XMMS
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+THREAD_LIB=error
+if test "x${THREAD_LIB}" = xerror; then
+ AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+fi
if test "x${THREAD_LIB}" = xerror; then
AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
fi
AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
fi
if test "x${THREAD_LIB}" = xerror; then
- THREAD_LIBS=""
AC_CHECK_FUNC(pthread_attr_init)
+ THREAD_LIB=""
fi
+dnl Check for cthreads under GNU/Hurd for instance
+AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
+
dnl Check for misc headers
AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
void quux() { boolean_t foo; }],,
AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_MSG_CHECKING([for boolean_t in cthreads.h])
+AC_TRY_COMPILE([#include <cthreads.h>
+void quux() { boolean_t foo; }],,
+ AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
dnl Accelerated modules
dnl
MMX_MODULES="yuvmmx idctmmx motionmmx"
-MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
+MMXEXT_MODULES="idctmmxext motionmmxext"
+THREEDNOW_MODULES="imdct3dn downmix3dn"
+SSE_MODULES="imdctsse downmixsse"
AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
+AC_MSG_CHECKING([if \$CC groks MMX EXT inline assembly])
AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_MSG_CHECKING([if \$CC groks 3D Now! inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("pfadd %%mm1,%%mm2"::"r"(p));}],,
+ ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks SSE inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("xorps %%xmm1,%%xmm2"::"r"(p));}],,
+ ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
dnl
dnl libdvdcss: check for DVD ioctls
dnl
dnl
dnl BSDI: dvd.h
dnl
+ NEED_BSDI_LIBDVD=0
AC_EGREP_HEADER(dvd_struct,dvd.h,[
AC_DEFINE(DVD_STRUCT_IN_DVD_H, 1,
Define if <dvd.h> defines DVD_STRUCT.)
+ LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd"
LINUX_DVD_STRUCT=1
+ ],[
+ dnl
+ dnl BSDI: /sys/dev/scsi/scsi_ioctl.h, using our own libdvd
+ dnl
+ AC_CHECK_HEADERS(/sys/dev/scsi/scsi_ioctl.h,[
+ NEED_BSDI_LIBDVD=1
+ AC_DEFINE(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H, 1,
+ Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT.)
+ OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
+ LINUX_DVD_STRUCT=1
+ ])
+ ])
+ dnl
+ dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
+ dnl
+ AC_CHECK_HEADER(sys/scsi/scsi_types.h,[
+ AC_CHECK_HEADER(sys/scsi/impl/uscsi.h,[
+ AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
+ ])
])
dnl
dnl Final tests to check what was detected
dnl
dnl Trace mode
dnl
-PROFILING=0
-AC_ARG_ENABLE(profiling,
-[ --enable-profiling Enable gprof profiling (default disabled)],
-[ if test x$enableval = xyes; then PROFILING=1; fi ])
+GPROF=0
+AC_ARG_ENABLE(gprof,
+[ --enable-gprof Enable gprof profiling (default disabled)],
+[ if test x$enableval = xyes; then GPROF=1; fi ])
+
+CPROF=0
+AC_ARG_ENABLE(cprof,
+[ --enable-cprof Enable cprof profiling (default disabled)],
+[ if test x$enableval = xyes;
+ then
+ LIB="${LIB} -lcprof"
+ CPROF=1
+ fi
+])
dnl
dnl Enable/disable optimizations
dnl
dnl DVD module: check for installed libdvdcss or local libdvdcss
dnl
-LOCAL_LIBDVDCSS=0
+NEED_LIBDVDCSS=0
STATIC_LIBDVDCSS=0
DUMMY_LIBDVDCSS=0
AC_ARG_WITH(dvdcss,
# local libdvdcss, statically linked
if test x${CAN_BUILD_LIBDVDCSS} = x1
then
- LOCAL_LIBDVDCSS=1
+ NEED_LIBDVDCSS=1
STATIC_LIBDVDCSS=1
BUILTINS="${BUILTINS} dvd"
CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
# local libdvdcss, dynamically linked
if test x${CAN_BUILD_LIBDVDCSS} = x1
then
- LOCAL_LIBDVDCSS=1
+ NEED_LIBDVDCSS=1
BUILTINS="${BUILTINS} dvd"
CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
LIB_DVD="${LIB_DVD} -Llib -ldvdcss"
# if libdvdcss is in the archive, or to use the dummy replacement otherwise.
[ if test x${CAN_BUILD_LIBDVDCSS} = x1
then
- LOCAL_LIBDVDCSS=1
+ NEED_LIBDVDCSS=1
STATIC_LIBDVDCSS=1
BUILTINS="${BUILTINS} dvd"
CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
[ --disable-sdl SDL support (default enabled)])
if test "x$enable_sdl" != "xno"
then
- AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no)
+ SDL_PATH=$PATH
+ AC_ARG_WITH(sdl-config-path,
+ [ --with-sdl-config-path=path sdl-config path (default search in \$PATH)],
+ [ if test "x$withval" != "xno"
+ then
+ SDL_PATH=$withval:$PATH
+ fi ])
+ AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, $SDL_PATH)
SDL_CONFIG=${SDL12_CONFIG}
SDL_HEADER="SDL12/SDL.h"
if test x${SDL_CONFIG} = xno
then
- AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no)
+ AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, $SDL_PATH)
SDL_CONFIG=${SDL11_CONFIG}
SDL_HEADER="SDL11/SDL.h"
fi
if test x${SDL_CONFIG} = xno
then
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, $SDL_PATH)
SDL_HEADER="SDL/SDL.h"
fi
if test x${SDL_CONFIG} != xno
AC_SUBST(STATS)
AC_SUBST(ASM)
AC_SUBST(TRACE)
-AC_SUBST(PROFILING)
+AC_SUBST(CPROF)
+AC_SUBST(GPROF)
AC_SUBST(OPTIMS)
-AC_SUBST(GETOPT)
+AC_SUBST(NEED_GETOPT)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(CFLAGS_VLC)
AC_SUBST(CFLAGS_DVD)
+AC_SUBST(CFLAGS_LIBDVDCSS)
AC_SUBST(CFLAGS_GTK)
AC_SUBST(CFLAGS_SDL)
AC_SUBST(CFLAGS_X11)
AC_SUBST(OBJ_DVD)
+AC_SUBST(OBJ_LIBDVDCSS)
-AC_SUBST(LOCAL_LIBDVDCSS)
+AC_SUBST(NEED_LIBDVDCSS)
AC_OUTPUT([Makefile.opts include/config.h])
debug mode : ${DEBUG}
statistics : ${STATS}
trace mode : ${TRACE}
-profiling : ${PROFILING}
-need builtin getopt : ${GETOPT}
+cprof/gprof support : ${CPROF}/${GPROF}
+need builtin getopt : ${NEED_GETOPT}
built-in modules :${BUILTINS}
plugin modules :${PLUGINS}
vlc aliases :${ALIASES}"
libdvdcss configuration
-----------------------
can be built : ${CAN_BUILD_LIBDVDCSS}
-will be built : ${LOCAL_LIBDVDCSS}"
-if test x${LOCAL_LIBDVDCSS} = x1
+will be built : ${NEED_LIBDVDCSS}"
+if test x${NEED_LIBDVDCSS} = x1
then
+ echo "need BSDI libdvd : ${NEED_BSDI_LIBDVD}"
echo "link statically : ${STATIC_LIBDVDCSS}"
else
echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
projects / vlc / blobdiff