if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
+ VLC_ADD_CPPFLAGS([vlc],[-Dmain(a,b)=maince(a,b)])
VLC_ADD_LDFLAGS([vlc],[-lws2 -e WinMainCRTStartup])
VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2])
fi
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="bn da de el en_GB es fr hi hu it ja my nl no pl ps pt_BR ru sv tet tl"
+ALL_LINGUAS="bn da de el en_GB es fr hi hu it ja my ne nl no pl ps pt_BR ru sv tet tl"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
fi
dnl Check for hal
-PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
- [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
- VLC_ADD_PLUGINS([hal])
- VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
- VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
- [AC_MSG_WARN(HAL library not found)])
+AC_ARG_ENABLE(hal,
+ [ --enable-hal Linux HAL services discovery (default enabled)])
+
+if test "${enable_hal}" != "no"
+then
+ PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
+ [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
+ VLC_ADD_PLUGINS([hal])
+ VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
+ VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
+ [AC_MSG_WARN(HAL library not found)])
+fi
dnl Build the gtk_main plugins?
NEED_GTK_MAIN=no
VLC_ADD_PLUGINS([dummy logger memcpy])
VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg demuxdump])
VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak])
-VLC_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur motiondetect])
-VLC_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32 audio_format])
-VLC_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
-VLC_ADD_PLUGINS([trivial_channel_mixer simple_channel_mixer headphone_channel_mixer normvol])
-VLC_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
-VLC_ADD_PLUGINS([aout_file equalizer])
-VLC_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform distort clone crop motionblur])
+VLC_ADD_PLUGINS([fixed32tofloat32 fixed32tos16 s16tofixed32 u8tofixed32])
+VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
+VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag])
-VLC_ADD_PLUGINS([rawvideo blend scale image logo])
+VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au])
-VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http access_mms])
-VLC_ADD_PLUGINS([access_ftp ipv4])
+VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
+VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4])
if test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGINS([access_directory sap http])
- VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq])
+ VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq sap])
+ VLC_ADD_PLUGINS([picture mosaic wall motiondetect])
+ VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
+ VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
+ VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])
+ VLC_ADD_PLUGINS([headphone_channel_mixer normvol equalizer])
+ VLC_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif s16tofloat32 s16tofloat32swab s8tofloat32 u8tofloat32 audio_format])
fi
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([screensaver])
elif test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGINS([ntservice smb dmo])
+ VLC_ADD_PLUGINS([ntservice access_smb dmo])
VLC_ADD_LDFLAGS([dmo],[-lole32])
fi
VLC_ADD_BUILTINS([${ACCEL_MODULES}])
fi
+dnl
+dnl Memory usage
+dnl
+AC_ARG_ENABLE(optimize-memory,
+[ --enable-optimize-memory optimize memory usage over performance])
+if test "${enable_optimize_memory}" = "yes"; then
+ AC_DEFINE(OPTIMIZE_MEMORY, 1, Define if you want to optimize memory usage over performance)
+fi
+
dnl
dnl Enable/disable optimizations
dnl
[ --enable-httpd HTTP daemon (default enabled)])
if test "${enable_httpd}" != "no"
then
+ VLC_ADD_PLUGINS([http])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
dnl TLS/SSL
dnl
AC_ARG_ENABLE(gnutls,
- [ --enable-gnutls gnutls TLS/SSL support (default disabled)])
-AS_IF([test "${enable_gnutls}" == "yes"], VLC_ADD_PLUGINS([gnutls]))
+ [ --enable-gnutls gnutls TLS/SSL support (default enabled)])
+AS_IF([test "${enable_gnutls}" != "no"], [
+
+ gcrypt_LIBS="-lgpg-error"
+ AS_IF([test "${SYS}" = "mingw32"],
+ [gcrypt_LIBS="${gcrypt_LIBS} -lws2_32"
+ VLC_ADD_LDFLAGS([gnutls],[-lws2_32])]
+ )
+
+ gnutls_LIBS="-lgcrypt ${gcrypt_LIBS}"
+
+ AC_CHECK_HEADER(gcrypt.h,
+ [AC_CHECK_LIB(gcrypt, gcry_control,
+ [AC_CHECK_HEADER(gnutls/gnutls.h,
+ [AC_CHECK_LIB(gnutls, gnutls_deinit,
+ [have_gnutls="yes"],, ${gnutls_LIBS})])],,
+ ${gcrypt_LIBS})])
+
+ AS_IF([test "${have_gnutls}" = "yes"], [
+ VLC_ADD_PLUGINS([gnutls])
+ VLC_ADD_LDFLAGS([gnutls], [-lgnutls -lgcrypt -lgpg-error])
+ ], [
+ AS_IF([test "${enable_gnutls}" = "yes"], [
+ AC_MSG_ERROR([gnutls/gcrypt TLS/SSL support cannot be compiled])]
+ )]
+ )]
+)
dnl
AC_CHECK_HEADERS(dshow.h,
[ VLC_ADD_PLUGINS([dshow])
VLC_ADD_CXXFLAGS([dshow],[])
- VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ])
+ VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32 -luuid]) ])
fi
fi
if test -z "${with_dvbpsi_tree}"
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
- [ VLC_ADD_PLUGINS([mux_ts ts])
+ [ VLC_ADD_PLUGINS([ts])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_BUILTINS([mux_ts])
+ fi
VLC_ADD_LDFLAGS([mux_ts ts dvb],[-ldvbpsi]) ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#if defined( HAVE_STDINT_H )
then
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
- VLC_ADD_BUILTINS([mux_ts ts])
+ VLC_ADD_BUILTINS([ts])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_BUILTINS([mux_ts])
+ fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src])
VLC_ADD_LDFLAGS([mux_ts ts dvb],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
else
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
AC_CHECK_HEADERS([dvbpsi/dr.h],[
- VLC_ADD_PLUGINS([mux_ts ts])
+ VLC_ADD_PLUGINS([ts])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_PLUGINS([mux_ts])
+ fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
VLC_ADD_LDFLAGS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
VLC_ADD_LDFLAGS([wingdi],[-lgdi32])
fi
if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGINS([wingdi])
+ VLC_ADD_PLUGINS([wingdi wingapi])
fi
fi
VLC_ADD_PLUGINS([waveout])
VLC_ADD_LDFLAGS([waveout],[-lwinmm])
fi
- if "${SYS}" = "mingwce"; then
+ if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGINS([waveout])
fi
fi
dnl WinCE GUI module
dnl
if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGINS([wince])
- VLC_ADD_CXXFLAGS([wxwindows],[])
+ VLC_ADD_BUILTINS([wince])
+ VLC_ADD_CXXFLAGS([wince],[])
VLC_ADD_LDFLAGS([wince],[-lcommctrl -lcommdlg -laygshell])
+ dnl Gross hack
+ VLC_ADD_LDFLAGS([wince],[modules/gui/wince/wince_rc.o])
fi
dnl
AC_ARG_WITH(,[Misc options:])
-dnl
-dnl GnuTLS-based TLS/SSL support
-dnl
-AC_ARG_WITH(libgnutls-prefix,
- [ --with-libgnutls-prefix=PREFIX set prefix where libgnutls is installed],
- libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-
-AS_IF([test x$libgnutls_config_prefix != x],
- AS_IF([test x${LIBGNUTLS_CONFIG+set} != xset],
- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
- )
-)
-
-if test "x$enable_gnutls" == "xyes"; then
- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
- no_libgnutls=""
-
- AC_MSG_CHECKING(for libgnutls - version >= 1.0.0)
- AS_IF([test "$LIBGNUTLS_CONFIG" = "no"],
- no_libgnutls=yes
- ,
- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
- )
-
- AS_IF([test "x$no_libgnutls" = x],
- AC_MSG_RESULT(yes)
- VLC_ADD_CFLAGS([gnutls], [$LIBGNUTLS_CFLAGS])
- VLC_ADD_LDFLAGS([gnutls], [$LIBGNUTLS_LIBS])
- AC_DEFINE(HAVE_GNUTLS, 1, Define to 1 if you have libgnutls)
- ,
- AC_MSG_RESULT(no)
- LIBGNUTLS_CFLAGS=""
- LIBGNUTLS_LIBS=""
- AC_MSG_ERROR(gnutls TLS/SSL support cannot be compiled)
- )
-fi
-
dnl
dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling
dnl
then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then
- AC_CHECK_PROG(MIDL, midl, :)
+ AC_CHECK_PROGS(MIDL, [midl widl], no)
AC_CHECK_HEADERS(ole2.h olectl.h,
[ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
- VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid])
+ VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi])
AC_CHECK_HEADERS(objsafe.h,
VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER])
)
fi
fi
AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
-AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
+AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
AM_CONDITIONAL(BUILD_ACTIVEX,${activex})
dnl
projects / vlc / blobdiff