VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract],[-lm])
])
AC_CHECK_LIB(m,ceil,[
- VLC_ADD_LIBS([hotkeys mosaic swscale_omap],[-lm])
+ VLC_ADD_LIBS([access_imem hotkeys mosaic swscale_omap],[-lm])
])
AC_CHECK_LIB(m,exp,[
VLC_ADD_LIBS([gaussianblur],[-lm])
VLC_ADD_LIBS([live555],[-lws2_32])
fi
- VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
+ VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
- VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
+ VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
])
AC_ARG_ENABLE(merge-ffmpeg,
-[ --enable-merged-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
+[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
enable_merge_ffmpeg="no"
])
AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])])
])
-dnl
-dnl XVMC module
-dnl (disabled by default except on win32)
-dnl
-AC_ARG_ENABLE(xvmc,
- [ --enable-xvmc XvMC support (default disabled)],, [
- enable_xvmc="no"
-])
-AS_IF([test "${enable_xvmc}" != "no"], [
- AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [
- AS_IF([test "${enable_libmpeg2}" = "yes"], [
- VLC_ADD_PLUGIN([xvmc])
- VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv ${LIBMPEG2_LIBS}])
- VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS} ${LIBMPEG2_CFLAGS}])
- ], [
- AC_MSG_ERROR([XVideo-MotionCompensation needs libmpeg2 which isn't available])
- ])
- ], [
- AC_MSG_ERROR([XVideo-MotionCompensation extension not found!])
- ])
-])
-
dnl End of Xlib tests
CPPFLAGS="${CPPFLAGS_save}"
AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
+dnl
+dnl SQLite
+dnl
+AC_ARG_WITH(sqlite,
+ [ --with-sqlite=PATH sqlite path linking])
+if test "${SYS}" != "darwin"; then
+ PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3], [sqlite3], [auto])
+else
+ if test "${enable_sqlite}" != "no"
+ then
+ AC_CHECK_HEADERS(sqlite3.h, [
+ VLC_ADD_PLUGIN([sqlite])
+ if test "${with_sqlite}" != "no" -a -n "${with_sqlite}"; then
+ AC_MSG_CHECKING(existence of sqlite directory in ${with_sqlite})
+ real_sqlite="`cd ${with_sqlite} 2>/dev/null && pwd`"
+ if test -z "${real_sqlite}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_sqlite}])
+ fi
+ VLC_ADD_CFLAGS([sqlite],[-I${with_sqlite}/include])
+ VLC_ADD_LIBS([sqlite], [-L${with_sqlite}/lib -lsqlite3])
+ AC_MSG_RESULT(yes)
+ else
+ VLC_ADD_LIBS([sqlite], [-lsqlite3])
+ fi
+ AC_DEFINE([SQLITE_MODULE], 1, [Define if you want to use SQLite module]) ],
+ AC_MSG_ERROR([sqlite3 is required for sqlite module]) )
+ fi
+fi
+AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
+
dnl
dnl Endianness check
AC_LANG_POP(C++)
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
-dnl Tests for Xsp
-AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
- VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP])
- VLC_ADD_LIBS([xvmc glx],[-lXsp])
-])
-
dnl
dnl test plugins
dnl
VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
+ extras/package/win32/spad.nsi
extras/package/win32/vlc.win32.nsi
extras/package/macosx/Info.plist
extras/package/macosx/Resources/English.lproj/InfoPlist.strings
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/wmafixed/Makefile
- modules/codec/xvmc/Makefile
modules/control/Makefile
modules/control/http/Makefile
modules/control/globalhotkeys/Makefile