AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Goldeneye"
+CODENAME="Yellow Bastard"
COPYRIGHT_YEARS="1996-2009"
AC_PREREQ(2.59c)
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"
OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
LD="${LD} -syslibroot ${with_macosx_sdk}"
fi
- if test "${host_cpu}" = "powerpc"; then
- CPP="${CPP} -arch ppc"
- CC="${CC} -arch ppc"
- CXX="${CXX} -arch ppc"
- OBJC="${OBJC} -arch ppc"
- LD="${LD} -arch ppc"
- fi
- if test "${host_cpu}" = "i386"; then
- CPP="${CPP} -arch i386"
- CC="${CC} -arch i386"
- CXX="${CXX} -arch i386"
- OBJC="${OBJC} -arch i386"
- LD="${LD} -arch i386"
- fi
AC_ARG_WITH(macosx-version-min,
[ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
if test "${with_macosx_version_min}" != "" ; then
fi
fi
;;
- *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+ *mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
AC_CHECK_TOOL(OBJCOPY, objcopy, :)
case "${host_os}" in
- *wince* | *mingwce* | *mingw32ce* | *pe*)
+ *wince* | *mingwce* | *mingw32ce*)
SYS=mingwce
dnl Sadly CeGCC still needs non-wince macros
AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.])
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 sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
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>
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.])
dnl Check for dynamic plugins
ac_cv_have_plugins=no
-# OS X style
-AC_CHECK_HEADERS(mach-o/dyld.h,
- [AC_CHECK_FUNCS(NSLinkModule,
- [AC_DEFINE(HAVE_DL_DYLD, 1, [Define if you have the Darwin dyld API])
- ac_cv_have_plugins=yes])])
-
# HP-UX style
if test "${ac_cv_have_plugins}" = "no"; then
AC_CHECK_HEADERS(dl.h)
AC_MSG_RESULT(no)])
dnl Check for headers
-AC_CHECK_HEADERS(getopt.h strings.h locale.h)
-AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h)
+AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
+AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h)
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
fi
else
if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then
- CFLAGS_TUNING="-march=pentium-m -mtune=prescott"
+ CFLAGS_TUNING="-march=prescott -mtune=generic"
elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then
CFLAGS_TUNING="-mtune=pentium2"
elif test "${host_cpu}" = "x86_64"; then
])
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
-AC_ARG_ENABLE(switcher,
- [ --enable-switcher Stream-out switcher plugin (default disabled)])
-
dnl Check for libshout
AC_ARG_ENABLE(shout,
[ --enable-shout libshout output plugin (default disabled)])
[ if test -n "${enable_smb}"; then
AC_MSG_ERROR([cannot find libsmbclient headers])
fi ])
- AC_CHECK_MEMBER([struct _SMBCCTX.close_fn],
- AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),,
- [#include <libsmbclient.h>])
fi
dnl
[ --enable-mpc Mpc demux support (default enabled)])
if test "${enable_mpc}" != "no"
then
- AC_CHECK_HEADERS(mpcdec/mpcdec.h, [
+ AC_CHECK_HEADERS([mpc/mpcdec.h], [
+ VLC_ADD_PLUGIN([mpc])
+ VLC_ADD_LIBS([mpc],[-lmpcdec])],
+ [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [
VLC_ADD_PLUGIN([mpc])
- VLC_ADD_LIBS([mpc],[-lmpcdec])])
+ VLC_ADD_LIBS([mpc],[-lmpcdec])])])
fi
dnl
VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
VLC_RESTORE_FLAGS
+ have_avcodec="yes"
],[
AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
])
fi
+dnl
+dnl stream_out switcher needs libavcodec
+dnl
+AC_ARG_ENABLE(switcher,
+ [ --enable-switcher Stream-out switcher plugin (default disabled)])
+AS_IF([test "${enable_switcher}" = "yes"], [
+ AS_IF([test "x${have_avcodec}" = "xyes"], [
+ VLC_ADD_PLUGIN([stream_out_switcher])
+ VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS])
+ VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS])
+ ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec])
+ ])
+])
+
+
dnl
dnl avformat demuxer/muxer plugin
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"
], [
AS_IF([test "${enable_x11}" != "no"], [
AC_CHECK_HEADERS(X11/Xlib.h, [
- VLC_ADD_PLUGIN([x11_screen])
- VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
- VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-
- VLC_ADD_PLUGIN([panoramix])
- VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
- VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
-
VLC_ADD_PLUGIN([x11])
VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
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"], [
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"
])
])
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])
+ VLC_ADD_PLUGIN([xcb_screen])
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])
+ ])
])
])
+ PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [
+ VLC_ADD_PLUGIN([panoramix])
+ VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}])
+ VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}])
+ ], [true])
+
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)
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"],[
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"
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
], [
- VLC_ADD_LIBS([qt4],[$QT4_LIBS])
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
])
QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
AC_SUBST(QT4LOCALEDIR)
fi
fi
+dnl
+dnl libprojectM visualization plugin
+dnl
+AC_ARG_ENABLE(projectm,
+ [ --enable-projectm projectM visualization plugin (default disabled)])
+AS_IF([test "${enable_projectm}" = "yes"],
+ [
+ PKG_CHECK_MODULES(PROJECTM, libprojectM,
+ [
+ VLC_ADD_PLUGIN([projectm])
+ VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS])
+ VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS])
+ ],[
+ AC_MSG_WARN(libprojectM library not found)
+ ])
+ ])
+
dnl
dnl AtmoLight (homebrew AmbiLight)
dnl
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:])
[
AC_PATH_PROGS(MOZILLA_CONFIG,
[mozilla-config seamonkey-config xulrunner-config],
- AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
- )
+ [no])
+ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
]
)
dnl pkg-config failed but we might have found a mozilla-config
projects / vlc / blobdiff