X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=be6e24cdd612620160f5e822355f4e47d8e3fb9f;hb=452f40206de0291918317e926cd61989fd558739;hp=2393011836c03c94dc70db6f74cc582e207e1639;hpb=8e37bd452a8e9deff5e8ddf74a38c7f50a691e1b;p=vlc diff --git a/configure.ac b/configure.ac index 2393011836..be6e24cdd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team]) -AC_INIT(vlc, 1.0.0-pre2) +AC_INIT(vlc, 1.0.0-rc1) VERSION_MAJOR="1" VERSION_MINOR="0" VERSION_REVISION="0" -VERSION_EXTRA="-pre2" +VERSION_EXTRA="-rc1" PKGDIR="vlc" AC_SUBST(PKGDIR) @@ -212,7 +212,7 @@ case "${host_os}" in VLC_ADD_LDFLAGS([mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup]) - VLC_ADD_LDFLAGS([libvlc],[-Wl,dynamic_lookup]) + VLC_ADD_LDFLAGS([libvlc],[-Wl,-undefined,dynamic_lookup]) VLC_ADD_LDFLAGS([avcodec avformat swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation]) @@ -559,6 +559,8 @@ AC_PREPROC_IFELSE([ work-around for this. Check with your distribution vendor on how to update the glibc run-time. Alternatively, build with --disable-nls --disable-mozilla and be sure to not use LibVLC from other applications/wrappers.]) + ], [ + AC_DEFINE(DISABLE_BUGGY_GLIBC_CHECK, 1, [Disables runtime check for buggy glibc.]) ]) ]) @@ -578,6 +580,9 @@ 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_CHECK_FUNCS([stricmp strnicmp]) +AC_CHECK_FUNCS(fdatasync,, + [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) +]) dnl Check for Linux system calls AC_CHECK_FUNCS([vmsplice]) @@ -731,7 +736,7 @@ AC_CHECK_LIB(m,sqrt,[ VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm]) ]) AC_CHECK_LIB(m,ceil,[ - VLC_ADD_LIBS([mosaic],[-lm]) + VLC_ADD_LIBS([hotkeys mosaic],[-lm]) ]) AC_CHECK_LIB(m,exp,[ VLC_ADD_LIBS([gaussianblur],[-lm]) @@ -4165,7 +4170,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) AS_IF([test "${enable_xvideo}" != "no"], [ - PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [ + PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ VLC_ADD_PLUGIN([xcb_xv]) ]) ]) @@ -4705,10 +4710,10 @@ if test "${enable_oss}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_oss}" = "yes") then - AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ + AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [ VLC_ADD_PLUGIN([oss]) VLC_ADD_PLUGIN([access_oss]) - AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio])) + AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])]) ]) fi @@ -4719,7 +4724,7 @@ AC_ARG_ENABLE(pulse, [ --enable-pulse Pulseaudio support (default enabled)]) if test "${enable_pulse}" != "no" then - PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8, + PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.11, [ VLC_ADD_PLUGIN([pulse]) VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}]) VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])], @@ -5404,7 +5409,7 @@ AC_ARG_ENABLE(gnutls, [ --enable-gnutls gnutls TLS/SSL support (default enabled)]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.3.3], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.4], [ VLC_ADD_PLUGIN([gnutls]) VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) AS_IF([test "${SYS}" = "mingw32"], [