dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.0-cvs)
+AC_INIT(vlc,0.5.0)
CONFIGURE_LINE="$0 $*"
CODENAME="Natalya"
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.0-cvs)
+AM_INIT_AUTOMAKE(vlc,0.5.0)
AM_CONFIG_HEADER(config.h)
dnl
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
+dnl now otherwise it might be set in an obscure if statement.
+AC_EGREP_CPP(foo,foo)
+
dnl AC_PROG_OBJC doesn't seem to exist, this is the KDE workaround
AC_MSG_CHECKING(for an Objective-C compiler)
OBJC="${CXX}"
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOL(LD, ld, :)
-dnl
-dnl Gettext stuff
-dnl
-ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
-AM_GNU_GETTEXT_VERSION(0.10.40)
-AM_GNU_GETTEXT
-if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
- AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
- INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
-fi
-AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
-
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
;;
xdarwin*)
SYS=darwin
- CFLAGS_save="${CFLAGS_save} -no-cpp-precomp"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp"; OBJCFLAGS="${OBJCFLAGS_save}"
+ CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
+ CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -all_load"
+ LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load"
LIBEXT=".dylib"
;;
x*mingw32* | x*cygwin*)
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32"
LDFLAGS_access_mms="${LDFLAGS_access_mms} -lws2_32"
- LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lws2_32"
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32"
LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32"
LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
AM_CONDITIONAL(HAVE_DARWIN, test "x${SYS}" = "xdarwin")
AM_CONDITIONAL(HAVE_WIN32, test "x${SYS}" = "xmingw32")
+dnl
+dnl Gettext stuff
+dnl
+ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
+AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT
+if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
+ AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
+ INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
+else
+ AC_CHECK_FUNCS(textdomain,,[
+ AC_CHECK_LIB(intl,textdomain,
+ LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
+ LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
+ )
+ ])
+fi
+AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
+XGETTEXT="${XGETTEXT} --keyword=_NS"
+
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
[CFLAGS="${CFLAGS_save} -mms-bitfields"
AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, ac_cv_c_mms_bitfields=no)])
if test x"$ac_cv_c_mms_bitfields" != x"no"; then
- CFLAGS_mingw32_special="-mms-bitfields"
+ CFLAGS_save="${CFLAGS_save} -mms-bitfields";
+ CXXFLAGS_save="${CXXFLAGS_save} -mms-bitfields";
else
- CFLAGS_mingw32_special="-fnative-struct"
+ AC_CACHE_CHECK([if \$CC accepts -fnative-struct],
+ [ac_cv_c_fnative_struct],
+ [CFLAGS="${CFLAGS_save} -fnative-struct"
+ AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)])
+ if test x"$ac_cv_c_fnative_struct" != x"no"; then
+ CFLAGS_save="${CFLAGS_save} -fnative-struct";
+ CXXFLAGS_save="${CXXFLAGS_save} -fnative-struct";
+ fi
fi
- CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}";
- CXXFLAGS_save="${CXXFLAGS_save} ${CFLAGS_mingw32_special}";
CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi
AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll getenv putenv setenv)
dnl Check for usual libc functions
-AC_CHECK_FUNCS(strdup,,[need_libc=:])
-AC_CHECK_FUNCS(strndup,,[need_libc=:])
-AC_CHECK_FUNCS(atof,,[need_libc=:])
-AC_CHECK_FUNCS(lseek,,[need_libc=:])
-AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp,,[need_libc=:])])
-AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp,,[need_libc=:])])
-
-AM_CONDITIONAL(BUILD_LIBC, ${need_libc})
+AC_CHECK_FUNCS(strdup strndup atof lseek)
+AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
+AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
-AC_CHECK_FUNC(connect,,[
+AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket"
LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket"
)])
-AC_CHECK_FUNC(send,,[
+AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,
LDFLAGS_access_http="${LDFLAGS_access_http} -lsocket"
LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket"
- LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lsocket"
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket"
LDFLAGS_sap="${LDFLAGS_sap} -lsocket"
LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket"
)])
-AC_CHECK_FUNC(gethostbyname,,[
+AC_CHECK_FUNCS(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl",[
AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind")])
])
have_nanosleep=false
-AC_CHECK_FUNC(nanosleep,have_nanosleep=:,[
+AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
AC_CHECK_LIB(rt,nanosleep,
[LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:],
[AC_CHECK_LIB(posix4,nanosleep,
dnl HP/UX port
AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
-AC_CHECK_FUNC(inet_aton,,[
+AC_CHECK_FUNCS(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv")
])
-AC_CHECK_FUNC(textdomain,,[
- AC_CHECK_LIB(intl,textdomain,
- LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
- LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
- )
-])
dnl Check for getopt
need_getopt=false
-AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
+AC_CHECK_FUNCS(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) LDFLAGS_vlc="${LDFLAGS_vlc} -lgnugetopt"],
AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl")
AC_CHECK_LIB(m,cos,
LDFLAGS_imdct="${LDFLAGS_imdct} -lm"
- LDFLAGS_filter_distort="${LDFLAGS_filter_distort} -lm"
+ LDFLAGS_adjust="${LDFLAGS_adjust} -lm"
+ LDFLAGS_distort="${LDFLAGS_distort} -lm"
LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -lm")
AC_CHECK_LIB(m,pow,
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lm"
AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
fi
if test "x${THREAD_LIB}" = "xerror"; then
- AC_CHECK_FUNC(pthread_mutex_lock)
+ AC_CHECK_FUNCS(pthread_mutex_lock)
THREAD_LIB=""
fi
AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
dnl Check for misc headers
+AC_MSG_CHECKING(for pthread_cond_t in pthread.h)
AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
- Define if <pthread.h> defines pthread_cond_t.)])
+ Define if <pthread.h> defines pthread_cond_t.)],[
+ AC_MSG_RESULT(no)])
+
+AC_MSG_CHECKING(for pthread_once in pthread.h)
AC_EGREP_HEADER(pthread_once,pthread.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
- Define if <pthread.h> defines pthread_once.)])
+ Define if <pthread.h> defines pthread_once.)],[
+ AC_MSG_RESULT(no)])
+
+AC_MSG_CHECKING(for strncasecmp in strings.h)
AC_EGREP_HEADER(strncasecmp,strings.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
- Define if <strings.h> defines strncasecmp.)])
+ Define if <strings.h> defines strncasecmp.)],[
+ AC_MSG_RESULT(no)])
dnl Check for headers
AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent})
dnl Mac OS X and other OSes don't have declaration for nanosleep
+AC_MSG_CHECKING(for nanosleep in time.h)
AC_EGREP_HEADER(nanosleep,time.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_DECL_NANOSLEEP, 1,
Define if <time.h> defines nanosleep.)
+],[
+ AC_MSG_RESULT(no)
])
dnl Make sure we have timespecs
+AC_MSG_CHECKING(for timespec in sys/time.h)
AC_EGREP_HEADER(timespec,sys/time.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
Define if <sys/time.h> defines struct timespec.)
+],[
+ AC_MSG_RESULT(no)
])
dnl Check for threads library
NEED_GTK_MAIN=no
NEED_GNOME_MAIN=no
+dnl build the qte plugin ?
+NEED_QTE_MAIN=no
+
dnl Check for DPMS
if test "x${SYS}" != "xmingw32"
then
CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
AC_CHECK_HEADERS(X11/extensions/dpms.h, [
+ AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h)
AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(DPMSINFO_IN_DPMS_H, 1,
Define if <X11/extensions/dpms.h> defines DPMSInfo.)
+ ],[
+ AC_MSG_RESULT(no)
])
],,[
#include <X11/Xlib.h>
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
if test "x${ac_cv_c_o3}" != "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
-else
- AC_CACHE_CHECK([if \$CC accepts -O2],
- [ac_cv_c_o2],
- [CFLAGS="${CFLAGS_save} -O2"
- AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
- if test "x${ac_cv_c_o2}" != "xno"; then
+fi
+
+AC_CACHE_CHECK([if \$CC accepts -O2],
+ [ac_cv_c_o2],
+ [CFLAGS="${CFLAGS_save} -O2"
+ AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
+if test "x${ac_cv_c_o2}" != "xno"; then
+ if test "x${ac_cv_c_o3}" = "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
- else
- AC_CACHE_CHECK([if \$CC accepts -O],
- [ac_cv_c_o],
- [CFLAGS="${CFLAGS_save} -O"
- AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
- if test "x${ac_cv_c_o}" != "xno"; then
+ fi
+ CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
+else
+ AC_CACHE_CHECK([if \$CC accepts -O],
+ [ac_cv_c_o],
+ [CFLAGS="${CFLAGS_save} -O"
+ AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+ if test "x${ac_cv_c_o}" != "xno"; then
+ if test "x${ac_cv_c_o3}" = "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
- fi
+ fi
+ CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O"
fi
fi
dnl default modules
dnl
PLUGINS="${PLUGINS} dummy rc logger access_file memcpy"
-PLUGINS="${PLUGINS} es audio mpeg_system ps ts"
+PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts"
PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio"
-#PLUGINS="${PLUGINS} a52old imdct downmix"
+#PLUGINS="${PLUGINS} a52old imdct downmix imdct3dn downmix3dn imdctsse downmixsse"
PLUGINS="${PLUGINS} lpcm a52"
PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur"
PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u"
-PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm"
-PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap access_ftp"
+PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys"
+PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp"
+PLUGINS="${PLUGINS} sap"
dnl
dnl Accelerated modules
dnl
MMX_MODULES="memcpymmx idctmmx motionmmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx"
MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
-THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
-SSE_MODULES="imdctsse downmixsse"
+THREEDNOW_MODULES="memcpy3dn"
+SSE_MODULES=""
ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
if test "x${enable_sout}" != "xno"
then
PLUGINS="${PLUGINS} access_output_dummy access_output_udp access_output_file"
- PLUGINS="${PLUGINS} mux_ts mux_ps mux_dummy"
+ PLUGINS="${PLUGINS} mux_ts mux_ps mux_avi mux_dummy"
PLUGINS="${PLUGINS} packetizer_mpegaudio packetizer_mpegvideo packetizer_a52"
- PLUGINS="${PLUGINS} packetizer_mpeg4video packetizer_copy"
+ PLUGINS="${PLUGINS} packetizer_mpeg4video packetizer_mpeg4audio"
+ PLUGINS="${PLUGINS} packetizer_copy"
+
+ PLUGINS="${PLUGINS} vout_encoder"
fi
dnl Use a custom libdvdcss
AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a)
BUILTINS="${BUILTINS} dvd"
- LDFLAGS_dvd="${LDFLAGS_dvd} ${real_dvdcss_tree}/src/.libs/libdvdcss.a"
- LDFLAGS_dvdcss="${LDFLAGS_dvdcss} ${real_dvdcss_tree}/src/.libs/libdvdcss.a"
+ LDFLAGS_dvd="${LDFLAGS_dvd} -L${real_dvdcss_tree}/src/.libs -ldvdcss"
+ LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -L${real_dvdcss_tree}/src/.libs -ldvdcss"
CPPFLAGS_dvd="${CPPFLAGS_dvd} -I${real_dvdcss_tree}/src"
else
dnl The given libdvdcss wasn't built
dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
BUILTINS="${BUILTINS} dvdread"
- LDFLAGS_dvdread="${LDFLAGS_dvdread} ${real_dvdread_tree}/dvdread/.libs/libdvdread.a ${LDFLAGS_dvdcss}"
+ LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${real_dvdread_tree}"
else
dnl The given libdvdread wasn't built
dnl Use a custom libdvdplay
AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a)
BUILTINS="${BUILTINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${real_dvdplay_tree}/src/.libs/libdvdplay.a ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
+ LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src"
else
dnl The given libdvdplay wasn't built
fi
dnl
-dnl libdvbpsi ts demux
+dnl libdvbpsi ts demux/mux
dnl
AC_ARG_ENABLE(dvbpsi,
-[ --enable-dvbpsi dvbpsi ts demux module (default enabled)])
+[ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)])
if test "x${enable_dvbpsi}" != "xno"
then
AC_ARG_WITH(dvbpsi,
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ PLUGINS="${PLUGINS} ts_dvbpsi"
- LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ],
+ LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi"
+ PLUGINS="${PLUGINS} mux_ts_dvbpsi"
+ LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -ldvbpsi" ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#include <stdint.h>
#include <dvbpsi/dvbpsi.h>
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
BUILTINS="${BUILTINS} ts_dvbpsi"
- LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a"
+ LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -L${real_dvbpsi_tree}/src/.libs -ldvbpsi"
CPPFLAGS_ts_dvbpsi="${CPPFLAGS_ts_dvbpsi} -I${real_dvbpsi_tree}/src"
+
+ BUILTINS="${BUILTINS} mux_ts_dvbpsi"
+ LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -L${real_dvbpsi_tree}/src/.libs -ldvbpsi"
+ CPPFLAGS_mux_ts_dvbpsi="${CPPFLAGS_mux_ts_dvbpsi} -I${real_dvbpsi_tree}/src"
+
else
dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no)
PLUGINS="${PLUGINS} ts_dvbpsi"
LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} ${LDFLAGS_test} -ldvbpsi"
CPPFLAGS_ts_dvbpsi="${CPPFLAGS_ts_dvbpsi} ${CPPFLAGS_test}"
+ PLUGINS="${PLUGINS} mux_ts_dvbpsi"
+ LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} ${LDFLAGS_test} -ldvbpsi"
+ CPPFLAGS_mux_ts_dvbpsi="${CPPFLAGS_mux_ts_dvbpsi} ${CPPFLAGS_test}"
+
],[
if test "x${enable_dvbpsi}" != "x"
then
if test "x${enable_vcd}" != "xno"
then
+ AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h)
AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
+ AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} vcd"
+ ],[
+ AC_MSG_RESULT(no)
])
+ AC_MSG_CHECKING(for scsireq in sys/scsiio.h)
AC_EGREP_HEADER(scsireq,sys/scsiio.h,[
+ AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} vcd"
AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
+ ],[
+ AC_MSG_RESULT(no)
])
+ AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h)
AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
+ AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} vcd"
AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
+ ],[
+ AC_MSG_RESULT(no)
])
if test "x${SYS}" = "xbsdi" -o "x${SYS}" = "xmingw32"
if test "x${SYS}" != "xnto" && test "x${SYS}" != "xmingw32"
then
have_ipv6=false
- AC_CHECK_FUNC(inet_pton,[have_ipv6=:],[
+ AC_CHECK_FUNCS(inet_pton,[have_ipv6=:],[
AC_CHECK_LIB(resolv,inet_pton,
[have_ipv6=:
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lresolv"])
[ --with-mad=PATH path to libmad],[],[])
if test "x${with_mad}" != "xno" -a "x${with_mad}" != "x"
then
- CPPFLAGS_mad="${CPPFLAGS_mad} -I${with_mad}/include"
- LDFLAGS_mad="${LDFLAGS_mad} -L${with_mad}/lib"
+ CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${with_mad}/include"
+ LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${with_mad}/lib"
fi
AC_ARG_WITH(mad-tree,
if test -f ${real_mad_tree}/libmad/mad.h
then
AC_MSG_RESULT(yes)
- CPPFLAGS_mad="${CPPFLAGS_mad} -I${real_mad_tree}/libmad"
- LDFLAGS_mad="${LDFLAGS_mad} -L${real_mad_tree}/libmad/.libs"
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mad}"
+ CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${real_mad_tree}/libmad"
+ LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${real_mad_tree}/libmad/.libs"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}"
AC_CHECK_LIB(mad, mad_bit_init, [
- BUILTINS="${BUILTINS} mad"
- LDFLAGS_mad="${LDFLAGS_mad} -lmad"
+ BUILTINS="${BUILTINS} mpgatofixed32"
+ LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad"
],[ AC_MSG_ERROR([the specified tree hasn't been compiled ])
],[])
LDFLAGS="${LDFLAGS_save}"
AC_MSG_ERROR([the specified tree doesn't have mad.h])
fi
else
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mad}"
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mad}"
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mpgatofixed32}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}"
AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libmad...]) ])
AC_CHECK_LIB(mad, mad_bit_init, [
- PLUGINS="${PLUGINS} mad"
- LDFLAGS_mad="${LDFLAGS_mad} -lmad" ],
+ PLUGINS="${PLUGINS} mpgatofixed32"
+ LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad" ],
[ AC_MSG_ERROR([Cannot find libmad library...]) ])
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS="${LDFLAGS_save}"
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
BUILTINS="${BUILTINS} ffmpeg"
- LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} ${real_ffmpeg_tree}/libavcodec/libavcodec.a"
+ LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
else
dnl The given libavcodec wasn't built
dnl Use a custom faad
AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
BUILTINS="${BUILTINS} faad"
- LDFLAGS_faad="${LDFLAGS_faad} ${real_faad_tree}/libfaad/.libs/libfaad.a"
+ LDFLAGS_faad="${LDFLAGS_faad} -L${real_faad_tree}/libfaad/.libs -lfaad"
CPPFLAGS_faad="${CPPFLAGS_faad} -I${real_faad_tree}/include"
else
dnl The given libfaad wasn't built
dnl Use a custom xvid
AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
BUILTINS="${BUILTINS} xvid"
- LDFLAGS_xvid="${LDFLAGS_xvid} ${real_xvid_tree}/build/generic/libxvidcore.a"
+ LDFLAGS_xvid="${LDFLAGS_xvid} -L${real_xvid_tree}/build/generic -lxvidcore"
CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${real_xvid_tree}/src"
else
dnl The given libxvidcore wasn't built
LDFLAGS_test="-L${with_a52}/lib"
CPPFLAGS_test="-I${with_a52}/include"
fi
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test}"
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test} ${CPPFLAGS_a52tofloat32}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LDFLAGS_a52tofloat32}"
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
PLUGINS="${PLUGINS} a52tofloat32"
CPPFLAGS_qte="${CPPFLAGS_qte} -I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
fi
PLUGINS="${PLUGINS} qte"
+ NEED_QTE_MAIN=yes
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
then
PLUGINS="${PLUGINS} alsa"
LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl"
+ else
+ AC_MSG_ERROR([Could not find ALSA development headers])
fi
fi])
NEED_GTK_MAIN=yes
NEED_GNOME_MAIN=yes
ALIASES="${ALIASES} gnome-vlc"
+ dnl We need this because of some moronic gnomesupport.h flavours
+ AC_MSG_CHECKING(for strndup in gnome.h)
+ AC_EGREP_HEADER(strndup,gnome.h,[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(STRNDUP_IN_GNOME_H, 1,
+ Define if <gnome.h> defines strndup.)],[
+ AC_MSG_RESULT(no)])
],[
AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
developement tools or remove the --enable-gnome option])
CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cxxflags`"
LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`"
# now look for the wxprec.h header
- CPPFLAGS="${save_CPPFLAGS} ${CXXFLAGS_wxwindows}"
+ CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwindows}"
ac_cv_wx_headers=yes
AC_CHECK_HEADERS(wx/wxprec.h, , [
ac_cv_wx_headers=no
PLUGINS="${PLUGINS} wxwindows"
ALIASES="${ALIASES} wxvlc"
fi
- CPPFLAGS="${save_CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS_save}"
fi
fi
CPPFLAGS="${CPPFLAGS_save}"
PLUGINS="${PLUGINS} opie"
+ NEED_QTE_MAIN=yes
LDFLAGS_opie="${LDFLAGS_opie} -lqpe ${LDFLAGS_qte}"
CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_qte}"
if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
[ --enable-intfwin Win32 interface support (default disabled)],
[ if test "x${enable_intfwin}" != "xno"
then
- AC_ARG_WITH(bcbuilder,
- [ --with-bcbuilder=PATH Borland C++ Builder installation path])
- if test "x${with_bcbuilder}" != "x"
- then
- BCBUILDER="${with_bcbuilder}"
- fi
+ AC_CHECK_TOOL(BPR2MAK, bpr2mak, AC_ERROR(bpr2mak not found))
+ AC_CHECK_TOOL(BCMAKE, bcmake, AC_ERROR(bcmake not found))
PLUGINS="${PLUGINS} win32"
fi ])
if test "x${enable_xosd}" = "xyes"
then
AC_CHECK_HEADER(xosd.h, have_xosd="true", have_xosd="false")
- AC_TRY_COMPILE([#include <xosd.h>],
- [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
- AC_DEFINE(HAVE_OLD_XOSD_H, 1, Define if <xosd.h> is pre-1.0.0))
+ AC_CHECK_LIB(xosd,xosd_set_offset,
+ AC_DEFINE(HAVE_XOSD_VERSION_1, 1, Define if <xosd.h> is 1.0.x),
+ AC_CHECK_LIB(xosd,xosd_set_horizontal_offset,
+ AC_DEFINE(HAVE_XOSD_VERSION_2, 1, Define if <xosd.h> is 2.0.x),
+ AC_TRY_COMPILE([#include <xosd.h>],
+ [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
+ AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if <xosd.h> is pre-1.0.0))))
if test "x${have_xosd}" = "xtrue"
then
PLUGINS="${PLUGINS} xosd"
fi
fi
+dnl
+dnl SLP access plugin
+dnl
+AC_ARG_ENABLE(slp,
+ [ --enable-slp SLP service discovery support (default enabled)])
+if test "x${enable_slp}" != "xno"
+then
+ AC_ARG_WITH(slp,
+ [ --with-slp=PATH libslp headers and libraries])
+ if test "x${with_slp}" = x
+ then
+ AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false")
+ if test "x${have_slp}" = "xtrue"
+ then
+ PLUGINS="${PLUGINS} slp"
+ LDFLAGS_slp="${LDFLAGS_slp} -lslp"
+ fi
+ else
+ AC_MSG_CHECKING(for slp headers in ${with_slp})
+ if test -f ${with_slp}/slp.h
+ then
+ dnl Use ${with_slp}/libslp/slp.h
+ AC_MSG_RESULT(yes)
+ PLUGINS="${PLUGINS} slp"
+ LDFLAGS_slp="${LDFLAGS_slp} -L${with_slp} -lslp"
+ CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}"
+ else
+ dnl No libslp could be found, sorry
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${with_slp}/slp.h])
+ fi
+ fi
+fi
+
dnl
dnl Lirc plugin
dnl
[ --enable-pth GNU Pth support (default disabled)],
[ if test "x${enable_pth}" = "xyes"; then
AC_CHECK_LIB(pth,pth_init)
+ AC_MSG_CHECKING(for pth_init in pth.h)
AC_EGREP_HEADER(pth_init,pth.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
Define if <pth.h> defines pth_init)
- THREAD_LIB="-lpth"
- fi])
+ THREAD_LIB="-lpth"
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ fi
])
dnl
[ --enable-st State Threads (default disabled)],
[ if test "x${enable_st}" = "xyes"; then
AC_CHECK_LIB(st,st_init)
+ AC_MSG_CHECKING(for st_init in st.h)
AC_EGREP_HEADER(st_init,st.h,[
+ AC_MSG_RESULT(yes)
AC_DEFINE(ST_INIT_IN_ST_H, 1,
Define if <st.h> defines st_init)
- THREAD_LIB="-lst"
- fi])
+ THREAD_LIB="-lst"
+ ],[
+ AC_MSG_RESULT(yes)
+ ])
+ fi
])
if test "x${SYS}" != "xmingw32"; then
LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}"
fi
+dnl
+dnl qte_main plugin
+dnl
+if test "x${NEED_QTE_MAIN}" != "xno"
+then
+ PLUGINS="${PLUGINS} qte_main"
+ CPPFLAGS_qte="${CPPFLAGS_qte} -DNEED_QTE_MAIN"
+ CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN"
+ CPPFLAGS_qte_main="${CFLAGS_qte_main} ${CPPFLAGS_qte}"
+ LDFLAGS_qte_main="${LDFLAGS_qte_main} ${LDFLAGS_qte}"
+fi
+
+
dnl
dnl Plugin and builtin checks
dnl
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2002 VideoLAN", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
-VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
+VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-/__/'`"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
AC_SUBST(ASM)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
-AC_SUBST(BCBUILDER)
AC_SUBST(XPIDL)
AC_SUBST(LIBEXT)
AC_SUBST(INCLUDES)
AC_SUBST(CFLAGS_TUNING)
AC_SUBST(CFLAGS_OPTIM)
AC_SUBST(CFLAGS_OPTIM_NODEBUG)
+AC_SUBST(CFLAGS_NOOPTIM)
AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS_vlc)
projects / vlc / blobdiff