VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
VLC_ADD_LIBS([filesystem], [-lshlwapi])
dnl
dnl DEP and ASLR options
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_wince"
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
+AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
AC_FUNC_STRCOLL
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([accept4 dup3 eventfd vmsplice sched_getaffinity])
+AC_CHECK_FUNCS([accept4 dup3 pipe2 eventfd vmsplice sched_getaffinity])
AH_BOTTOM([#include <vlc_fixups.h>])
CFLAGS_TUNING="-mtune=${with_tuning}"
fi
else
- if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then
+ if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then
CFLAGS_TUNING="-march=prescott -mtune=generic"
+ elif test "${SYS}" = "darwin" -a "${host_cpu}" = "x86_64"; then
+ CFLAGS_TUNING="-march=core2 -mtune=core2"
elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then
CFLAGS_TUNING="-mtune=pentium2"
elif test "${host_cpu}" = "x86_64"; then
#endif],
[AC_MSG_RESULT([yes])
AC_CHECK_HEADERS(matroska/KaxAttachments.h)
- VLC_ADD_CXXFLAGS([mkv],[-DEBML_STRICT_API])
+ VLC_ADD_CXXFLAGS([mkv],[])
if test "${SYS}" = "darwin"; then
VLC_ADD_CXXFLAGS([mkv],[-O1])
fi
AC_ARG_ENABLE(crystalhd,
[ --enable-crystalhd crystalhd codec plugin (default disabled)])
if test "${enable_crystalhd}" == "yes"; then
- AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [
+ AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [
VLC_ADD_PLUGIN([crystalhd])
VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
],[
AC_MSG_ERROR("Could not find CrystalHD development headers")
])
fi
- ])
+ ],[#define __LINUX_USER__
+ #include <libcrystalhd/bc_dts_types.h>
+ ])
fi
dnl
VLC_ADD_PLUGIN([access_realrtsp])
fi
-dnl
-dnl skins2 module
-dnl
-AC_ARG_ENABLE(libtar,
- [ --enable-libtar libtar support for skins2 (default enabled)])
-
-AS_IF([test "${enable_libtar}" != "no"],[
- AC_CHECK_HEADERS(libtar.h, [
- VLC_ADD_LIBS([skins2],[-ltar])
- ] )
-])
-
dnl
dnl A52/AC3 decoder plugin
dnl
VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation])
fi
-dnl
-dnl Roku HD1000 audio
-dnl
-AC_ARG_ENABLE(hd1000a,
- [ --enable-hd1000a HD1000 audio module (default enabled on HD1000)])
-if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" &&
- (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
- test "${enable_hd1000a}" = "yes")
-then
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [
- VLC_ADD_PLUGIN([hd1000a])
- AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ])
- AC_LANG_POP([C++])
-fi
-
dnl
dnl JACK modules
dnl
dnl
dnl UPnP Plugin (Intel SDK)
dnl
-PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
dnl
dnl Interface plugins
dnl
dnl Skins2 module
dnl
+AC_ARG_ENABLE(libtar,
+ [ --enable-libtar libtar support for skins2 (default auto)])
+AS_IF([test "${enable_libtar}" != "no"], [
+ AC_CHECK_HEADERS(libtar.h, [
+ VLC_ADD_LIBS([skins2],[-ltar])
+ ])
+])
+
AC_ARG_ENABLE(skins2,
[AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default
- enabled except on MacOSX and WinCE)])])
-if test "${enable_skins2}" != "no" ||
- (test "${SYS}" != "darwin" &&
- test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then
-
- dnl test for the required libraries
- skins2_missing_lib="no"
-
+ enabled except on MacOSX and WinCE)])],, [
+ AS_IF([test "${SYS}" != "darwin" && test "${SYS}" != "mingwce"], [
+ enable_skins2="yes"
+ ], [
+ enable_skins2="no"
+ ])
+])
+AS_IF([test "${enable_skins2}" = "yes"], [
dnl freetype
- if test "${have_freetype}" != "yes"; then
- skins2_missing_lib="yes"
- if test "${enable_skins2}" = "yes"; then
- AC_MSG_ERROR([Could not find freetype (required for skins2)])
- fi
- fi
+ AS_IF([test "${have_freetype}" != "yes"], [
+ AC_MSG_ERROR([Could not find FreeType (required for skins2)])
+ ])
- if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32"); then
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
+ AS_IF([test "${SYS}" = "mingw32"], [
VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32])
- else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
+ ], [test "${SYS}" = "darwin"], [
VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon])
- else if test "${skins2_missing_lib}" = "no"; then
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
- VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS])
+ ], [
+ PKG_CHECK_MODULES([XPM], [xpm])
+ PKG_CHECK_MODULES([XEXT], [xext])
+ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} {XPM_CFLAGS} -DX11_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
- VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lXpm -lX11])
+ VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11])
need_xid_provider="no"
- fi fi fi
-fi
-AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
- (test "${SYS}" != "darwin" &&
- test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
+
+ ])
+ VLC_ADD_PLUGIN([skins2])
+ ALIASES="${ALIASES} svlc"
+])
+AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
dnl
dnl Hildon UI
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
+ VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BWToolKit -Wl,-framework,BWToolKitFramework])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BWToolKit])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
dnl
dnl RemoteOSD plugin (VNC client as video filter)
dnl
-AC_ARG_ENABLE(remoteosd,
- [ --disable-remoteosd RemoteOSD plugin (default enabled)])
-
-AS_IF([test "${enable_remoteosd}" != "no"], [
- AS_IF([test "${have_libgcrypt}" = "yes"],[
- VLC_ADD_PLUGIN([remoteosd])
- VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
- VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
- ], [
- AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin])
- ])
+AC_MSG_CHECKING([whether to enable the RemoteOSD plugin])
+AS_IF([test "${have_libgcrypt}" = "yes"],[
+ AC_MSG_RESULT(yes)
+ VLC_ADD_PLUGIN([remoteosd])
+ VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
+ VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
+], [
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin])
])
dnl
dnl RAOP plugin
dnl
-AC_MSG_CHECKING([whether to enable RAOP plugin])
+AC_MSG_CHECKING([whether to enable the RAOP plugin])
AS_IF([test "${have_libgcrypt}" = "yes"], [
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([stream_out_raop])
projects / vlc / blobdiff