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"
- elif test "${SYS}" = "beos"; then
- export LIBRARY_PATH="${CONTRIB_DIR}/lib:$LIBRARY_PATH"
- export BELIBRARIES="${CONTRIB_DIR}/lib:$BELIBRARIES"
fi
],[
AC_MSG_RESULT([no])
hpux*)
SYS=hpux
;;
- beos)
- SYS=beos
- CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
- VLC_ADD_CXXFLAGS([beos],[])
- VLC_ADD_LIBS([vlc libvlccore logger],[-lbe])
- VLC_ADD_LIBS([dvdnav dvdread],[-ldl])
- VLC_ADD_LIBS([filesystem],[-lpoll])
- LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
- dnl Check for BONE
- if test -f /boot/beos/system/lib/libbind.so; then
- VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp netsync sap libvlccore growl_udp],[-lbind -lsocket])
- else
- VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp netsync sap libvlccore growl_udp],[-lnet])
- fi
- ;;
*)
SYS="${host_os}"
;;
esac
-AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
])
+AC_ARG_ENABLE(static-modules,
+ [ --enable-static-modules Allow module to be linked statically. This produces a non working vlc.])
+AS_IF([test "${enable_static_modules}" = yes], [
+ enable_shared="no"
+ enable_static="yes"
+ VLC_DEFAULT_PLUGIN_TYPE="builtin"
+ echo "*** WARNING: Building modules as static. VLC will not work."
+], [
+ VLC_DEFAULT_PLUGIN_TYPE="plugin"
+])
+
+AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE)
+
dnl
dnl Gettext stuff
dnl
fi
fi
-# BeOS style
-if test "${ac_cv_have_plugins}" = "no"; then
- AC_CHECK_HEADERS(image.h)
- AC_CHECK_FUNCS(load_add_on,
- [AC_DEFINE(HAVE_DL_BEOS, 1, [Define if you have the BeOS dl])
- ac_cv_have_plugins=yes])
-fi
-
# Only test for dlopen() if the others didn't work
LIBDL=""
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
fi
dnl Check for -funroll-loops
-dnl Disabled on BeOS because BeOS' gcc is buggy and may crash with it
-if test "${SYS}" != "beos"
-then
- AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
- [ac_cv_c_unroll_loops],
- [CFLAGS="${CFLAGS_save} -funroll-loops"
- AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
- if test "${ac_cv_c_unroll_loops}" != "no"; then
- CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops"
- fi
+AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
+ [ac_cv_c_unroll_loops],
+ [CFLAGS="${CFLAGS_save} -funroll-loops"
+ AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
+if test "${ac_cv_c_unroll_loops}" != "no"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops"
fi
dnl Check for -fomit-frame-pointer
dnl dvdread module: check for libdvdread
dnl
dnl prepend -ldvdcss on OS that need it
-AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
+AS_CASE(["${SYS}"], [mingw32|darwin], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
dnl
if test "${enable_dvdnav}" != "no"
then
dnl prepend -ldvdcss on OS that need it
- AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
+ AS_CASE(["${SYS}"], [mingw32|darwin], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
DVDNAV_PATH="${PATH}"
AC_ARG_WITH(dvdnav-config-path,
VLC_ADD_LIBS([screen],[-lgdi32])
elif test "${SYS}" = "mingwce"; then
CPPFLAGS="${CPPFLAGS_save}"
- elif test "${SYS}" = "beos"; then
- VLC_ADD_PLUGIN([screen])
- VLC_ADD_CXXFLAGS([screen],[])
- VLC_ADD_LIBS([screen],[-lbe])
fi
fi
])
need_xid_provider="no"
+have_xcb="no"
AS_IF([test "${enable_xcb}" != "no"], [
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
+ have_xcb="yes"
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
- VLC_ADD_PLUGIN([xscreensaver xcb_x11 xcb_window xcb_screen xcb_apps])
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
])
- VLC_ADD_PLUGIN([xdg_screensaver])
])
+AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
AC_ARG_ENABLE(glx,
[ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
VLC_ADD_LDFLAGS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation])
fi
+dnl
+dnl QuartzText vout module (iOS/Mac OS)
+dnl
+AC_ARG_ENABLE(macosx-quartztext,
+ [ --enable-macosx-quartztext Mac OS X quartz text module (default enabled on Mac OS X)])
+if test "x${enable_macosx_quartztext}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes")
+then
+ VLC_ADD_PLUGIN([quartztext])
+ VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices])
+fi
+
dnl
dnl Windows DirectX module
dnl
then
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
then
+ VLC_ADD_LIBS([directx],[-luser32])
AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGIN([directx aout_directx])
VLC_ADD_LIBS([directx],[-lgdi32])
dnl
AC_ARG_ENABLE(skins2,
[AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default
- enabled except on MacOSX, BeOS and WinCE)])])
+ enabled except on MacOSX and WinCE)])])
if test "${enable_skins2}" != "no" ||
- (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
+ (test "${SYS}" != "darwin" &&
test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then
dnl test for the required libraries
ALIASES="${ALIASES} svlc"
VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
- VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
+ VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32])
else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then
VLC_ADD_PLUGIN([skins2])
fi fi fi
fi
AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
- (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
+ (test "${SYS}" != "darwin" &&
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
dnl
fi
AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
+dnl
+dnl media library
+dnl
+AC_ARG_ENABLE(media-library, [--enable-media-library media library (default auto)])
+if test "${enable_media_library}" != "no"; then
+ if test "${enable_sqlite}" != "yes"; then
+ if test "${enable_media_library}" == "yes"; then
+ AC_MSG_ERROR([SQLite module is required for the media library])
+ else
+ AC_MSG_WARN([SQLite module is required for the media library])
+ fi
+ else
+ AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library])
+ VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY")
+ VLC_ADD_PLUGIN([media_library])
+ fi
+fi
dnl
dnl Endianness check
modules/misc/osd/Makefile
modules/misc/stats/Makefile
modules/misc/xml/Makefile
+ modules/media_library/Makefile
modules/mux/Makefile
modules/mux/mpeg/Makefile
modules/packetizer/Makefile
projects / vlc / blobdiff