X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8603f46c58f8a63541261acac075fda34627f80a;hb=5e89b62754e8098289b2d0ec6ff93446fb503fe2;hp=1ec11f8b67693a6e3111abd8952b566967154f32;hpb=9f0d65737e7d810205b25cbb40f0eac4c758b951;p=vlc diff --git a/configure.ac b/configure.ac index 1ec11f8b67..8603f46c58 100644 --- a/configure.ac +++ b/configure.ac @@ -265,6 +265,8 @@ case "${host_os}" in echo " Assuming --disable-skins2" enable_x11="no" echo " Assuming --disable-x11" + enable_xcb="no" + echo " Assuming --disable-xcb" enable_glx="no" echo " Assuming --disable-glx" enable_xvideo="no" @@ -471,7 +473,7 @@ VLC_ADD_CFLAGS([libvlccore],[${INCICONV}]) VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}]) dnl Check for broken versions of mingw-runtime compatability library -AS_IF([test "${SYS}" = "mingw32"], [ +AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AC_MSG_CHECKING(for broken mingw-runtime) AC_PREPROC_IFELSE([ #include <_mingw.h> @@ -578,7 +580,7 @@ dnl Check for usual libc functions AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r lrintf daemon fork lstat posix_fadvise posix_madvise uselocale]) AC_FUNC_ALLOCA AC_CHECK_FUNCS(fcntl) -AC_REPLACE_FUNCS([asprintf atof atoll gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab]) +AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab]) AC_CHECK_FUNCS([stricmp strnicmp]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) @@ -2024,28 +2026,28 @@ AC_ARG_ENABLE(dc1394, [ --enable-dc1394 dc1394 access module (default disabled)]) if test "${enable_dc1394}" = "yes" then - AC_CHECK_HEADERS(libraw1394/raw1394.h, [ - AC_CHECK_LIB( raw1394, raw1394_get_nodecount, [ - AC_CHECK_HEADERS(libdc1394/dc1394_control.h , [ -dnl AC_CHECK_LIB( dc1394_control, dc1394_setup_capture, [ - VLC_ADD_PLUGIN([dc1394]) - VLC_ADD_LIBS([dc1394],[-ldc1394_control -lraw1394]) -dnl ], -dnl [ -dnl AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) -dnl ]) - ], - [ - AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) - ]) + dnl + dnl Check for libraw1394 + dnl + PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1, + [ + VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libraw1394`]) + VLC_ADD_CPPFLAGS([dc1394],[`${PKG_CONFIG} --cflags libraw1394`]) ], + [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])] + ) + + dnl + dnl Check for libdc1394 + dnl + PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.2, [ - AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) - ]) - ], - [ - AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) - ]) + VLC_ADD_PLUGIN([dc1394]) + VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libdc1394-2`]) + VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libdc1394-2`]) + ], + [AC_MSG_ERROR([Couldn't find libdc1394 >= 2.0.2, install libdc1394 development package])] + ) fi dnl @@ -2060,11 +2062,10 @@ then dnl PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1, [ - VLC_ADD_PLUGIN([access_dv]) VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libraw1394`]) VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libraw1394`]) ], - [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package ?])] + [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])] ) dnl @@ -2076,7 +2077,7 @@ then VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libavc1394`]) VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libavc1394`]) ], - [AC_MSG_ERROR([Couldn't find libavc1394 >= 0.5.1, install libavc1394 development package ?])] + [AC_MSG_ERROR([Couldn't find libavc1394 >= 0.5.1, install libavc1394 development package])] ) fi @@ -3899,7 +3900,7 @@ dnl AC_PATH_XTRA() AC_ARG_ENABLE(x11, - [ --enable-x11 X11 support (default enabled)],, [ + [ --enable-x11 X11 support with Xlib (default enabled)],, [ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ enable_x11="yes" ], [ @@ -3987,7 +3988,7 @@ dnl XVMC module dnl (disabled by default except on win32) dnl AC_ARG_ENABLE(xvmc, - [ --enable-xvmc XVMC support (default disabled)],, [ + [ --enable-xvmc XvMC support (default disabled)],, [ enable_xvmc="no" ]) AS_IF([test "${enable_xvmc}" != "no"], [ @@ -4015,12 +4016,14 @@ AS_IF([test "$enable_xinerama" != "no"], [ VLC_ADD_LIBS([xvideo],[-lXinerama_pic]) VLC_ADD_LIBS([x11],[-lXinerama_pic]) VLC_ADD_LIBS([glx],[-lXinerama_pic]) + VLC_ADD_LIBS([xvmc],[-lXinerama_pic]) ac_cv_have_xinerama="yes" ],[ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ VLC_ADD_LIBS([xvideo],[-lXinerama]) VLC_ADD_LIBS([x11],[-lXinerama]) VLC_ADD_LIBS([glx],[-lXinerama]) + VLC_ADD_LIBS([xvmc],[-lXinerama]) ac_cv_have_xinerama="yes" ]) ]) @@ -4066,32 +4069,45 @@ CPPFLAGS="${CPPFLAGS_save}" dnl dnl X C Bindings modules -dnl (work in progress) dnl AC_ARG_ENABLE(xcb, - [ --enable-xcb X C Bindings work-in-progress (default disabled)], - ,[enable_xcb="no"]) + [ --enable-xcb X11 support with XCB (default enabled)],, [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + enable_xcb="yes" + ], [ + enable_xcb="no" + ]) +]) + AS_IF([test "${enable_xcb}" != "no"], [ PKG_CHECK_MODULES(XPROTO, [xproto]) dnl libxcb PKG_CHECK_MODULES(XCB, [xcb]) PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) + VLC_ADD_PLUGIN([xcb]) AS_IF([test "${enable_xvideo}" != "no"], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ VLC_ADD_PLUGIN([xcb_xv]) + ], [ + PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [ + VLC_ADD_PLUGIN([xcb_xv]) + VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD]) + ]) ]) ]) dnl xcb-utils - PKG_CHECK_MODULES(XCB_AUX, [xcb-aux]) PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms]) - VLC_ADD_PLUGIN([xcb]) VLC_ADD_PLUGIN([xcb_window]) + VLC_ADD_PLUGIN([globalhotkeys]) + VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] ) + VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] ) ]) + dnl dnl OpenGL module dnl (enabled by default except on beos) @@ -4932,7 +4948,7 @@ then VLC_ADD_LIBS([maemo],[${HILDON_LIBS}]) VLC_ADD_PLUGIN([maemo]) VLC_ADD_PLUGIN([swscale_maemo]) - AC_DEFINE([BUILD_MAEMO], 1, [Define if you're using Maemo interfaces]) + AC_DEFINE([BUILD_MAEMO], 1, [Define if you are using Maemo interfaces]) ALIASES="${ALIASES} mvlc" ], [ AS_IF([test "${enable_maemo}" = "yes"],[ @@ -4951,7 +4967,7 @@ AC_ARG_ENABLE(qt4, AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no]) ]) AS_IF([test "${enable_qt4}" != "no"], [ - PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.3.0], [ + PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [ VLC_ADD_PLUGIN([qt4]) AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) ALIASES="${ALIASES} qvlc" @@ -5281,18 +5297,6 @@ then fi fi -dnl -dnl Global hotkeys using XCB -dnl -PKG_CHECK_MODULES(XCB, [xcb], [ - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [ - PKG_CHECK_MODULES(XPROTO, [xproto], [ - VLC_ADD_PLUGIN([globalhotkeys]) - VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] ) - VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] ) - ], [ AC_MSG_WARN( [Xproto not found] ) ]) - ], [ AC_MSG_WARN( [XCB keysyms was not found]) ]) -], [ AC_MSG_WARN( [XCB was not found]) ]) AC_ARG_WITH(,[Misc options:])