AC_INIT(include/common.h)
AC_CONFIG_HEADER(include/defs.h)
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
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
-dnl Save CFLAGS
+dnl Save CFLAGS and LDFLAGS
save_CFLAGS="${CFLAGS}"
+save_LDFLAGS="${LDFLAGS}"
dnl Check for tools
AC_PROG_MAKE_SET
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
-dnl Check for endianness if not cross-compiling
+dnl
+dnl Endianness check, with a special test for cross-compilation
+dnl
if test x${cross_compiling} != xyes; then
AC_C_BIGENDIAN
+else
+ dnl We are crosscompiling, give the user the opportunity to specify
+ dnl --with-words=big or --with-words=little ; otherwise, try to guess
+ AC_ARG_WITH(words,
+ [ --with-words=endianness Set endianness (big or little)])
+ case "x$withval" in
+ xbig)
+ ac_cv_c_bigendian=yes
+ ;;
+ xlittle)
+ ac_cv_c_bigendian=no
+ ;;
+ *)
+ dnl Try to guess endianness by matching patterns on a compiled
+ dnl binary, by looking for an ASCII or EBCDIC string
+ ac_cv_c_bigendian=unknown
+ AC_MSG_CHECKING(what the byte order looks to be)[
+ cat >conftest.c <<EOF
+ short am[] = { 0x4249, 0x4765, 0x6e44, 0x6961, 0x6e53, 0x7953, 0 };
+ short ai[] = { 0x694c, 0x5454, 0x656c, 0x6e45, 0x6944, 0x6e61, 0 };
+ void _a(void) { char*s = (char*)am; s = (char *)ai; }
+ short ei[] = { 0x89D3, 0xe3e3, 0x8593, 0x95c5, 0x89c4, 0x9581, 0 };
+ short em[] = { 0xc2c9, 0xc785, 0x95c4, 0x8981, 0x95e2, 0xa8e2, 0 };
+ void _e(void) { char*s = (char*)em; s = (char*)ei; }
+ int main(void) { _a(); _e(); return 0; }
+EOF
+ ]
+ if test -f conftest.c
+ then
+ if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
+ && test -f conftest.o
+ then
+ if test `grep -l BIGenDianSyS conftest.o`
+ then
+ AC_MSG_RESULT("big endian")
+ ac_cv_c_bigendian=yes
+ fi
+ if test `grep -l LiTTleEnDian conftest.o`
+ then
+ AC_MSG_RESULT("little endian")
+ ac_cv_c_bigendian=no
+ fi
+ fi
+ fi
+ if test $ac_cv_c_bigendian = xunknown
+ then
+ AC_MSG_ERROR([Could not guess endianness, please use --with-words])
+ fi
+ dnl Now we know what to use for endianness, just put it in the header
+ if test $ac_cv_c_bigendian = yes
+ then
+ cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+ fi
+ ;;
+ esac
fi
dnl Check for system libs needed
])
AC_CHECK_FUNCS(vasprintf)
AC_CHECK_FUNCS(swab)
+AC_CHECK_FUNCS([memalign valloc])
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")
-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,
dnl Check for headers
AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
-AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h)
AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
dnl Check for ntohl, etc.
-CFLAGS="${save_CFLAGS} -Wall -Werror"
-AC_MSG_CHECKING([for ntohl in sys/param.h])
-AC_TRY_COMPILE([#include <sys/param.h>
-void foo() { int meuh; ntohl(meuh); }],,
- AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_CACHE_CHECK([for ntohl in sys/param.h],
+ [ac_cv_c_ntohl_sys_param_h],
+ [CFLAGS="${save_CFLAGS} -Wall -Werror"
+ AC_TRY_COMPILE([#include <sys/param.h>],
+ [void foo() { int meuh; ntohl(meuh); }],
+ ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)])
+if test x"$ac_cv_c_ntohl_sys_param_h" != x"no"; then
+ AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
+fi
dnl Check for inline function size limit
-CFLAGS="${save_CFLAGS} -finline-limit=31337"
-AC_MSG_CHECKING([if \$CC accepts -finline-limit])
-AC_TRY_COMPILE([],,
- save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
+AC_CACHE_CHECK([if \$CC accepts -finline-limit],
+ [ac_cv_c_inline_limit],
+ [CFLAGS="${save_CFLAGS} -finline-limit-30000"
+ AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)])
+if test x"$ac_cv_c_inline_limit" != x"no"; then
+ save_CFLAGS="${save_CFLAGS} -finline-limit-30000"
+fi
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_TRY_COMPILE([],,
- PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
+AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error],
+ [ac_cv_ld_darwin],
+ [CFLAGS="${save_CFLAGS} -bundle -undefined error"
+ AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
+if test x"$ac_cv_ld_darwin" != x"no"; then
+ PLCFLAGS="${PLCFLAGS} -bundle -undefined error"
+fi
dnl Check for standard plugin linking flags
-CFLAGS="${save_CFLAGS} -shared"
-AC_MSG_CHECKING([if \$CC compiles plugins with -shared])
-AC_TRY_COMPILE([],,
- PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
+AC_CACHE_CHECK([if \$CC accepts -shared],
+ [ac_cv_ld_plugins],
+ [CFLAGS="${save_CFLAGS} -shared"
+ AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
+if test x"$ac_cv_ld_plugins" != x"no"; then
+ PLCFLAGS="${PLCFLAGS} -shared"
+fi
+
+dnl Check for soname setting
+if test x"${SOFLAGS}" = x; then
+ AC_CACHE_CHECK([for soname setting],
+ [ac_cv_ld_soname],
+ [
+ # Standard
+ try_SOFLAGS="-Wl,-soname -Wl,"
+ LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+ AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}", [
+ # SunOS
+ try_SOFLAGS="-Wl,-h -Wl,"
+ LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+ AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}",
+ ac_cv_ld_soname=none)
+ ])])
+ if test x"$ac_cv_ld_soname" != x"none"; then
+ SOFLAGS=$ac_cv_ld_soname
+ else
+ echo "
+------------
+Your system doesn't seem to have support for dynamic linking. You may
+have problems using libdvdcss.
+------------
+"
+ fi
+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])
-AC_TRY_COMPILE([#include <sys/types.h>
-void quux() { boolean_t foo; }],,
- AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-AC_MSG_CHECKING([for boolean_t in pthread.h])
-AC_TRY_COMPILE([#include <pthread.h>
-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_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_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.)
+fi
+
+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_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.)
+fi
+
+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_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.)
+fi
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
AC_HEADER_TIME
-ARCH=${host_cpu}
+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 Accelerated modules
dnl
MMX_MODULES="yuvmmx idctmmx motionmmx"
-MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
-
-AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
-AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
+MMXEXT_MODULES="idctmmxext motionmmxext"
+THREEDNOW_MODULES="imdct3dn downmix3dn"
+SSE_MODULES="imdctsse downmixsse"
+ALTIVEC_MODULES="idctaltivec motionaltivec"
+
+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_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_MSG_RESULT(yes), AC_MSG_RESULT(no))
+fi
-AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
-AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
+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_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_MSG_RESULT(yes), AC_MSG_RESULT(no))
+fi
+
+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_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
+if test x"$ac_cv_3dnow_inline" != x"no"; then
+ 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_cv_sse_inline=yes, ac_cv_sse_inline=no)])
+if test x"$ac_cv_sse_inline" != x"no"; then
+ 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_cv_altivec_inline=yes,
+ [save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Wa,-m7400"
+ AC_TRY_COMPILE(,[void quux(){asm("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
+ ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+fi
+
+AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
+ [ac_cv_c_altivec],
+ [save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -faltivec"
+ # Darwin test
+ AC_TRY_COMPILE(,[void quux(){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_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"
+fi
+
+AC_CACHE_CHECK([if linker needs -framework vecLib],
+ [ac_cv_ld_altivec],
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -framework vecLib"
+ AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
+ LDFLAGS=$save_LDFLAGS
+ ])
+if test x"$ac_cv_ld_altivec" != x"no"; then
+ LIB_ALTIVEC="-framework vecLib"
+fi
dnl
dnl libdvdcss: check for DVD ioctls
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
dnl Check the operating system
dnl
-case ${host_os} in
+case ${target_os} in
+ bsdi*)
+ SYS=bsdi
+ ;;
darwin*)
SYS=darwin
;;
*)
- SYS=${host_os}
+ SYS=${target_os}
;;
esac
dnl
-dnl PentiumPro acceleration
+dnl Special arch tuning
dnl
-AC_ARG_ENABLE(ppro,
- [ --disable-ppro Disable PentiumPro optimizations (default enabled for x86)],
-[ if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi ],
-[ if test x${host_cpu} = xi686; then ARCH="${ARCH} ppro"; fi ])
+AC_ARG_WITH(tuning,
+[ --with-tuning=[arch] Enable special tuning for an architecture
+ (default i686 on IA-32 and 750 on PPC)])
+if test "x$withval" != "x"; then
+ TUNING=$withval
+else
+ if test x${target_cpu} = xi686; then TUNING="pentiumpro"
+ else
+ if test x${target_cpu} = xpowerpc; then TUNING="750"; fi
+ fi
+fi
dnl
dnl MMX acceleration
AC_ARG_ENABLE(mmx,
[ --disable-mmx Disable MMX optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH="${ARCH} mmx";
- BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
-[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86 -o x${host_cpu} = xi386; then ARCH="${ARCH} mmx";
- BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
+ BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
+[ if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386; then ARCH="${ARCH} mmx";
+ BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
dnl
dnl AltiVec acceleration
dnl
AC_ARG_ENABLE(altivec,
-[ --enable-altivec Enable altivec optimizations (default disabled since it is broken)],
-[ if test x$enableval = xyes; then ARCH="${ARCH} altivec"
- BUILTINS="${BUILTINS} idctaltivec"
- LIB_IDCTALTIVEC="-framework vecLib"
- fi ])
-#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ])
+[ --disable-altivec Disable altivec optimizations (default enabled on PPC)],
+[ if test x$enableval = xyes; then ARCH="${ARCH} altivec";
+ BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
+[ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
+ BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
dnl
dnl Debugging mode
[ --enable-debug Enable debug mode (default disabled)],
[ if test x$enableval = xyes; then DEBUG=1; fi ])
-dnl
-dnl Enable/disable statistics
-dnl
-STATS=0
-AC_ARG_ENABLE(stats,
-[ --enable-stats Enable printing of statistics (default disabled)],
-[ if test x$enableval = xyes; then STATS=1; fi ])
-
dnl
dnl Trace mode
dnl
[ if test x$enableval = xyes; then TRACE=1; fi ])
dnl
-dnl Trace mode
+dnl Profiling
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,
- [ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')],
+ [ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no',
+ or 'local-static', 'local-shared', or a path to
+ another libdvdcss such as '/usr/local'
+ (default 'local-static')],
[ case "x${withval}" in
xlocal-static|xyes)
# 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
dnl Darwin module
dnl
AC_ARG_ENABLE(darwin,
- [ --enable-darwin Darwin sound support (default disabled)],
+ [ --enable-darwin Darwin sound support (default enabled on MacOS X)],
[if test x$enable_darwin = xyes; then
PLUGINS="${PLUGINS} darwin"
LIB_DARWIN="-framework CoreAudio"
dnl MacOS X module
dnl
AC_ARG_ENABLE(macosx,
- [ --enable-macosx Mac OS X interface support (default enabled in Mac OS X)],
+ [ --enable-macosx MacOS X support (default enabled on MacOS X)],
[if test x$enable_macosx = xyes
then
- BUILTINS="${BUILTINS} macosx"
- LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
+ BUILTINS="${BUILTINS} macosx macosx_qt"
+ LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL -framework QuickTime"
LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
fi],
[AC_CHECK_HEADERS(Carbon/Carbon.h,
- BUILTINS="${BUILTINS} macosx"
- LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
+ BUILTINS="${BUILTINS} macosx macosx_qt"
+ LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL -framework QuickTime"
LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
)])
dnl QNX RTOS module
dnl
AC_ARG_ENABLE(qnx,
- [ --disable-qnx QNX RTOS support (default enabled in QNX RTOS)])
+ [ --disable-qnx QNX RTOS support (default enabled on QNX RTOS)])
if test x$enable_qnx != xno
then
AC_CHECK_HEADERS(Ph.h, [
[ --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
PLUGINS="${PLUGINS} sdl"
CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $CFLAGS_SDL"
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $CFLAGS_SDL"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
<${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
- [ echo "The development package for SDL is not installed. Please install it"
- echo "and try again. Alternatively you can also configure with --disable-sdl."
- exit 1 ])
- CFLAGS=$save_CFLAGS
+ [ AC_MSG_ERROR([The development package for SDL is not installed.
+Please install it and try again. Alternatively you can also configure with
+--disable-sdl.])
+ ])
+ CPPFLAGS=$save_CPPFLAGS
if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
then
- echo "You need SDL version 1.1.5 or later. Install it and try again."
- echo "Alternatively, you can also configure with --disable-sdl."
- exit 1
+ AC_MSG_ERROR([The development package for SDL is not installed.
+Please install it and try again. Alternatively you can also configure with
+--disable-sdl.])
fi
elif test "x$enable_sdl" = "xyes"
then
- echo "I couldn't find the SDL package. You can download libSDL from"
- echo "http://www.libsdl.org/, or configure with --disable-sdl. Have a"
- echo "nice day."
- exit 1
+ AC_MSG_ERROR([I couldn't find the SDL package. You can download libSDL
+from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
+ ])
fi
fi
LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
INCLUDE="${INCLUDE} -I"$withval"/include"
else
- AC_CHECK_HEADERS(directx.h, , [echo "Cannot find DirectX headers !"; exit])
+ AC_CHECK_HEADERS(directx.h, ,
+ AC_MSG_ERROR([Cannot find DirectX headers !])
+ )
LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"
fi
fi ])
AC_ARG_ENABLE(gnome,
[ --enable-gnome Gnome interface support (default disabled)],
[if test x$enable_gnome = xyes; then
- PLUGINS="${PLUGINS} gnome"
- ALIASES="${ALIASES} gnome-vlc"
- LIB_GNOME="`gnome-config --libs gnomeui | sed 's,-rdynamic,,'`"
- fi])
+ # look for gnome-config
+ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+ if test -x ${GNOME_CONFIG}
+ then
+ CFLAGS_GNOME="`${GNOME_CONFIG} --cflags gnomeui`"
+ LIB_GNOME="`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
+ fi
+ # now look for the gnome.h header
+ saved_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $CFLAGS_GNOME"
+ AC_CHECK_HEADERS(gnome.h, [
+ PLUGINS="${PLUGINS} gnome"
+ ALIASES="${ALIASES} gnome-vlc"
+ ],[
+ AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
+developement librairie or remove the --enable-gnome option])
+ ])
+
+ CPPFLAGS=$saved_CPPFLAGS
+ fi])
dnl
dnl Gtk+ module
dnl ALSA module
dnl
AC_ARG_ENABLE(alsa,
- [ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)],
+ [ --enable-alsa Alsa sound drivers support (Only for linux)
+ (default disabled)],
[if test x$enable_alsa = xyes
then
AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
dnl end of non-BeOS stuff
fi
+dnl
+dnl Plug-ins - this must be AT THE END
+dnl
+AC_ARG_ENABLE(plugins,
+ [ --disable-plugins Make all plug-ins built-in (default plug-ins enabled)],
+ [if test x$enable_plugins = xno
+ then
+ BUILTINS="${BUILTINS} ${PLUGINS}"
+ PLUGINS=
+ fi])
+
+
dnl
dnl Configuration is finished
dnl
AC_SUBST(DEFINE)
AC_SUBST(INCLUDE)
AC_SUBST(DEBUG)
-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(TUNING)
+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_ALTIVEC)
AC_SUBST(LIB_BEOS)
AC_SUBST(LIB_DARWIN)
AC_SUBST(LIB_DVD)
AC_SUBST(LIB_GLIDE)
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(LIB_YUV)
AC_SUBST(CFLAGS_VLC)
+AC_SUBST(CFLAGS_ALTIVEC)
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])
--------------------
system : ${SYS}
architecture : ${ARCH}
-optimizations : ${OPTIMS}"
+optimizations : ${OPTIMS}
+tuning: : ${TUNING}"
if test x${HAVE_VLC} = x1
then
-----------------
vlc version : ${VLC_VERSION}
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}
+plug-in modules :${PLUGINS}
vlc aliases :${ALIASES}"
fi
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