dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.4-cvs)
+AC_INIT(vlc,0.6.0-cvs)
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.4-cvs)
+AM_INIT_AUTOMAKE(vlc,0.6.0-cvs)
AM_CONFIG_HEADER(config.h)
dnl
LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd"
LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -ldvd"
LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd"
+ LDFLAGS_cdda="${LDFLAGS_cdda} -ldvd"
;;
x*bsd*)
SYS="${target_os}"
else
AC_CHECK_FUNCS(textdomain,,[
AC_CHECK_LIB(intl,textdomain,
- LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
- LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
+ LDFLAGS_vlc="${LDFLAGS_vlc} ${LIBINTL}"
+ LDFLAGS_plugins="${LDFLAGS_plugins} ${LIBINTL}",,
+ ${LIBINTL}
)
])
fi
PLUGINS="${PLUGINS} mux_ts_dvbpsi"
LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -ldvbpsi" ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
- [#include <stdint.h>
+ [#if defined( HAVE_STDINT_H )
+# include <stdint.h>
+#elif defined( HAVE_INTTYPES_H )
+# include <inttypes.h>
+#endif
#include <dvbpsi/dvbpsi.h>
#include <dvbpsi/descriptor.h>
#include <dvbpsi/pat.h>
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"
+ PLUGINS="${PLUGINS} vcd cdda"
],[
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"
+ PLUGINS="${PLUGINS} vcd cdda"
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"
+ PLUGINS="${PLUGINS} vcd cdda"
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"
then
- PLUGINS="${PLUGINS} vcd"
+ PLUGINS="${PLUGINS} vcd cdda"
fi
if test "x${SYS}" = "xdarwin"
then
- PLUGINS="${PLUGINS} vcd"
+ PLUGINS="${PLUGINS} vcd cdda"
LDFLAGS_vcd="${LDFLAGS_vcd} -framework IOKit -framework CoreFoundation"
+ LDFLAGS_cdda="${LDFLAGS_cdda} -framework IOKit -framework CoreFoundation"
fi
fi
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h postproc/postprocess.h)
AC_CHECK_LIB(avcodec, avcodec_init, [
- BUILTINS="${BUILTINS} ffmpeg stream_out_transcode encoder_ffmpeg"
+ BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lavcodec"
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
- BUILTINS="${BUILTINS} ffmpeg stream_out_transcode encoder_ffmpeg"
+ BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
fi
dnl Duplicate the ffmpeg CPPFLAGS and LDFLAGS for the encoder
- LDFLAGS_encoder_ffmpeg=${LDFLAGS_ffmpeg}
- CPPFLAGS_encoder_ffmpeg=${CPPFLAGS_ffmpeg}
+ CPPFLAGS_encoder_ffmpeg="${CPPFLAGS_ffmpeg}"
+ dnl XXX: we don't link with -lavcodec blah blah blah
+ #LDFLAGS_encoder_ffmpeg="${LDFLAGS_ffmpeg}"
dnl Add postprocessing modules
PLUGINS="${PLUGINS} postprocessing_c"
then
dnl Use a custom xvid
AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
- BUILTINS="${BUILTINS} xvid encoder_xvid"
+ BUILTINS="${BUILTINS} xvid"
LDFLAGS_xvid="${LDFLAGS_xvid} -L${real_xvid_tree}/build/generic -lxvidcore"
CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${real_xvid_tree}/src"
else
AC_CHECK_HEADERS(xvid.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
AC_CHECK_LIB(xvidcore, xvid_init, [
- PLUGINS="${PLUGINS} xvid encoder_xvid"
+ PLUGINS="${PLUGINS} xvid"
LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ],
[ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
LDFLAGS="${LDFLAGS_save}"
AC_CHECK_HEADERS(zlib.h, [
LDFLAGS_mp4="${LDFLAGS_mp4} -lz"
LDFLAGS_skins="${LDFLAGS_skins} -lz"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lz"
] )
dnl
AC_CHECK_HEADERS(libtar.h, [
LDFLAGS_skins="${LDFLAGS_skins} -ltar"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -ltar"
] )
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}])
fi
+ elif test "x${with_libmpeg2_prefix}" != "x"
+ then
+ # check for cross-compiling
+ AC_ARG_WITH(libmpeg2-prefix,
+ [ --with-libmpeg2-prefix=PATH path to installed libmpeg2 (needed for cross-compiling),
+ e.g use as:
+ --with-libmpeg2-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
+ if test "x${with_libmpeg2_prefix}" != "xno" -a "x${with_libmpeg2_prefix}" != "x"
+ then
+ AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_prefix})
+ AC_MSG_RESULT(${with_libmpeg2_prefix}/lib/libmpeg2.a)
+ PLUGINS="${PLUGINS} libmpeg2"
+ LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -L${with_libmpeg2_prefix}/lib -lmpeg2"
+ CFLAGS_libmpeg2="${CFLAGS_libmpeg2} -I${with_libmpeg2_prefix}/include"
+ fi
else
AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
AC_MSG_CHECKING(for libmpeg2 version >= 0.3.2)
dnl Skins module
dnl
AC_ARG_ENABLE(skins,
- [ --enable-skins Win32 skins module (default enabled on Win32)])
+ [ --enable-skins Skins interface module (default enabled on Win32)])
if test "x${enable_skins}" != "xno"; then
WXWINDOWS_PATH="${PATH}"
- AC_ARG_WITH(wx-config-path,
- [ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
- [ if test "x${with_wx_config_path}" != "xno"
+ AC_ARG_WITH(skins-wx-config-path,
+ [ --with-skins-wx-config-path=PATH wx-config path for the skins plugin (default search in \$PATH)],
+ [ if test "x${with_skins_wx_config_path}" != "xno"
then
- WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
+ WXWINDOWS_PATH="${with_skins_wx_config_path}:${PATH}"
fi ])
# look for wx-config
- AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
- if test "x${WX_CONFIG}" != "xno"
+ AC_PATH_PROG(WX_CONFIG_SKINS, wx-config, no, ${WXWINDOWS_PATH})
+ if test "x${WX_CONFIG_SKINS}" != "xno"
then
- if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+ if expr 2.3.0 \> `${WX_CONFIG_SKINS} --version` >/dev/null
then
AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-skins.])
fi
- CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG} --cxxflags`"
- LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG} --libs`"
+ CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS"
+ LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG_SKINS} --libs`"
fi
if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
if test "x${enable_skins}" = "xyes"; then
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
PLUGINS="${PLUGINS} skins"
- CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -Imodules/gui/skins/src -Imodules/gui/skins/gtk2 -Imodules/gui/skins/controls -Imodules/gui/skins/parser ${GTK2_CFLAGS} -DGTK2_SKINS"
+ CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins ${GTK2_CFLAGS} -DGTK2_SKINS"
LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ ${GTK2_LIBS}"
fi
fi
fi
+dnl
+dnl Basic skins module (i.e. without wxWindows dialogs)
+dnl
+AC_ARG_ENABLE(basic-skins,
+ [ --enable-basic-skins Skins interface module without wxWindows dialogs (default disabled)])
+if test "x${enable_basic_skins}" = "xyes"; then
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
+ PLUGINS="${PLUGINS} basic_skins"
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
+ else
+ PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+ PLUGINS="${PLUGINS} basic_skins"
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins ${GTK2_CFLAGS} -DGTK2_SKINS"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ ${GTK2_LIBS}"
+ fi
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -DBASIC_SKINS"
+fi
+
dnl
dnl Gtk+ module
dnl