then
echo ""
echo "Building with Mac OS X defaults:"
- with_macosx_version_min="10.5"
- echo " Assuming --with-macosx-version-min=10.5"
- with_macosx_sdk="/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk"
- echo " Assuming --with-macosx-sdk=/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk"
build_dir=`pwd`
echo " Assuming --prefix=${build_dir}/vlc_install_dir"
ac_default_prefix="${build_dir}/vlc_install_dir"
CXX="${CXX} -isysroot ${with_macosx_sdk}"
OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
LD="${LD} -syslibroot ${with_macosx_sdk}"
+ else
+ echo " No desired SDK version given, falling back to 10.5"
+ CPP="${CPP} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
+ CC="${CC} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
+ CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
+ OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.5.sdk"
+ LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.5.sdk"
+ with_macosx_version_min="10.5"
+ echo " Assuming --with-macosx-version-min=10.5"
fi
AC_ARG_WITH(macosx-version-min,
[ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
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_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([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap 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_select 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 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"
symbian*)
SYS=symbian
;;
+ *os2*)
+ SYS=os2
+ LDFLAGS_save="${LDFLAGS_save} -Zomf -Zbin-files -Zargs-wild"; LDFLAGS="${LDFLAGS_save}"
+ ;;
*)
SYS="${host_os}"
;;
esac
-AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
-AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
-AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
-AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
-AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
+AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
+AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
+AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
+AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
+AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
+AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
-AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"])
+AM_CONDITIONAL(USE_PEFLAGS, test "${enable_peflags}" = "yes")
dnl
dnl Sadly autoconf doesn't think about testing foo.exe when ask to test
dnl Check for broken versions of mingw-runtime compatability library
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
AC_MSG_CHECKING(for broken mingw-runtime)
- AC_PREPROC_IFELSE([
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <_mingw.h>
#if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15)
#ifndef __MINGW64_VERSION_MAJOR
# error Attempting to use mingw-runtime with broken vsnprintf support
#endif
#endif
- ], [
+ ])], [
AC_MSG_RESULT([ok])
], [
AC_MSG_RESULT([present])
dnl Ubuntu alone has 20 bug numbers for this...
dnl
AC_MSG_CHECKING(for buggy GNU/libc versions)
-AC_PREPROC_IFELSE([
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <limits.h>
#if defined (__GLIBC__) && (__GLIBC__ == 2) \
&& (__GLIBC_MINOR__ >= 5) && (__GLIBC_MINOR__ <= 7)
# error GNU/libc with dcgettext killer bug!
#endif
-], [
+])], [
AC_MSG_RESULT([not present])
], [
AC_MSG_RESULT([found])
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 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_REPLACE_FUNCS([asprintf atof atoll dirfd 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.])
])
CFLAGS="${CFLAGS} ${CFLAGS_TUNING}"
AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}])
- AC_COMPILE_IFELSE([ ],
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],
[tuning="yes"],
[CFLAGS_TUNING=""; tuning="no"
AS_IF([test "${with_tuning}"],
[ --enable-httpd HTTP daemon (default enabled)])
if test "${enable_httpd}" != "no"
then
- VLC_ADD_PLUGIN([oldhttp])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
])
fi
-dnl
-dnl libdvbpsi ts demux/mux
-dnl
-AC_ARG_ENABLE(dvb,
- [ --enable-dvb MPEG-TS and DVB support (default auto)])
-have_dvbpsi=no
-AS_IF([test "${enable_dvb}" != "no"], [
- AC_CHECK_HEADERS([dvbpsi/dr.h],[
- VLC_ADD_PLUGIN([ts])
- if test "${enable_sout}" != "no"; then
- AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor, [VLC_ADD_PLUGIN([mux_ts])], [], [-ldvbpsi])
- fi
- VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi])
- have_dvbpsi=yes
-
- AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [
- AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.])
- ], [], [${LIBS_ts}])
- ],[
- AS_IF([test -n "${enable_dvb}"], [
- AC_MSG_ERROR([Could not find libdvbpsi on your system: you need at least version 0.1.6])
- ], [
- AC_MSG_WARN([Could not find libdvbpsi on your system: you need at least version 0.1.6])
- ])
- ],[ #if defined( HAVE_STDINT_H )
- # include <stdint.h>
- #elif defined( HAVE_INTTYPES_H )
- # include <inttypes.h>
- #endif
- #include <dvbpsi/dvbpsi.h>
- #include <dvbpsi/descriptor.h>
- #include <dvbpsi/pat.h>
- #include <dvbpsi/pmt.h>
- ])
-])
-
dnl
dnl Video4Linux2 plugin
dnl
fi
dnl
-dnl DVB-S/DVB-T/DVB-C satellite/teresterial/cable input
+dnl libdvbpsi check for ts mux/demux
dnl
-AS_IF([test "${have_dvbpsi}" = "yes" ], [
- AC_CHECK_HEADER([linux/dvb/version.h], [
- VLC_ADD_PLUGIN([dvb])
- ])
-])
+PKG_WITH_MODULES([DVBPSI], [libdvbpsi],
+ VLC_ADD_PLUGIN([ts])
+ VLC_ADD_LIBS([ts],[-ldvbpsi])
+if test "${enable_sout}" != "no"; then
+ VLC_ADD_PLUGIN([mux_ts])
+ VLC_ADD_LIBS([mux_ts],[-ldvbpsi])
+fi
+)
dnl
dnl Screen capture module
AC_ARG_ENABLE(libass,
[ --enable-libass Subtitle support using libass (default enabled)])
AS_IF( [test "${enable_libass}" != "no"], [
- PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6,
+ PKG_CHECK_MODULES(LIBASS, libass >= 0.9.8,
[
VLC_ADD_LIBS([libass],[$LIBASS_LIBS])
VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
[ --enable-fribidi fribidi support (default enabled)])
AC_ARG_ENABLE(fontconfig,
[ --enable-fontconfig fontconfig support (default enabled)])
-if test "${enable_freetype}" != "no"
-then
+if test "${enable_freetype}" != "no"; then
PKG_CHECK_MODULES(FREETYPE, freetype2,[
VLC_ADD_PLUGIN([freetype])
have_freetype=yes
VLC_ADD_LIBS([freetype],[-liconv -lz])
fi
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
- if test "${enable_fontconfig}" != "no"
- then
- AC_CHECK_HEADERS(fontconfig/fontconfig.h,
- [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
- VLC_ADD_LIBS([freetype],[-lfontconfig])])
- AC_CHECK_HEADERS(Carbon/Carbon.h,
- [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
+
+ if test "${SYS}" != "mingw32"; then
+ if test "${enable_fontconfig}" != "no"; then
+ AC_CHECK_HEADERS(fontconfig/fontconfig.h,
+ [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
+ VLC_ADD_LIBS([freetype],[-lfontconfig])])
+ AC_CHECK_HEADERS(Carbon/Carbon.h,
+ [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
+ fi
+ else
+ VLC_ADD_LIBS([freetype],[-lgdi32])
fi
- dnl fribidi support
+ dnl fribidi support
if test "${enable_fribidi}" != "no"
then
PKG_CHECK_MODULES(FRIBIDI, fribidi, [
dnl
PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto])
-dnl
-dnl Snapshot vout module (with cache)
-dnl
-AC_ARG_ENABLE(snapshot,
- [ --enable-snapshot snapshot module (default disabled)])
-if test "${enable_snapshot}" = "yes"
-then
- VLC_ADD_PLUGIN([snapshot])
-fi
-
dnl
dnl iOS vout module
dnl
[ --enable-alsa Advanced Linux Sound Architecture (default auto)])
have_alsa="no"
AS_IF([test "${enable_alsa}" != "no"], [
- PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.0], [
+ PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [
have_alsa="yes"
], [
AS_IF([test "x${enable_alsa}" != "x"], [
- AC_MSG_ERROR([alsa-lib not found])
+ AC_MSG_ERROR([alsa-lib version 1.0.16 or later not found])
])
])
])
AC_MSG_CHECKING([whether Qt uses X11])
CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}"
- AC_PREPROC_IFELSE([
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <QWidget>
#if !defined (Q_WS_X11)
# error Fail
#endif
- ], [
+ ])], [
AC_MSG_RESULT([yes])
VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
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])
+ VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
(test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
-
dnl
dnl ncurses module
dnl
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
modules/codec/spudec/Makefile
modules/codec/wmafixed/Makefile
modules/control/Makefile
- modules/control/http/Makefile
modules/control/dbus/Makefile
modules/control/globalhotkeys/Makefile
modules/demux/Makefile
test "${enable_debug}" = "yes" && printf "debug "
test "${enable_cprof}" = "yes" && printf "cprof "
test "${enable_gprof}" = "yes" && printf "gprof "
-test "${enable_optimizations}" = "yes" && printf "optim "
+test "${enable_optimizations}" != "no" && printf ${enable_optimizations}
echo ""
if test "${enable_vlc}" != "no"; then
echo "vlc aliases :${ALIASES}"
projects / vlc / blobdiff