CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
AX_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
- AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet],[-lws2_32])
+ AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet netsync],[-lws2_32])
fi
;;
*nto*)
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_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
dnl Check for setlocal and langinfo
AC_CHECK_FUNCS(setlocale)
fi
dnl Check for various optimization flags
+AC_CACHE_CHECK([if \$CC accepts -Os],
+ [ac_cv_c_os],
+ [CFLAGS="${CFLAGS_save} -Os"
+ AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)])
+if test "${ac_cv_c_os}" != "no" -a "${target_cpu}" = "mipsel"; then
+ CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os"
+fi
+
AC_CACHE_CHECK([if \$CC accepts -O3],
[ac_cv_c_o3],
[CFLAGS="${CFLAGS_save} -O3"
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
-if test "${ac_cv_c_o3}" != "no"; then
+if test "${ac_cv_c_o3}" != "no" -a "${target_cpu}" != "mipsel"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
fi
[ac_cv_c_o2],
[CFLAGS="${CFLAGS_save} -O2"
AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
-if test "${ac_cv_c_o2}" != "no"; then
+if test "${ac_cv_c_o2}" != "no" -a "${target_cpu}" != "mipsel"; then
if test "${ac_cv_c_o3}" = "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
fi
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
-else
+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 "${ac_cv_c_o}" != "no"; then
+ if test "${ac_cv_c_o}" != "no" -a "${target_cpu}" != "mipsel"; then
if test "${ac_cv_c_o3}" = "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
fi
dnl
dnl default modules
dnl
-AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys])
-AX_ADD_PLUGINS([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff mjpeg])
+AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
+AX_ADD_PLUGINS([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts_old avi asf aac mp4 rawdv demux2 nsv real aiff mjpeg])
AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
AX_ADD_PLUGINS([id3 m3u playlist export sgimb])
AX_ADD_PLUGINS([rawvideo])
AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au])
-AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
+AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms access2])
AX_ADD_PLUGINS([access_ftp access_directory sap http])
dnl
if test "${enable_sout}" != "no"
then
AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
- AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
+ AX_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
AX_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
AX_ADD_PLUGINS([packetizer_copy])
if test -z "${with_dvbpsi_tree}"
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
- [ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2])
- AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-ldvbpsi]) ],
+ [ AX_ADD_PLUGINS([ts_old_dvbpsi mux_ts ts])
+ AX_ADD_LDFLAGS([ts_old_dvbpsi mux_ts ts],[-ldvbpsi]) ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#if defined( HAVE_STDINT_H )
# include <stdint.h>
then
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
- AX_ADD_BUILTINS([ts_dvbpsi mux_ts_dvbpsi ts2])
- AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-I${real_dvbpsi_tree}/src])
- AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
+ AX_ADD_BUILTINS([ts_old_dvbpsi mux_ts ts])
+ AX_ADD_CPPFLAGS([ts_old_dvbpsi mux_ts ts],[-I${real_dvbpsi_tree}/src])
+ AX_ADD_LDFLAGS([ts_old_dvbpsi mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
else
dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no)
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
AC_CHECK_HEADERS([dvbpsi/dr.h],[
- AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2])
- AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${CPPFLAGS_test}])
- AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${LDFLAGS_test} -ldvbpsi])
+ AX_ADD_PLUGINS([ts_old_dvbpsi mux_ts ts])
+ AX_ADD_CPPFLAGS([ts_old_dvbpsi mux_ts ts],[${CPPFLAGS_test}])
+ AX_ADD_LDFLAGS([ts_old_dvbpsi mux_ts ts],[${LDFLAGS_test} -ldvbpsi])
],[
if test -n "${enable_dvbpsi}"
AX_ADD_LDFLAGS([logo],[-lpng -lz])
AX_ADD_PLUGINS([logo])
AX_ADD_LDFLAGS([svcdsub],[-lpng -lz])
- AX_ADD_LDFLAGS([cvdsub],[-lpng -lz])
+ AX_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm])
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])])
dnl
fi
fi
+dnl
+dnl SVG module
+dnl
+AC_ARG_ENABLE(svg,
+ [ --enable-svg SVG support (default disabled)])
+if test "${enable_svg}" == "yes"
+then
+ PKG_CHECK_MODULES(SVG,
+ librsvg-2.0 >= 2.5.0,
+ [
+ AX_ADD_LDFLAGS([svg],[$SVG_LIBS])
+ AX_ADD_CFLAGS([svg],[$SVG_CFLAGS])
+ AX_ADD_PLUGINS([svg]) ],
+ [AC_MSG_WARN(SVG library not found)])
+fi
+
dnl
dnl Qt Embedded module
dnl (disabled by default)
dnl Roku HD1000 Video output module
dnl
AC_ARG_ENABLE(hd1000v,
- [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1 000)])
+ [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1000)])
if test "${enable_hd1000v}" != "no" &&
(test "${SYS}" != "mingw32" || test "${enable_hd1000v}" = "yes")
then
if test "$can_build_roku" = "yes"
then
AX_ADD_PLUGINS([hd1000v])
- AX_ADD_LDFLAGS([hd1000v],[-lCascade])
+ AX_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad])
fi
AC_LANG_POP([C++])
fi
dnl PDA Gtk+2 module
dnl
AC_ARG_ENABLE(pda,
- [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
+ [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
if test "x${enable_pda}" = "xyes"
then
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
)
fi
-
dnl
dnl corba (ORBit) plugin
dnl
+dnl Default: do not enable corba
+enablecorba=false
AC_ARG_ENABLE(corba,
[ --enable-corba corba interface support (default disabled)])
if test "${enable_corba}" = "yes"; then
- ORBIT_PATH="${PATH}"
- AC_ARG_WITH(orbit-config-path,
- [ --with-orbit-config-path=PATH orbit-config path (default search in \$PATH)])
- if test "${with_orbit_config_path}" != "no"; then
- ORBIT_PATH="${with_orbit_config_path}:${PATH}"
- fi
- # look for orbit2-config
- AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no, ${ORBIT_PATH})
- if test "${ORBIT_CONFIG}" != "no"; then
- AX_ADD_CFLAGS(corba,[`${ORBIT_CONFIG} --cflags server`])
- AX_ADD_LDFLAGS(corba,[`${ORBIT_CONFIG} --libs server | sed 's,-rdynamic,,'`])
- # now look for the orbit.h header
- CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_corba}"
- ac_cv_corba_headers=yes
- AC_CHECK_HEADERS(orbit/orbit.h, , [
- ac_cv_corba_headers=no
- AC_MSG_ERROR([Could not find corba development headers])
- ])
- if test "${ac_cv_corba_headers}" = "yes"; then
- AX_ADD_PLUGINS(corba)
- fi
- CPPFLAGS="${CPPFLAGS_save}"
- fi
-fi
+ GLIB_VERSION=2.3.2
+ PKG_CHECK_MODULES(CORBA,
+ ORBit-2.0 >= 2.8.0 \
+ glib-2.0 >= $GLIB_VERSION \
+ gobject-2.0 >= $GLIB_VERSION \
+ gthread-2.0 >= $GLIB_VERSION,
+ [
+ enablecorba=true
+ AX_ADD_LDFLAGS([corba],[$CORBA_LIBS])
+ AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS])
+ AX_ADD_PLUGINS([corba snapshot]) ],
+ [ enablecorba=false
+ AC_MSG_WARN(corba library not found) ])
+fi
+AM_CONDITIONAL(ENABLE_CORBA, test x$enablecorba = xtrue)
AC_ARG_WITH(,[Misc options:])
modules/gui/gtk2/Makefile
modules/gui/kde/Makefile
modules/gui/macosx/Makefile
- modules/gui/ncurses/Makefile
modules/gui/qnx/Makefile
modules/gui/qt/Makefile
modules/gui/skins/Makefile
projects / vlc / blobdiff