AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
-AC_INIT(vlc, 1.1.0-git)
+AC_INIT(vlc, 1.2.0-git)
VERSION_MAJOR="1"
-VERSION_MINOR="1"
+VERSION_MINOR="2"
VERSION_REVISION="0"
-VERSION_EXTRA="-test"
+VERSION_EXTRA="-git"
PKGDIR="vlc"
AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="The Luggage"
+CODENAME="Twoflower"
COPYRIGHT_YEARS="1996-2010"
AC_PREREQ(2.59c)
dnl
AC_ARG_WITH(contrib,
[ --without-contrib do not use the libraries in CONTRIB_DIR],[],[])
- AS_IF([test "${with_contrib}" != "no"],[
- AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
- if test -z "$CONTRIB_DIR"
- then
+AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
+AS_IF([test "${with_contrib}" != "no"],[
+ AS_IF([test -z "$CONTRIB_DIR"], [
topdir="`dirname $0`"
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
- CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+ CONTRIB_DIR="${topdir}/extras/contrib/hosts/${host}"
if ! test -d "$CONTRIB_DIR"
then
gccmachine=`$CC -dumpmachine`
- CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+ CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
fi
- fi
- AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
- AS_IF([test -d ${CONTRIB_DIR}/lib],[
+ ])
+ AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
+ AS_IF([test -d "${CONTRIB_DIR}/lib"],[
AC_MSG_RESULT([yes])
AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH
CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include"
- if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then
- export PKG_CONFIG_PATH=${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
+ if test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"; then
+ export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
else
- export PKG_CONFIG_LIBDIR=${CONTRIB_DIR}/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
fi
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib"
- if test -z $with_mozilla_sdk_path; then
- with_mozilla_sdk_path=${CONTRIB_DIR}/gecko-sdk
+ if test -z "$with_mozilla_sdk_path"; then
+ with_mozilla_sdk_path="${CONTRIB_DIR}/gecko-sdk"
fi
- if test -z $with_cyberlink_tree; then
- with_cyberlink_tree=${CONTRIB_DIR}/src/clinkcc
+ if test -z "$with_cyberlink_tree"; then
+ with_cyberlink_tree="${CONTRIB_DIR}/src/clinkcc"
fi
if test "${SYS}" = "darwin"; then
- export LD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH
+ export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
+ export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
elif test "${SYS}" = "beos"; then
- export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
- export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
+ export LIBRARY_PATH="${CONTRIB_DIR}/lib:$LIBRARY_PATH"
+ export BELIBRARIES="${CONTRIB_DIR}/lib:$BELIBRARIES"
fi
- ],[
- AC_MSG_RESULT([no])
- ])
+ ],[
+ AC_MSG_RESULT([no])
+ CONTRIB_DIR=""
+ ])
])
dnl
dnl Set default values
;;
*mingw32*)
SYS=mingw32
- AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
+ AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows XP APIs.])
;;
*cygwin*)
dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler.
- AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
+ AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.])
AC_EGREP_CPP(yes,
[#ifdef WIN32
yes
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla 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 slp oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet 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 oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet 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_rtp remoteosd ts oldtelnet 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 oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
+ AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
fi
;;
*nto*)
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
+AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
dnl -lnsl and -lsocket are needed on Solaris;
dnl we purposedly make the test fail on Windows
LIBS_save="${LIBS}"
-AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.])
-AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${SOCKET_LIBS}])
-
-dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro
-dnl are
-LIBS="${LIBS_gai}"
-AC_CHECK_FUNCS([getnameinfo gai_strerror])
+AC_SEARCH_LIBS([getaddrinfo], [nsl],,, [${SOCKET_LIBS}])
LIBS="${LIBS_save}"
-AH_TEMPLATE(HAVE_ADDRINFO, [Define to 1 if <netdb.h> defines `struct addrinfo'.])
-AC_CHECK_TYPES([struct addrinfo],[AC_DEFINE(HAVE_ADDRINFO)],,
-[#include <sys/types.h>
-#if defined( WIN32 ) || defined( UNDER_CE )
-# if defined(UNDER_CE) && defined(sockaddr_storage)
-# undef sockaddr_storage
-# endif
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#else
-# include <netdb.h>
-#endif])
-
dnl Check for va_copy
AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
AC_TRY_LINK(
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
fi
# Only test for dlopen() if the others didn't work
+LIBDL=""
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
ac_cv_my_have_dlopen=no
- AC_CHECK_FUNC(dlopen,
- ac_cv_my_have_dlopen=yes,
- AC_CHECK_LIB(dl, dlopen,
+ AC_CHECK_FUNC(dlopen, [
+ ac_cv_my_have_dlopen=yes
+ ], [
+ AC_CHECK_LIB(dl, dlopen, [
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]),
- AC_CHECK_LIB(svld, dlopen,
+ LIBDL="-ldl"
+ ], [
+ AC_CHECK_LIB(svld, dlopen, [
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore],[-lsvld]))))
+ LIBDL="-lsvld"
+ ])
+ ])
+ ])
if test "${ac_cv_my_have_dlopen}" = "yes"; then
AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API])
ac_cv_have_plugins=yes
+ VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL])
fi
fi
+AC_SUBST(LIBDL)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
dnl Check for pthreads - borrowed from XMMS
RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
RDC_PROG_CC_FLAGS([-pipe])
-AC_ARG_ENABLE(warnings-as-error,
- AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default disabled)]),, [enable_warnings_as_error="no"])
-AS_IF([test "${enable_warnings_as_error}" = "yes"], [
- RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \
- missing-braces nonnull parentheses uninitialized address enum-compare undef comment switch \
- bad-function-cast implicit sequence-point strict-aliasing array-bounds missing-parameter-type \
- overflow int-to-pointer-cast pointer-to-int-cast div-by-zero overflow ignored])
-])
-AC_SUBST(CFLAGS_WERROR)
-
dnl Check for various optimization flags
AC_CACHE_CHECK([if \$CC accepts -Os],
[ac_cv_c_os],
else
AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
- AC_PATH_PROG(LUAC, luac)
+ AC_ARG_VAR([LUAC], [LUA byte compiler])
+ AC_PATH_PROG(LUAC, luac, [false])
+ AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
+ AC_MSG_ERROR([Could not find the LUA byte compiler.])
+ ])
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
dnl
dnl OpenCV wrapper and example filters
dnl
-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off])
+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example], [opencv], (OpenCV (computer vision) filter), [off])
dnl
if test "${enable_omxil}" = "yes"
then
VLC_ADD_PLUGIN([omxil])
- VLC_ADD_LIBS([omxil], [-ldl])
+ VLC_ADD_LIBS([omxil], [$LIBDL])
fi
dnl
[ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no"
then
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil],
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.2.0 libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
dnl
AC_PATH_XTRA()
+AC_CHECK_HEADERS(X11/Xlib.h)
dnl
dnl X C Bindings modules
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
VLC_ADD_PLUGIN([screensaver xcb_x11 xcb_screen xcb_apps])
- VLC_SET_CFLAGS_WERROR([xcb_screen], [-Wno-error=uninitialized]) # some gcc report a warning which doesn't reveal an error
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
AC_SUBST([GL_CFLAGS])
AC_SUBST([GL_LIBS])
-
-dnl
-dnl OpenGL module
-dnl (enabled by default except on beos)
-dnl
-AC_ARG_ENABLE(opengl,
- [ --enable-opengl OpenGL support (default enabled)])
-if test "${enable_opengl}" != "no" &&
- test "${SYS}" = "darwin"; then
- dnl OS X special case (no GL/gl.h but OpenGL/gl.h)
- VLC_ADD_PLUGIN([opengl])
- VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL])
-fi
-
dnl
dnl SDL module
dnl
VLC_ADD_PLUGIN([snapshot])
fi
-dnl
-dnl Roku HD1000 Video output module
-dnl
-AC_ARG_ENABLE(hd1000v,
- [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1000)])
-if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" &&
- (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
- test "${enable_hd1000v}" = "yes"); then
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADERS([cascade/graphics/CascadeScreen.h cascade/graphics/CascadeBitmap.h],
- [
- can_build_roku="yes"
- ],
- [
- can_build_roku="no"
- AC_MSG_WARN([Not building Roku HD1000 compatible video output])
- ])
- if test "$can_build_roku" = "yes"
- then
- VLC_ADD_PLUGIN([hd1000v])
- VLC_ADD_LIBS([hd1000v],[-lCascade -ldvbpsi -lmad])
- fi
- AC_LANG_POP([C++])
-fi
-
dnl
dnl Windows DirectX module
dnl
])
fi
-dnl
-dnl OMAP Framebuffer module
-dnl
-AC_ARG_ENABLE(omapfb,
- [ --enable-omapfb OMAP framebuffer support (default disabled)])
- if test "${enable_omapfb}" = "yes"
- then
- AC_CHECK_HEADERS(asm/arch-omap/omapfb.h, [
- VLC_ADD_PLUGIN([omapfb])
- AC_CHECK_HEADERS(X11/Xlib.h, [
- VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ])
- ])
- VLC_ADD_PLUGIN([swscale_omap])
- fi
-
-dnl
-dnl SVGAlib module
-dnl
-AC_ARG_ENABLE(svgalib,
- [ --enable-svgalib SVGAlib support (default disabled)])
-if test "${enable_svgalib}" = "yes"
-then
- VLC_ADD_PLUGIN([svgalib])
- VLC_ADD_LIBS([svgalib],[-lvgagl -lvga])
-fi
-
dnl
dnl DirectFB module
dnl try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
LIBS="${LIBS_save}"
if test "${have_directfb}" = "true"; then
- LIBS_mydirectfb="${LIBS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread"
+ LIBS_mydirectfb="${LIBS_new} -lz $LIBDL -ldirectfb -lfusion -ldirect -lpthread"
CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
fi
else
fi
fi
-
-
-dnl
-dnl GGI module
-dnl
-AC_ARG_ENABLE(ggi,
- [ --enable-ggi GGI support (default disabled)])
-if test "${enable_ggi}" = "yes"
-then
- AC_CHECK_HEADER([ggi/ggi.h],[
- VLC_ADD_PLUGIN([ggi])
- VLC_ADD_LIBS([ggi],[-lggi])
- AC_ARG_WITH(ggi,
- [ --with-ggi=PATH path to libggi],
- [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
- then
- VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
- VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
- fi ])
- ],[
- AC_MSG_ERROR([LibGGI development files can't be found])
- ])
-fi
-
dnl
dnl AA plugin
dnl
PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
VLC_ADD_PLUGIN([qt4])
ALIASES="${ALIASES} qvlc"
- QT4LOCALEDIR="$(eval $PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
- AC_SUBST(QT4LOCALEDIR)
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11])
need_xid_provider="no"
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS} -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS}])
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
])
AC_SUBST(DEFS_BIGENDIAN)
+dnl
+dnl Where to install KDE solid .desktop
+dnl
+AC_ARG_VAR([KDE4_CONFIG], [path to kde4-config utility])
+AS_IF([test "x$KDE4_CONFIG" = "x"], [
+ KDE4_CONFIG="kde4-config"
+])
+
+AC_ARG_WITH(kde-solid,
+ AS_HELP_STRING([--with-kde-solid=PATH],
+ [KDE Solid actions directory (auto)]),, [
+ with_kde_solid="yes"
+])
+soliddatadir=""
+AS_IF([test "${with_kde_solid}" != "no"], [
+ AS_IF([test "${with_kde_solid}" = "yes"], [
+ kde4datadir="`${KDE4_CONFIG} --install data`"
+ AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
+ soliddatadir="${kde4datadir}/solid/actions"
+ ], [
+ soliddatadir="${with_kde_solid}"
+ ])
+])
+AC_SUBST(soliddatadir)
+AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"])
+
dnl
dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?)
dnl
AC_ARG_VAR([MOZILLA_LIBS], [linker flags for Mozilla, overriding pkg-config])
AC_MSG_NOTICE([Checking for Mozilla])
found=0
- if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
+ if test -n "$MOZILLA_CFLAGS" -o -n "$MOZILLA_LIBS"
then
found=1
else
if test -n "$PKG_CONFIG"; then
- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
- echo "Trying to find $i.pc files" >&5
- if $PKG_CONFIG --exists --print-errors "$i" 2>&5
- then
- echo "Using $i.pc files." >&5
- echo "Using $i.pc files." >&6
- found=1
- MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
- MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
- break
- fi
- done
+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+ if test -n "$i"
+ then
+ echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+ AC_MSG_CHECKING([for $i >= 1.9.2])
+ if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
+ then
+ echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+ echo "Using $i package." >&AS_MESSAGE_FD
+ found=1
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
+ AC_MSG_RESULT([yes])
+ break
+ fi
+ AC_MSG_RESULT([no])
+ fi
+ done
fi
fi
AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1
- AC_CHECK_HEADERS([npfunctions.h])
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
#endif
])
if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
- AC_MSG_ERROR([Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found.])
+ AC_MSG_ERROR([Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found.])
fi
MOZILLA_REQUIRED_HEADERS=
mozilla=:
AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"],[
- VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX -DOJI])
- AS_IF([ test "${SYS}" != "darwin"],[
- PKG_CHECK_MODULES(XPM, [xpm xt],[
- VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
- ],[
- AC_MSG_ERROR([Please install the libXpm and libXt development files.])
- ])
+ VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX])
+ AS_IF([ test "${SYS}" != "darwin"],[
+ PKG_CHECK_MODULES(XPM, [xpm xt],[
+ VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
+ ],[
+ AC_MSG_ERROR([Please install the libXpm and libXt development files.])
+ ])
])
])
- VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS} ${XPM_LIBS}])
VLC_ADD_PLUGIN([mozilla])
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
],
[
AC_PATH_PROGS(MOZILLA_CONFIG,
- [mozilla-config seamonkey-config xulrunner-config],
+ [mozilla-config seamonkey-config xulrunner-config],
[no])
- test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
+ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla.])
]
)
dnl pkg-config failed but we might have found a mozilla-config
fi
real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
- CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include"
+ CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include"
MOZILLA_REQUIRED_HEADERS=1
- AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
MOZILLA_REQUIRED_HEADERS=
mozilla=:
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
- VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
- if ${need_xpcom_libs}; then
- VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
- if test "${SYS}" = "mingw32"; then
- dnl latest gecko sdk does not have embedstring
- if test -d "${real_mozilla_sdk}/embedstring/bin"
- then
- VLC_ADD_LIBS([mozilla],[-lembedstring])
- fi
- fi
- fi
+ VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include])
MOZILLA_SDK_PATH="${real_mozilla_sdk}"
if test -n "${CYGPATH}"; then
projects/mozilla/vlc.r
projects/mozilla/install.js
projects/mozilla/install.rdf
+ projects/mozilla/manifest.json
share/Makefile
compat/Makefile
src/Makefile
projects / vlc / blobdiff