X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=50fdee0b4b546cf140e1715490bea69c7fc6648b;hb=574f292a932d8445fa3a8416bc11988be32728fe;hp=442cc3723161415509b909c98c2061e2ee25eaf2;hpb=80d860b6765b56a89335e9e5a46d6bf8c47b5571;p=vlc diff --git a/configure.ac b/configure.ac index 442cc37231..50fdee0b4b 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ AC_DEFINE([_FILE_OFFSET_BITS], 64, [Define to 64 for large files support.]) AC_DEFINE([_REENTRANT],, [Define to expose reentrant functions.]) AC_DEFINE([_THREAD_SAFE],, [Same as _REENTANT for some other OSes.]) AC_DEFINE([__LIBVLC__],, [Define within the LibVLC source code tree.]) +AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Define to limit the scope of .]) AM_PROG_CC_C_O AC_PROG_CXX @@ -107,19 +108,22 @@ case "${host_os}" in CFLAGS="${CFLAGS} -pthread" VLC_ADD_LIBS([vcd cdda vcdx],[-ldvd]) ;; - *bsd*) - SYS="${host_os}" + freebsd*) + SYS=freebsd CFLAGS="${CFLAGS} -pthread" - case "${host_os}" in - freebsd*) - CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - LDFLAGS="${LDFLAGS} -L/usr/local/lib" - ;; - openbsd*) - CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/X11R6/include" - LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib/" - ;; - esac + CPPFLAGS="${CPPFLAGS} -I/usr/local/include" + LDFLAGS="${LDFLAGS} -L/usr/local/lib" + ;; + openbsd*) + SYS=openbsd + CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/X11R6/include" + LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib/" + ;; + netbsd*) + SYS=netbsd + ;; + dragonfly*) + SYS=dragonfly ;; darwin*) @@ -153,7 +157,15 @@ case "${host_os}" in VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) dnl Allow binaries created on Lion to run on earlier releases - AC_LIBOBJ([getdelim]) + AC_EGREP_CPP(yes, + [#import + #ifdef MAC_OS_X_VERSION_10_7 + yes + #endif], + [AC_MSG_RESULT([yes]) + AC_LIBOBJ([getdelim]) + AC_LIBOBJ([strndup]) + AC_LIBOBJ([strnlen])],) dnl dnl Check for Mac OS X SDK settings @@ -479,7 +491,7 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) -AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy]) +AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -499,6 +511,20 @@ AC_LINK_IFELSE([ c = NULL; ])],[AC_DEFINE([HAVE_VASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([vasprintf])]) +dnl C11 static_assert() +AC_MSG_CHECKING([for static_assert in assert.h]) +AC_PREPROC_IFELSE([AC_LANG_SOURCE([ +#include +#ifndef static_assert +# error BOOM! +#endif +])], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_STATIC_ASSERT], [1], [Define to 1 if defines static_assert.]) +], [ + AC_MSG_RESULT([no]) +]) + # Windows CE does not have strcoll() AC_FUNC_STRCOLL @@ -534,7 +560,7 @@ AC_SEARCH_LIBS(connect, [socket], [ ]) VLC_RESTORE_FLAGS AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync stream_filter_dash],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -592,7 +618,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mod mpc dmo mp4 quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264 hqdn3d],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mod mpc dmo mp4 quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264 hqdn3d anaglyph],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -663,18 +689,10 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then ]) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -dnl Check for misc headers -AC_MSG_CHECKING(for strncasecmp in strings.h) -AC_EGREP_HEADER(strncasecmp,strings.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1, - Define if defines strncasecmp.)],[ - AC_MSG_RESULT(no)]) - dnl Check for headers AC_CHECK_HEADERS([search.h]) -AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h) -AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h) +AC_CHECK_HEADERS(getopt.h locale.h xlocale.h) +AC_CHECK_HEADERS([sys/time.h sys/ioctl.h]) AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ @@ -1082,7 +1100,7 @@ have_mmxext="no" AS_IF([test "${enable_mmx}" != "no"], [ ARCH="${ARCH} mmx" VLC_SAVE_FLAGS - CFLAGS="${CFLAGS} -O -mmmx" + CFLAGS="${CFLAGS} -mmmx" AC_CACHE_CHECK([if $CC groks MMX intrinsics], [ac_cv_c_mmx_intrinsics], [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ [#include @@ -1166,7 +1184,7 @@ AS_IF([test "${enable_sse}" != "no"], [ ARCH="${ARCH} sse sse2" VLC_SAVE_FLAGS - CFLAGS="${CFLAGS} -O -msse2" + CFLAGS="${CFLAGS} -msse2" AC_CACHE_CHECK([if $CC groks SSE2 intrinsics], [ac_cv_c_sse2_intrinsics], [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ [#include @@ -1663,7 +1681,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ ]) AS_IF([test "$ac_cv_live555" = "no"], [ AC_MSG_WARN([liveMedia is missing or its installed version is too old: -Version 2010.05.29 or later is required to proceed. +Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia .]) AS_IF([test -n "${enable_live555}"], [ AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) @@ -1756,7 +1774,7 @@ then AC_CHECK_HEADERS(dshow.h, [ VLC_ADD_PLUGIN([dshow]) VLC_ADD_CXXFLAGS([dshow],[]) - VLC_ADD_LIBS([dshow],[-lole32 -loleaut32 -luuid]) ]) + VLC_ADD_LIBS([dshow],[-lole32 -loleaut32 -luuid -lstrmiids -lksuser])]) AC_LANG_POP(C++) fi fi @@ -1803,21 +1821,21 @@ fi dnl dnl Video4Linux 2 dnl -AC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2], - [disable userspace V4L2 library (default auto)])]) +AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2], + [disable Video4Linux version 2 (default auto)])]) AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr], [support PVR V4L2 cards (default disabled)])]) have_v4l2="no" -AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ - have_v4l2="yes" +AS_IF([test "$enable_v4l2" != "no"], [ + AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ + have_v4l2="yes" + ]) ]) AS_IF([test "$have_v4l2" = "yes"], [ - AS_IF([test "${enable_libv4l2}" != "no"], [ - PKG_CHECK_MODULES(LIBV4L2, libv4l2, [ - AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available]) - ], [ - AC_MSG_WARN([${LIBV4L2_PKG_ERRORS}.]) - ]) + PKG_CHECK_MODULES(LIBV4L2, libv4l2, [ + AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available]) + ], [ + AC_MSG_WARN([${LIBV4L2_PKG_ERRORS}.]) ]) AS_IF([test "${enable_pvr}" = "yes"], [ VLC_ADD_PLUGIN([pvr]) @@ -2720,7 +2738,7 @@ AM_CONDITIONAL([HAVE_SPEEXDSP], [test "$have_speexdsp" = "yes"]) dnl dnl theora decoder plugin dnl -PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theora >= 1.0], [experimental theora codec], [auto]) +PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theoradec >= 1.0 theoraenc], [experimental theora codec], [auto]) dnl dnl dirac encoder plugin @@ -2740,11 +2758,11 @@ AC_ARG_ENABLE(png, if test "${enable_png}" != "no"; then AC_CHECK_HEADERS(png.h, [ VLC_SAVE_FLAGS - LDFLAGS="${LDFLAGS} -lz" + LDFLAGS="${LDFLAGS} -lz $LIBM" AC_CHECK_LIB(png, png_set_rows, [ - VLC_ADD_LIBS([png],[-lpng -lz -lm]) + VLC_ADD_LIBS([png],[-lpng -lz $LIBM]) VLC_ADD_PLUGIN([png osdmenu osd_parser])], - [],[-lz]) + [],[-lz $LIBM] ) VLC_RESTORE_FLAGS ]) fi @@ -2812,7 +2830,7 @@ fi dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl -PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) +PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.0], [MIDI synthetiser with libfluidsynth], [auto]) dnl dnl Teletext Modules @@ -2992,11 +3010,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ AS_IF([test "${have_gl}" != "yes"], [ AC_MSG_ERROR([${GL_PKG_ERRORS}. Pass --disable-glx if you do not need OpenGL X11 support.]) ]) - PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb], [ - VLC_ADD_PLUGIN([xcb_glx]) - ], [ - AC_MSG_ERROR([${XLIB_XCB_PKG_ERRORS}. Pass --disable-glx if you do not need OpenGL X11 support.]) - ]) + VLC_ADD_PLUGIN([xcb_glx]) ]) ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) @@ -3177,7 +3191,7 @@ if test "${enable_directx}" != "no"; then [ VLC_ADD_PLUGIN([direct3d]) VLC_ADD_LIBS([direct3d],[-lgdi32]) ]) - VLC_ADD_LIBS([direct3d directx glwin32],[-lole32]) + VLC_ADD_LIBS([direct3d directx glwin32],[-lole32 -luuid]) fi fi @@ -3193,7 +3207,7 @@ AC_ARG_ENABLE(direct2d, AS_IF([test "${enable_direct2d}" != "no"], [ AC_CHECK_HEADERS(d2d1.h, [ VLC_ADD_PLUGIN([direct2d]) - VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) + VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32 -luuid]) ], [ AC_MSG_WARN([Cannot find Direct2D headers!]) ]) @@ -3207,7 +3221,7 @@ AC_ARG_ENABLE(wingdi, if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingw32"; then VLC_ADD_PLUGIN([wingdi]) - VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32]) + VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid]) fi if test "${SYS}" = "mingwce"; then VLC_ADD_PLUGIN([wingdi wingapi]) @@ -3398,8 +3412,8 @@ dnl Open Sound System module dnl AC_ARG_ENABLE(oss, [AS_HELP_STRING([--enable-oss], - [support the Open Sound System OSS (default enabled on BSD)])],, [ - AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux"], [ + [support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)])],, [ + AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [ enable_oss="no" ]) ]) @@ -3417,9 +3431,22 @@ AC_SUBST(OSS_LIBS) AM_CONDITIONAL([HAVE_OSS], [test "${have_oss}" = "yes"]) dnl -dnl Portaudio module +dnl OpenBSD sndio module dnl -PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto]) +AC_ARG_ENABLE([sndio], + [AS_HELP_STRING([--disable-sndio], + [support the OpenBSD sndio (default auto)])],, [ + AS_IF([test "$SYS" = "opensd"], [ + enable_sndio="yes" + ]) +]) +have_sndio="no" +AS_IF([test "$enable_sndio" != "no"], [ + AC_CHECK_HEADER([sndio.h], [ + have_sndio="yes" + ]) +]) +AM_CONDITIONAL([HAVE_SNDIO], [test "${have_sndio}" = "yes"]) dnl dnl win32 waveOut plugin @@ -4133,7 +4160,6 @@ AC_CONFIG_FILES([ modules/access/Makefile modules/access/bd/Makefile modules/access/dshow/Makefile - modules/access/dvb/Makefile modules/access/mms/Makefile modules/access/rtp/Makefile modules/access/rtsp/Makefile @@ -4222,21 +4248,27 @@ dnl Generate makefiles AC_OUTPUT dnl Do we have to use make or gmake ? -USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac` +if make --version 2>&1|grep -q GNU +then + # GNU make, all seems good + MAKE=make +else + # Known GNU make alias (on BSD) + MAKE=gmake +fi dnl Shortcut to nice compile message -rm -f compile if test -n $SHELL; then SHELL=${CONFIG_SHELL-/bin/sh} fi -echo '#! '$SHELL >compile -echo rm -f .error\$\$ >>compile -echo ERROR=0 >>compile -echo export PATH=$PATH LANG=C >>compile -echo "($USE_MAKE_OR_GMAKE V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile -echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile -echo test -f .error\$\$ \&\& ERROR=1 >>compile -echo rm -f .error\$\$ >>compile -echo exit \$ERROR >>compile +rm -f compile +echo "#! $SHELL +rm -f .error\$\$ +ERROR=0 +export PATH=\"$PATH\" LANG=C +($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl +test -f .error\$\$ && ERROR=1 +rm -f .error\$\$ +exit \$ERROR" >compile chmod a+x compile echo " @@ -4252,4 +4284,4 @@ else echo "build vlc executable : no" fi echo " -To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'." +To build vlc and its plugins, type \`$MAKE', or \`./compile' if you like nice colors."