;;
*mingw32*)
SYS=mingw32
- AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
+ AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows XP APIs.])
;;
*cygwin*)
dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler.
- AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
+ AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.])
AC_EGREP_CPP(yes,
[#ifdef WIN32
yes
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_rtp remoteosd ts oldtelnet 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_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
fi
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
+AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy 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 vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([accept4 dup3 eventfd fstatfs vmsplice])
+AC_CHECK_FUNCS([accept4 dup3 eventfd fstatfs vmsplice sched_getaffinity])
AH_BOTTOM([#include <vlc_fixups.h>])
dnl -lnsl and -lsocket are needed on Solaris;
dnl we purposedly make the test fail on Windows
LIBS_save="${LIBS}"
-AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.])
-AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${SOCKET_LIBS}])
-
-dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro
-dnl are
-LIBS="${LIBS_gai}"
-AC_CHECK_FUNCS([getnameinfo gai_strerror])
+AC_SEARCH_LIBS([getaddrinfo], [nsl],,, [${SOCKET_LIBS}])
LIBS="${LIBS_save}"
-AH_TEMPLATE(HAVE_ADDRINFO, [Define to 1 if <netdb.h> defines `struct addrinfo'.])
-AC_CHECK_TYPES([struct addrinfo],[AC_DEFINE(HAVE_ADDRINFO)],,
-[#include <sys/types.h>
-#if defined( WIN32 ) || defined( UNDER_CE )
-# if defined(UNDER_CE) && defined(sockaddr_storage)
-# undef sockaddr_storage
-# endif
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#else
-# include <netdb.h>
-#endif])
-
dnl Check for va_copy
AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
AC_TRY_LINK(
VLC_ADD_PLUGIN([dvdnav])
VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`])
VLC_ADD_LIBS([dvdnav],[`${DVDNAV_CONFIG} --libs`])
+ AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution,
+ AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]),
+ [], [${LIBS_dvdnav}])
fi
fi
AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- PKG_CHECK_MODULES(X264,x264 >= 0.76, [
+ PKG_CHECK_MODULES(X264,x264 >= 0.86, [
VLC_ADD_PLUGIN([x264])
VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
fi
],[
if test "${enable_x264}" = "yes"; then
- AC_MSG_ERROR([Could not find libx264 >= 0.76 on your system: you may get it from http://www.videolan.org/x264.html])
+ AC_MSG_ERROR([Could not find libx264 >= 0.86 on your system: you may get it from http://www.videolan.org/x264.html])
fi
])
LDFLAGS="${LDFLAGS_save}"
[ --enable-sdl-image SDL image support (default enabled)])
if test "${enable_sdl}" != "no"
then
- SDL_PATH="${PATH}"
- AC_ARG_WITH(sdl-config-path,
- [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
- [ if test "${with_sdl_config_path}" != "no"
- then
- SDL_PATH="${with_sdl_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
- SDL_HEADER="SDL.h"
- SDL_IMAGE="SDL_image.h"
-
- if test "${SDL_CONFIG}" != "no"; then
- PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
- # SDL on Darwin is heavily patched and can only run SDL_image
- if test "${SYS}" != "darwin"; then
- VLC_ADD_PLUGIN([vout_sdl aout_sdl])
- fi
- VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags`])
- VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`])
-
- # SDL_image
- AS_IF([ test "${enable_sdl_image}" != "no"],[
- AC_CHECK_HEADERS("SDL_image.h", [
- VLC_ADD_PLUGIN([sdl_image])
- AC_CHECK_LIB(png, png_set_rows, [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz])
- AC_CHECK_LIB(jpeg, jpeg_start_decompress, [VLC_ADD_LIBS([sdl_image],[-ljpeg])])
- AC_CHECK_LIB(tiff, TIFFClientOpen, [VLC_ADD_LIBS([sdl_image],[-ltiff])])
- VLC_ADD_LIBS([sdl_image], [-lSDL_image])],
- [ AC_MSG_WARN([The development package for SDL_image is not installed.
- You should install it alongside your SDL package.])
- ])
- ])
- ],[
- AC_MSG_ERROR([The development package for SDL is too old. You need 1.2.10.
- Alternatively you can also configure with --disable-sdl.])
- ])
- else if test "${enable_sdl}" = "yes"; then
- AC_MSG_ERROR([I could not find the SDL package. You can download libSDL
-from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
- ])
+ PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
+ # SDL on Darwin is heavily patched and can only run SDL_image
+ if test "${SYS}" != "darwin"; then
+ VLC_ADD_PLUGIN([vout_sdl aout_sdl])
fi
- fi
+ VLC_ADD_CFLAGS([vout_sdl aout_sdl],[${SDL_CFLAGS}])
+ VLC_ADD_LIBS([vout_sdl aout_sdl],[${SDL_LIBS}])
+
+ # SDL_image
+ AS_IF([ test "${enable_sdl_image}" != "no"],[
+ PKG_CHECK_MODULES(SDL_IMAGE, [SDL_image >= 1.2.10], [
+ VLC_ADD_PLUGIN([sdl_image])
+ VLC_ADD_LIBS([sdl_image],[${SDL_IMAGE_LIBS}])
+ VLC_ADD_CFLAGS([sdl_image], [${SDL_IMAGE_CFLAGS}])],
+ [ AC_MSG_WARN([The development package for SDL_image is not installed.
+ You should install it alongside your SDL package.])
+ ])
+ ])
+ ],[
+ AC_MSG_WARN([The development package for SDL is not present or too old.
+ You need 1.2.10. Alternatively you can also configure with
+ --disable-sdl.])
+ ])
fi
dnl
dnl
dnl Pulseaudio module
dnl
-PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
-VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
+AS_IF([test "${no_x}" = "yes"], [
+ AS_IF([test "${enable_pulse}" = "yes"], [
+ AC_MSG_ERROR([Xlib is required for VLC PulseAudio support
+(see http://www.pulseaudio.org/ticket/799 for further reference).])
+ ])
+], [
+ PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
+ VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
+])
dnl
dnl Portaudio module
PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
VLC_ADD_PLUGIN([qt4])
ALIASES="${ALIASES} qvlc"
- QT4LOCALEDIR="$(eval $PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
- AC_SUBST(QT4LOCALEDIR)
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11])
need_xid_provider="no"
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS} -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS}])
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
projects / vlc / blobdiff