AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
-AC_INIT(vlc, 1.1.0-git)
+AC_INIT(vlc, 1.1.0-pre1)
VERSION_MAJOR="1"
VERSION_MINOR="1"
VERSION_REVISION="0"
-VERSION_EXTRA="-git"
+VERSION_EXTRA="-pre1"
PKGDIR="vlc"
AC_SUBST(PKGDIR)
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
esac
;;
darwin*)
+
+ dnl Force gcc "-arch" flag
+ ARCH_flag=""
+ case "${host}" in
+ i386*)
+ ARCH_flag="-arch i386"
+ ;;
+ ppc64*)
+ ARCH_flag="-arch ppc64"
+ ;;
+ ppc*)
+ ARCH_flag="-arch ppc"
+ ;;
+ x86_64*)
+ ARCH_flag="-arch x86_64"
+ ;;
+ esac
+
SYS=darwin
- CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}"
- LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names"; LDFLAGS="${LDFLAGS_save}"
+ CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CFLAGS="${CFLAGS_save}"
+ CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CXXFLAGS="${CXXFLAGS_save}"
+ CPPFLAGS_save="${CPPFLAGS_save} ${ARCH_flag}"; CPPFLAGS="${CPPFLAGS_save}"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"; OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names ${ARCH_flag}"; LDFLAGS="${LDFLAGS_save}"
VLC_ADD_LDFLAGS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
fi
+ AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
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 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 Check for getopt (always use builtin one on win32)
-if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
-need_getopt=:
-else
-need_getopt=false
-AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
-[ # FreeBSD has a gnugetopt library for this:
- AC_CHECK_LIB([gnugetopt],[getopt_long],
- [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support)
- VLC_ADD_LIBS([libvlccore],[-lgnugetopt])],
- [need_getopt=:])])
-fi
-AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
+dnl FreeBSD has a gnugetopt library for this:
+GNUGETOPT_LIBS=""
+AC_CHECK_FUNC(getopt_long,, [
+ AC_CHECK_LIB([gnugetopt],[getopt_long], [
+ GNUGETOPT_LIBS="-lgnugetopt"
+ ])
+])
+AC_SUBST(GNUGETOPT_LIBS)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-AC_TYPE_SIGNAL
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],[-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, [
+ AC_MSG_ERROR([Could not find the LUA byte compiler.])
+ ])
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
- CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+ if test -z "${CONTRIB_DIR}"; then
+ CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+ else
+ CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
+ fi
if test "${SYS}" = "solaris"; then
CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
fi
dnl
dnl OpenCV wrapper and example filters
dnl
-AC_ARG_ENABLE(opencv,
- [ --enable-opencv OpenCV (computer vision) filter (default disabled)])
-if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
-then
- AC_ARG_WITH(opencv-tree,
- [ --with-opencv-tree=PATH opencv tree for linking])
- if test "${SYS}" = "mingw32"
- then
- test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
- AC_MSG_CHECKING(for opencv in ${with_opencv_tree})
- if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \
- -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h
- then
- AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([opencv_wrapper])
- VLC_ADD_LIBS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
- VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
- AC_LANG_PUSH(C++)
- VLC_ADD_PLUGIN([opencv_example])
- VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
- VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
- AC_LANG_POP(C++)
- else
- dnl No opencv could be found, sorry
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
- fi
- else
- PKG_CHECK_MODULES(OPENCV, opencv,
- [
- VLC_ADD_PLUGIN([opencv_example opencv_wrapper])
- VLC_ADD_LIBS([opencv_example opencv_wrapper],[${OPENCV_LIBS}])
- VLC_ADD_CFLAGS([opencv_wrapper],[${OPENCV_CFLAGS}])
- VLC_ADD_CXXFLAGS([opencv_example],[${OPENCV_CFLAGS}])
- ],
- [AC_MSG_ERROR([libopencv not found!])]
- )
- fi
-fi
+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [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
VLC_ADD_PLUGIN([access_realrtsp])
fi
-AC_ARG_ENABLE(libsysfs,
- [ --enable-libsysfs Get user key from firewire connected iPod via libsysfs (default enabled)])
-
-AS_IF([test "${enable_libsysfs}" != "no"],[
- AC_CHECK_HEADERS(sysfs/libsysfs.h, [
- VLC_ADD_LIBS([mp4 mkv],[-lsysfs])
- ] )
-])
-
dnl
dnl skins2 module
dnl
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], [
SDL_PATH="${with_sdl_config_path}:${PATH}"
fi ])
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
- SDL_HEADER="SDL/SDL.h"
- SDL_IMAGE="SDL/SDL_image.h"
+ SDL_HEADER="SDL.h"
+ SDL_IMAGE="SDL_image.h"
if test "${SDL_CONFIG}" != "no"; then
PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
if test "${SYS}" != "darwin"; then
VLC_ADD_PLUGIN([vout_sdl aout_sdl])
fi
- VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags | sed 's,SDL,,'`])
+ VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags`])
VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`])
# SDL_image
AS_IF([ test "${enable_sdl_image}" != "no"],[
- AC_CHECK_HEADERS("SDL/SDL_image.h", [
+ AC_CHECK_HEADERS("SDL_image.h", [
VLC_ADD_PLUGIN([sdl_image])
AC_CHECK_LIB(png, png_set_rows, [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz])
AC_CHECK_LIB(jpeg, jpeg_start_decompress, [VLC_ADD_LIBS([sdl_image],[-ljpeg])])
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
dnl Pulseaudio module
dnl
PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
+VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
dnl
dnl Portaudio module
AS_IF([test "${enable_hildon}" = "yes"], [
PKG_CHECK_MODULES(HILDON, [hildon-1], [
PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2, [
- VLC_ADD_CFLAGS([hildon],[${HILDON_FM_CFLAGS} -IHAVE_HILDON_FM])
+ VLC_ADD_CFLAGS([hildon],[${HILDON_FM_CFLAGS} -DHAVE_HILDON_FM])
VLC_ADD_LIBS([hildon],[${HILDON_FM_LIBS}])
], [
AC_MSG_WARN(hildon-fm-2 not found)
dnl
dnl MTP devices services discovery
-PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto])
+PKG_ENABLE_MODULES_VLC([MTP], [mtp access_mtp], [libmtp >= 1.0.0], [MTP devices support], [auto])
dnl
dnl Lirc plugin
dnl
dnl OSSO (Maemo screen blanking) plugin
dnl
-PKG_ENABLE_MODULES_VLC([OSSO], [], [libosso], [Maemo support], [auto])
+PKG_ENABLE_MODULES_VLC([OSSO_SCREENSAVER], [], [libosso], [Maemo support], [auto])
AS_IF([test -f "/etc/maemo_version"], [
AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.])
])
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"], [
+ soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
+ AS_IF([test "x${soliddatadir}" = "x"], [
+ soliddatadir='$(datadir)/kde4/apps/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
+ 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=:
AC_PATH_PROGS(MOZILLA_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
dnl Stuff used by the program
dnl
VERSION_MESSAGE="${VERSION} ${CODENAME}"
-COPYRIGHT_MESSAGE="VLC media player - version ${VERSION_MESSAGE} - (c) ${COPYRIGHT_YEARS} the VideoLAN team"
+COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} the VideoLAN team"
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
projects / vlc / blobdiff