HAVE_VLC=0
if test -r src/interface/main.c; then
HAVE_VLC=1
- VLC_VERSION=0.2.81
+ VLC_VERSION=0.2.82
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
-dnl Save CFLAGS
+dnl Save CFLAGS and LDFLAGS
save_CFLAGS="${CFLAGS}"
+save_LDFLAGS="${LDFLAGS}"
dnl Check for tools
AC_PROG_MAKE_SET
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
dnl Check for Darwin plugin linking flags
CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
-AC_MSG_CHECKING([if \$CC compiles plugins with -bundle -undefined suppress])
+AC_MSG_CHECKING([if \$CC accepts -bundle -undefined suppress])
AC_TRY_COMPILE([],,
PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
dnl Check for standard plugin linking flags
CFLAGS="${save_CFLAGS} -shared"
-AC_MSG_CHECKING([if \$CC compiles plugins with -shared])
+AC_MSG_CHECKING([if \$CC accepts -shared])
AC_TRY_COMPILE([],,
PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
+dnl Check for standard soname setting
+if test x"${SOFLAGS}" = x; then
+ try_SOFLAGS="-Wl,-soname -Wl,"
+ LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+ AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0])
+ AC_TRY_LINK([],,
+ SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+fi
+
+dnl Check for SunOS soname setting
+if test x"${SOFLAGS}" = x; then
+ try_SOFLAGS="-Wl,-h -Wl,"
+ LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+ AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0])
+ AC_TRY_LINK([],,
+ SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+fi
+
dnl End of the bizarre compilation tests
CFLAGS="${save_CFLAGS}"
+LDFLAGS="${save_LDFLAGS}"
dnl Check for boolean_t
AC_MSG_CHECKING([for boolean_t in sys/types.h])
dnl for Un*x and BeOS
AC_CHECK_HEADERS(sys/ioctl.h,[
CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
- AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
+ AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h)
BSD_DVD_STRUCT=0
+ LINUX_DVD_STRUCT=0
dnl
dnl Old FreeBSD: sys/cdio.h
dnl
Define if <sys/cdio.h> defines dvd_struct.)
BSD_DVD_STRUCT=1
])
- if test x$BSD_DVD_STRUCT = x1; then
- AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
- Define if BSD-like dvd_struct is defined.)
- fi
dnl
dnl Linux: linux/cdrom.h
dnl
AC_EGREP_HEADER(dvd_struct,linux/cdrom.h,[
AC_DEFINE(DVD_STRUCT_IN_LINUX_CDROM_H, 1,
Define if <linux/cdrom.h> defines DVD_STRUCT.)
+ LINUX_DVD_STRUCT=1
])
+ 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
+ if test x$LINUX_DVD_STRUCT = x1; then
+ AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
+ Define if Linux-like dvd_struct is defined.)
+ else
+ if test x$BSD_DVD_STRUCT = x1; then
+ AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
+ Define if BSD-like dvd_struct is defined.)
+ fi
+ fi
])
dnl Check the operating system
dnl
case ${host_os} in
+ bsdi*)
+ SYS=bsdi
+ ;;
darwin*)
SYS=darwin
;;
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"
- LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
- LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+ LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+ LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}"
fi
;;
xlocal-shared)
# 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"
BUILTINS="${BUILTINS} dvd"
OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+ CFLAGS_DVD="${CFLAGS_DVD} -DLIBDVDCSS_VERSION=\"${LIBDVDCSS_VERSION}\""
LIB_DVD="${LIB_DVD} -ldl"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
;;
# 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"
- LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
- LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+ LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+ LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}"
else
# XXX: no check for libdl is done, don't try this at home !
DUMMY_LIBDVDCSS=1
[ --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(TRACE)
AC_SUBST(PROFILING)
AC_SUBST(OPTIMS)
-AC_SUBST(GETOPT)
+AC_SUBST(NEED_GETOPT)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(LCFLAGS)
AC_SUBST(PLCFLAGS)
-AC_SUBST(LIB)
+AC_SUBST(SOFLAGS)
+AC_SUBST(LIB)
AC_SUBST(LIB_ALSA)
AC_SUBST(LIB_BEOS)
AC_SUBST(LIB_DARWIN)
AC_SUBST(LIB_GNOME)
AC_SUBST(LIB_GTK)
AC_SUBST(LIB_IDCTALTIVEC)
+AC_SUBST(LIB_LIBDVDCSS)
AC_SUBST(LIB_KDE)
AC_SUBST(LIB_MACOSX)
AC_SUBST(LIB_QNX)
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])
statistics : ${STATS}
trace mode : ${TRACE}
profiling : ${PROFILING}
-need builtin getopt : ${GETOPT}
+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