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}"
- VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation])
- VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation])
+ VLC_ADD_LDFLAGS([mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c])
- VLC_ADD_LDFLAGS([vlc],[-undefined dynamic_lookup])
+ VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
+ VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup])
+ VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
+ VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation])
+ VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
AC_ARG_ENABLE(macosx-defaults,
[ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)])
if test "x${enable_macosx_defaults}" != "xno"
enable_xvideo="no"
echo " Assuming --disable-xvideo"
- enable_libtool="no"
- echo " Assuming --disable-libtool"
- echo ""
fi
;;
*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
AC_CHECK_TOOL(WINDRES, windres, :)
- enable_libtool="no"
case "${host_os}" in
*mingw32*)
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
- CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm])
- VLC_ADD_LDFLAGS([vlc activex mozilla],[-mwindows])
- VLC_ADD_LDFLAGS([cdda vcdx cddax],[-lwinmm])
- VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync growl flac ts audioscrobbler],[-lws2_32])
+ VLC_ADD_LDFLAGS([vlc],[-mwindows])
+ VLC_ADD_LDFLAGS([activex mozilla],[-lgdi32])
+ VLC_ADD_LDFLAGS([cdda vcdx cddax sdl_image],[-lwinmm])
+ VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl flac ts audioscrobbler],[-lws2_32])
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)])
VLC_ADD_LDFLAGS([libvlc vlc],[-lws2 -e WinMainCRTStartup])
VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2])
dnl It's very bad, but our former custom system was worst
dnl -- Courmisch
dnl
+
+dnl override platform specific check for dependent libraries
+dnl otherwise libtool linking of shared libraries will
+dnl fail on anything other than pass_all.
+AC_CACHE_VAL(lt_cv_deplibs_check_method,
+ [lt_cv_deplibs_check_method=pass_all])
+
AC_DISABLE_STATIC
+AC_DISABLE_FAST_INSTALL
AC_LIBTOOL_DLOPEN
-dnl AC_LIBTOOL_WIN32_DLL - couldn't get libtool to work on Win32 so far
+AC_LIBTOOL_WIN32_DLL
m4_undefine([AC_PROG_F77])
m4_defun([AC_PROG_F77],[])
AC_PROG_LIBTOOL
-AC_ARG_ENABLE(libtool,
- [ --enable-libtool use libtool (default enabled)])
-AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"] )
+m4_undefine([AC_DEPLIBS_CHECK_METHOD])
+m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
+
+lt_cv_deplibs_check_method=pass_all
dnl
AC_ARG_WITH(macosx-sdk,
[ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no)
if test "${with_macosx_sdk}" != "no" ; then
- CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}"
- LDFLAGS_save="${LDFLAGS_save} -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"; LDFLAGS="${LDFLAGS_save}"
- export MACOSX_DEPLOYMENT_TARGET=10.4
+ CC="${CC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+ CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+ OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+ LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.4u.sdk"
+ CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}"
+ CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}"
MACOSX_DEPLOYMENT_TARGET="10.4"
+ export MACOSX_DEPLOYMENT_TARGET
fi
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fa fr fur gl he hi hu it ja ka ko lt lv ms my ne nl no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW"
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.16.1)
AM_GNU_GETTEXT
AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl"
- AS_IF([test "${enable_libtool}" != "no"], [
- INCLUDED_LIBINTL="${LTLIBINTL}"
- ],[
- INCLUDED_LIBINTL="${LIBINTL}"
- ])
], [
- AS_IF([test "${enable_libtool}" != "no"], [
- VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
- ], [
- VLC_ADD_LDFLAGS([libvlc vlc], [${LIBINTL}])
- ])
+ VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
])
-AC_SUBST(INCLUDED_LIBINTL)
dnl
dnl Iconv stuff
dnl
-if test "${SYS}" != "mingwce"; then
AS_IF([test "$am_cv_func_iconv" != "yes"],
[AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
-fi
VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
-AS_IF([test "${enable_libtool}" != "no"], [
- VLC_ADD_LDFLAGS([libvlc vlc],[${LIBICONV}])
-],[
- VLC_ADD_LDFLAGS([libvlc vlc],[${LTLIBICONV}])
-])
+VLC_ADD_LDFLAGS([libvlc],[${LTLIBICONV}])
dnl Check for the need to include the mingwex lib for mingw32
if test "${SYS}" = "mingw32"
VLC_SYMBOL_PREFIX
AC_SUBST(SYMPREF)
-AS_IF([test "${enable_libtool}" = "no"], [
-case "${SYS}" in
- mingw32|cygwin)
- VLC_ADD_CFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}])
- VLC_ADD_CXXFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}])
- VLC_ADD_OBJCFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}])
- ;;
- mingwce)
- ;;
- *)
- VLC_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC])
- VLC_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC])
- VLC_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC])
- VLC_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC])
- ;;
-esac
-])
-
dnl The -DSYS_FOO flag
CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}"
AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
+AS_IF([test "${SYS}" = "linux"], [
+ AC_CHECK_FUNCS(tee)
+])
+
dnl Check for setlocal and langinfo
AC_CHECK_FUNCS(setlocale)
AC_CHECK_HEADERS(langinfo.h)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise],[-lm])
+ VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
+ VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm])
AC_MSG_RESULT(no)])
dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
+AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
AC_CHECK_HEADERS([arpa/inet.h net/if.h netinet/in.h sys/socket.h netinet/udplite.h])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
-AC_CHECK_HEADERS(linux/version.h)
+AC_CHECK_HEADERS([linux/version.h linux/dccp.h])
AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
VLC_ADD_LDFLAGS([screensaver libvlc],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver libvlc],[$DBUS_CFLAGS])
dnl Check for dbus control interface
- AC_ARG_ENABLE(dbus-control, [ --enable-dbus-control D-BUS control interface (default disabled)])
- if test "${enable_dbus_control}" = "yes"
+ AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)])
+ if test "${enable_dbus_control}" != "no"
then
VLC_ADD_PLUGINS([dbus])
VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS])
VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
+ fi
+ dnl Check for Telepathy
+ AC_ARG_ENABLE(telepathy,
+ [ --enable-telepathy Telepathy Presence plugin through DBus(default enabled)])
+ if test "${enable_telepathy}" != "no"; then
+ VLC_ADD_PLUGINS([telepathy])
+ VLC_ADD_LDFLAGS([telepathy],[$DBUS_LIBS])
+ VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS])
fi],
if ${PKG_CONFIG} --exists dbus-1
fi
CFLAGS="${CFLAGS_save}"
-RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings old-style-definition missing-prototypes volatile-register-var])
+RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var])
RDC_PROG_CC_FLAGS_IFELSE([-pipe])
dnl This helps detect broken plugins with undefined symbols
[ac_cv_c_os],
[CFLAGS="${CFLAGS_save} -Os"
AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)])
-if test "${ac_cv_c_os}" != "no" -a "${host_cpu}" = "mipsel"; then
- CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os"
+if test "${ac_cv_c_os}" != "no"; then
+ CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -Os"
+else
+ AC_CACHE_CHECK([if \$CC accepts -O],
+ [ac_cv_c_o],
+ [CFLAGS="${CFLAGS_save} -O"
+ AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+ if test "${ac_cv_c_o}" != "no"; then
+ if test "${ac_cv_c_o3}" = "no"; then
+ CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -O"
+ fi
+ fi
fi
AC_CACHE_CHECK([if \$CC accepts -O3],
[ac_cv_c_o3],
[CFLAGS="${CFLAGS_save} -O3"
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
-if test "${ac_cv_c_o3}" != "no" -a "${host_cpu}" != "mipsel"; then
- CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
+if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3"
+else
+ AC_CACHE_CHECK([if \$CC accepts -O2],
+ [ac_cv_c_o2],
+ [CFLAGS="${CFLAGS_save} -O2"
+ AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
+ if test "${ac_cv_c_o2}" != "no"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2"
+ else
+ AC_CACHE_CHECK([if \$CC accepts -O],
+ [ac_cv_c_o],
+ [CFLAGS="${CFLAGS_save} -O"
+ AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+ if test "${ac_cv_c_o}" != "no"; then
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O"
+ fi
+ fi
fi
-AC_CACHE_CHECK([if \$CC accepts -O2],
- [ac_cv_c_o2],
- [CFLAGS="${CFLAGS_save} -O2"
- AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
-if test "${ac_cv_c_o2}" != "no" -a "${host_cpu}" != "mipsel"; then
- if test "${ac_cv_c_o3}" = "no"; then
- CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
- fi
- CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
-else
- AC_CACHE_CHECK([if \$CC accepts -O],
- [ac_cv_c_o],
- [CFLAGS="${CFLAGS_save} -O"
- AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
- if test "${ac_cv_c_o}" != "no" -a "${host_cpu}" != "mipsel"; then
- if test "${ac_cv_c_o3}" = "no"; then
- CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
- fi
- CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O"
- fi
+AC_CACHE_CHECK([if \$CC accepts -O0],
+ [ac_cv_c_o0],
+ [CFLAGS="${CFLAGS_save} -O0"
+ AC_TRY_COMPILE([],,ac_cv_c_o0=yes, ac_cv_c_o0=no)])
+if test "${ac_cv_c_o0}" != "no"; then
+ CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O0"
fi
dnl Check for -ffast-math
[CFLAGS="${CFLAGS_save} -ffast-math"
AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)])
if test "${ac_cv_c_fast_math}" != "no"; then
- CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math"
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -ffast-math"
fi
dnl Check for -funroll-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="${CFLAGS_OPTIM} -funroll-loops"
+ CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops"
fi
fi
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test "${ac_cv_c_omit_frame_pointer}" != "no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
- # these plugins do not compile without -fomit-frame-pointer, damn gcc!
- VLC_ADD_CFLAGS([i420_yuy2_mmx i420_yuy2_sse2],[-fomit-frame-pointer])
fi
dnl Check for -fvisibility=hidden
VLC_ADD_CFLAGS([libvlc plugin],[-fvisibility=hidden])
fi
+AM_CONDITIONAL(HAVE_COMPILER_EXPORT, [test "$SYS" = "mingw32" -o "${ac_cv_c_visibility_hidden}" != "no"])
+
dnl Check for -fvisibility-inlines-hidden (breaks x86_64 linkers)
dnl AC_LANG_PUSH(C++)
dnl AC_CACHE_CHECK([if \$CXX accepts -fvisibility-inlines-hidden],
dnl AC_LANG_POP(C++)
dnl Check for -mdynamic-no-pic
-AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic],
- [ac_cv_c_dynamic_no_pic],
- [CFLAGS="${CFLAGS_save} -mdynamic-no-pic"
- AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
-AS_IF([test "${enable_libtool}" = "no" && test "${ac_cv_c_dynamic_no_pic}" != "no"], [
- VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
- VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
-])
+dnl AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic],
+dnl [ac_cv_c_dynamic_no_pic],
+dnl [CFLAGS="${CFLAGS_save} -mdynamic-no-pic"
+dnl AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
+dnl AS_IF([test "${ac_cv_c_dynamic_no_pic}" != "no"], [
+dnl VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
+dnl VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
+dnl ])
dnl Check for Darwin plugin linking flags
AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error],
dnl Check for standard plugin linking flags
dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning)
-AS_IF([test "${enable_libtool}" = "no"], [
- AS_IF([test "${SYS}" = "beos"], [
- VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
- ], [
- AC_CACHE_CHECK([if \$CC accepts -shared],
- [ac_cv_ld_plugins],
- [CFLAGS="${CFLAGS_save} -shared"
- AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
- AS_IF([test "${ac_cv_ld_plugins}" != "no"], [
- VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
- ])
- ])
-])
+dnl AS_IF([test "${SYS}" = "beos"], [
+dnl VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
+dnl ], [
+dnl AC_CACHE_CHECK([if \$CC accepts -shared],
+dnl [ac_cv_ld_plugins],
+dnl [CFLAGS="${CFLAGS_save} -shared"
+dnl AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
+dnl AS_IF([test "${ac_cv_ld_plugins}" != "no"], [
+dnl VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
+dnl ])
+dnl ])
dnl Check for variadic macros
AC_CACHE_CHECK([for variadic cpp macros],
dnl
VLC_ADD_PLUGINS([dummy logger memcpy])
VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
-VLC_ADD_PLUGINS([cvdsub svcdsub spudec telx subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise extract sharpen])
+VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub mpeg_audio lpcm a52 dts cinepak flac])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving])
VLC_ADD_PLUGINS([converter_fixed mono])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
-VLC_ADD_PLUGINS([playlist export sgimb nsc xtag])
-VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify puzzle colorthres])
+VLC_ADD_PLUGINS([spatializer])
+VLC_ADD_PLUGINS([playlist export nsc xtag])
+VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image logo magnify puzzle colorthres])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
VLC_ADD_PLUGINS([access_http access_mms access_ftp])
VLC_ADD_PLUGINS([converter_float a52tospdif dtstospdif audio_format])
fi
-dnl
-dnl Switch to enable a version of VLC where most modules will be builtin
-dnl
-AC_ARG_ENABLE(mostly-builtin,
-[ --enable-mostly-builtin most modules will be built-in (default disabled)])
-if test "${enable_mostly_builtin}" = "yes"; then
- VLC_ADD_BUILTINS([${PLUGINS}])
- PLUGINS=""
-fi
-
dnl
dnl Some plugins aren't useful on some platforms
dnl
fi
if test "${SYS}" = "darwin"; then
VLC_ADD_PLUGINS([quartztext])
- VLC_ADD_LDFLAGS([quartztext],[-framework Carbon -framework ApplicationServices])
+ VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,Carbon,-framework,ApplicationServices])
fi
dnl
#MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext"
THREEDNOW_MODULES="memcpy3dn"
SSE_MODULES=""
-SSE2_MODULES="i420_yuy2_sse2"
+SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2"
ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec"
#ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec"
[ac_cv_c_mmx_intrinsics=no])])
if test "${ac_cv_c_mmx_intrinsics}" != "no"; then
AC_DEFINE(HAVE_MMX_INTRINSICS, 1, Define if MMX intrinsics are available.)
- VLC_ADD_CFLAGS([i420_rgb_mmx],[-mmmx])
+ VLC_ADD_CFLAGS([${MMX_MODULES}],[-mmmx])
fi
dnl Check for fully workin SSE2 intrinsics
[ac_cv_c_sse2_intrinsics=no])])
if test "${ac_cv_c_sse2_intrinsics}" != "no"; then
AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, Define if SSE2 intrinsics are available.)
- dnl VLC_ADD_CFLAGS([i420_rgb_sse2],[-msse2])
+ VLC_ADD_CFLAGS([${SSE2_MODULES}],[-msse2])
fi
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
AC_CACHE_CHECK([if linker needs -framework vecLib],
[ac_cv_ld_altivec],
- [LDFLAGS="${LDFLAGS_vlc} -framework vecLib"
+ [LDFLAGS="${LDFLAGS_vlc} -Wl,-framework,vecLib"
AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
LDFLAGS="${LDFLAGS_save}"
])
if test "${ac_cv_ld_altivec}" != "no"; then
- VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib])
+ VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib])
fi
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}"="i486" -o "${host_cpu}" = "x86_64"
then
ARCH="${ARCH} mmx"
- VLC_ADD_BUILTINS([${ACCEL_MODULES}])
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}])
fi
if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64"
then
ARCH="${ARCH} sse sse2"
- VLC_ADD_BUILTINS([${ACCEL_MODULES}])
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}])
fi
dnl
dnl
AC_ARG_ENABLE(optimizations,
[ --disable-optimizations disable compiler optimizations (default enabled)])
-test "${enable_optimizations}" != "no" && enable_optimizations="yes"
+if test "${enable_optimizations}" != "no"; then
+ if test "${enable_optimize_memory}" = "yes"; then
+ enable_optimizations="size"
+ else
+ enable_optimizations="speed"
+ fi
+fi
dnl
dnl AltiVec acceleration
AC_ARG_ENABLE(altivec,
[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)],
[ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec";
- VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ],
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ],
[ if test "${host_cpu}" = "powerpc"; then ARCH="${ARCH} altivec";
- VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ])
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ])
dnl
dnl Debugging mode
fi
AC_ARG_ENABLE(switcher,
- [ --enable-switcher Stream-out switcher plugin (default disabled)])
+ [ --enable-switcher Stream-out switcher plugin (default disabled)])
dnl Check for libshout
AC_ARG_ENABLE(shout,
[AC_MSG_WARN(libshout library not found)])
fi
-dnl Lua playlist demux
-AC_ARG_ENABLE(luaplaylist,
- [ --enable-lua lua playlist demux plugin (default enabled)])
+dnl Lua modules
+AC_ARG_ENABLE(lua,
+ [ --enable-lua lua playlist and metafetcher plugins (default enabled)])
if test "${enable_lua}" != "no"
then
PKG_CHECK_MODULES(LUA, lua5.1,
])
if test "x${have_lua}" = "xyes" ; then
AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library])
- VLC_ADD_PLUGINS([luaplaylist])
- VLC_ADD_LDFLAGS([luaplaylist],[$LUA_LIBS])
- VLC_ADD_CFLAGS([luaplaylist],[$LUA_CFLAGS])
+ VLC_ADD_PLUGINS([lua])
+ VLC_ADD_LDFLAGS([lua],[$LUA_LIBS])
+ VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
fi
fi
dnl Taglibplugin
dnl
AC_ARG_ENABLE(taglib,
- [ --enable-taglib Taglib support (default disabled) ])
- AS_IF([test "${enable_taglib}" = "yes"],[
+ [ --disable-taglib Taglib support (default enabled) ])
+ AS_IF([test "${enable_taglib}" != "no"],[
PKG_CHECK_MODULES(TAGLIB, taglib,
- [ VLC_ADD_PLUGINS([taglib])
- VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS])
+ [ AC_DEFINE( HAVE_TAGLIB, 1, [Define if you have taglib plugin built] )
+ VLC_ADD_PLUGINS([taglib])
+ VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS -lz])
VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],
[AC_MSG_WARN(TagLib library not found)])
])
if test "${with_videodev2}" != "no" -a -n "${with_videodev2}"
then
AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h])
- else
- AC_DEFINE(VIDEODEV2_H_FILE, <linux/videodev2.h>, [Location of videodev2.h])
fi
AC_CACHE_CHECK([for new linux/videodev2.h],
[new_linux_videodev2_h],
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include VIDEODEV2_H_FILE],
+ [AC_TRY_COMPILE([
+ #include <sys/types.h>
+ # ifdef VIDEODEV2_H_FILE
+ # include VIDEODEV2_H_FILE
+ # else
+ # include <linux/videodev2.h>
+ # endif
+ ],
[struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ],
new_linux_videodev2_h=yes,
new_linux_videodev2_h=no)])
if test "${SYS}" = "darwin"
then
VLC_ADD_PLUGINS([vcd cdda])
- VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-framework IOKit -framework CoreFoundation])
+ VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([vcdx cddax cdda],[-liconv])
fi
if test "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [
VLC_ADD_PLUGINS([screen])
- VLC_ADD_LDFLAGS([screen],[-framework ApplicationServices])
+ VLC_ADD_LDFLAGS([screen],[-Wl,-framework,ApplicationServices])
])
elif test "${SYS}" = "mingw32"; then
VLC_ADD_PLUGINS([screen])
dnl
dnl libid3tag support (FIXME!!! doesn't work with new input)
dnl
-AC_CHECK_HEADERS(id3tag.h, [
- AC_CHECK_HEADERS(zlib.h, [
- VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
- VLC_ADD_PLUGINS([id3tag])]) ])
+AC_ARG_ENABLE( id3tag,
+ [ --disable-id3tag id3tag metadata reader plugin (default enabled)])
+AS_IF([test "${enable_id3tag}" != "no"], [
+ AC_CHECK_HEADERS(id3tag.h, [
+ AC_CHECK_HEADERS(zlib.h, [
+ VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
+ VLC_ADD_PLUGINS([id3tag])
+ ])
+ ])
+])
dnl
dnl ffmpeg decoder/demuxer plugin
VLC_ADD_LDFLAGS([ffmpeg],[-lz])
fi])
+ AC_ARG_WITH(ffmpeg-amrnb,
+ [ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support],
+ [
+ if test "$with_ffmpeg_amrnb" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lamrnb])
+ fi])
+
+ AC_ARG_WITH(ffmpeg-amrwb,
+ [ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support],
+ [
+ if test "$with_ffmpeg_amrwb" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lamrwb])
+ fi])
+
+ AC_ARG_WITH(ffmpeg-x264,
+ [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support],
+ [
+ if test "$with_ffmpeg_x264" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lx264])
+ fi])
+
+ AC_ARG_WITH(ffmpeg-a52,
+ [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support],
+ [
+ if test "$with_ffmpeg_a52" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-la52])
+ fi])
+
dnl
dnl test for --with-ffmpeg-tree
dnl
fi
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
-
- if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_zlib}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lz])
- fi
- fi
- if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_mp3lame}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
- fi
- fi
- if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_faac}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lfaac])
- fi
- fi
- if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_dts}" != "yes"; then
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
- AC_CHECK_LIB(dts_pic, dts_free,
- [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ],
- [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
- LDFLAGS="${LDFLAGS_save}"
- fi
- fi
- if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lvorbis -lvorbisenc])
- fi
- if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lfaad])
- fi
- if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore])
- fi
-
+
+ dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc
+ PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH"
+ PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR"
+ export PKG_CONFIG_PATH=""
+ export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}"
+
+ PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [
+ VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS})
+ VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})]
+ ,[])
+ AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[
+ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}"
+ ],[
+ unset PKG_CONFIG_PATH
+ ])
+ AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[
+ export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}"
+ ],[
+ unset PKG_CONFIG_LIBDIR
+ ])
+
VLC_ADD_BUILTINS([ffmpeg])
if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi
- if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a])
- VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavutil])
- fi
-
- VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
- VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec])
-
- if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
- AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.])
- VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a])
- VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat])
- fi
if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then
AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.])
PKG_CHECK_MODULES(SWSCALE, libswscale,[
VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}])
VLC_ADD_LDFLAGS([ffmpeg],[${SWSCALE_LIBS}])
- AC_CHECK_HEADERS(ffmpeg/swscale.h)
+ AC_CHECK_LIB(swscale, sws_getContext,
+ [AC_CHECK_HEADERS(ffmpeg/swscale.h)],[])
],[ true ])
VLC_RESTORE_FLAGS
],[
else
AC_CHECK_HEADERS(QuickTime/QuickTime.h,
[ VLC_ADD_BUILTINS([quicktime])
- VLC_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon])
+ VLC_ADD_LDFLAGS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon])
], [ AC_MSG_ERROR([cannot find QuickTime headers]) ])
fi
fi
dnl skins2 module
dnl
AC_ARG_ENABLE(libtar,
- [ --enable libtar support for skins2 (default enabled)])
+ [ --enable-libtar support for skins2 (default enabled)])
AS_IF([test "${enable_libtar}" != "no"],[
AC_CHECK_HEADERS(libtar.h, [
] )
])
-
dnl
dnl A52/AC3 decoder plugin
dnl
fi
else
AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
- VLC_ADD_LDFLAGS([flac],[-lFLAC])
+ VLC_ADD_LDFLAGS([flac],[-lFLAC -logg])
],[])
fi
fi
fi
fi
+dnl
+dnl Teletext Modules
+dnl vbi decoder plugin (using libzbvi)
+dnl telx module
+dnl uncompatible
+dnl
+AC_ARG_ENABLE(zvbi,
+ [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)])
+AC_ARG_ENABLE(telx,
+ [ --enable-telx, Teletext decoding module (conflicting with zvbi) (default disabled)])
+
+AS_IF( [test "${enable_zvbi}" != "no"],[
+ AS_IF( [test "${enable_telx}" = "yes"],[
+ AC_MSG_ERROR([The zvbi and telx modules are uncompatibles. Disable the other if you enable one.])
+ ],[
+ PKG_CHECK_MODULES(ZVBI,
+ zvbi-0.2 >= 0.2.25,
+ [
+ VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
+ VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
+ VLC_ADD_PLUGINS([zvbi])
+ AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
+ ],[
+ AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
+ enable_telx="yes"
+ ])
+ ])
+ ])
+AS_IF( [test "${enable_telx}" = "yes"],[
+ VLC_ADD_PLUGINS([telx])
+ ])
+
dnl
dnl CMML plugin
dnl
else
dnl OS X special case (no GL/gl.h but OpenGL/gl.h)
VLC_ADD_PLUGINS([opengl])
- VLC_ADD_LDFLAGS([opengl],[-framework OpenGL])
+ VLC_ADD_LDFLAGS([opengl],[-Wl,-framework,OpenGL])
fi
fi
VLC_ADD_PLUGINS([freetype])
VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_LDFLAGS([freetype],[-lxml2])]
+ fi
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG])
VLC_ADD_LDFLAGS([freetype],[-lfontconfig])])
AC_CHECK_HEADERS(Carbon/Carbon.h,
- [VLC_ADD_LDFLAGS([freetype],[-framework Carbon])])
+ [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
elif test "${enable_freetype}" = "yes"
then
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
dnl
dnl DirectFB module
+dnl try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
+dnl TODO: support for static linking
dnl
AC_ARG_ENABLE(directfb,
[ --enable-directfb DirectFB support (default disabled)])
-if test "${enable_directfb}" = "yes"
-then
- if test "${with_directfb}" = "no"
- then
- AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
- if test "${have_directfb}"= "true"
- then
+AC_ARG_WITH(directfb,
+ [ --with-directfb=PATH path to DirectFB headers and libraries])
+
+if test "${enable_directfb}" = "yes"; then
+ have_directfb="false"
+ CPPFLAGS_mydirectfb=
+ LDFLAGS_mydirectfb=
+ if test "${with_directfb}" != "no" -a -n "${with_directfb}"; then
+ dnl Trying the given location
+ CPPFLAGS_save=${CPPFLAGS}
+ LDFLAGS_save=${LDFLAGS}
+
+ CPPFLAGS_new="-I${with_directfb}/include -D_REENTRANT -D_GNU_SOURCE"
+ LDFLAGS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/"
+ LDFLAGS_new="${LDFLAGS_new} -L${with_directfb}/src/.libs/"
+
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_new}"
+ LDFLAGS="${LD_FLAGS} ${LDFLAGS_new}"
+
+ dnl FIXME: too obscure
+ AC_CHECK_HEADER([directfb.h], [
+ AC_CHECK_LIB([direct],[direct_initialize], [
+ AC_CHECK_LIB([fusion], [fusion_enter], [
+ AC_CHECK_LIB([directfb], [DirectFBInit], have_directfb="true", have_directfb="false")
+ ], have_directfb="false")
+ ], have_directfb="false")
+ ], have_directfb="false")
+
+ dnl Restore flags
+ CPPFLAGS="${CPPFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+
+ if test "${have_directfb}" = "true"; then
+ LDFLAGS_mydirectfb="${LDFLAGS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread"
+ CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
+ fi
+ else
+ dnl Look for directfb-config
+ AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH})
+ if test "${DIRECTFB_CONFIG}" != "no"; then
+ CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`"
+ LDFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --libs`"
+ have_directfb="true"
+ else
+ dnl Trying with pkg-config
+ PKG_CHECK_MODULES(DIRECTFB, directfb, [
+ CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}"
+ LDFLAGS_mydirectfb="${DIRECTFB_LIBS}"
+ have_directfb="true"
+ ], [have_directfb="false"])
+ fi
+ fi
+ if test "${have_directfb}" = "true"; then
VLC_ADD_PLUGINS([directfb])
- VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
- VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT])
- else
- AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb])
+ VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}])
+ VLC_ADD_LDFLAGS([directfb],[${LDFLAGS_mydirectfb}])
+ else
+ AC_MSG_ERROR([cannot find directfb headers and/or libraries ])
fi
- else
- CPPFLAGS_save="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include"
- AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
- CPPFLAGS="${CPPFLAGS_save}"
- AC_ARG_WITH(directfb,
- [ --with-directfb=PATH path to directfb],
- [ if test "${with_directfb}" != "no" -a -n "${with_directfb}"
- then
- VLC_ADD_PLUGINS([directfb])
- VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT])
- VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
- fi ],
- [ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include]) ])
- fi
fi
+
+
dnl
dnl GGI module
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_BUILTINS([auhal])
- VLC_ADD_LDFLAGS([auhal],[-framework CoreAudio -framework AudioUnit -framework AudioToolbox])
+ VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
ALIASES="${ALIASES} svlc"
VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
- VLC_ADD_LDFLAGS([skins2],[-framework Carbon])
+ VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon])
else if test "${skins2_missing_lib}" = "no"; then
VLC_ADD_PLUGINS([skins2])
[if test "${enable_macosx}" = "yes"
then
VLC_ADD_PLUGINS([access_eyetv])
- VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit])
+ VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation])
+ VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL])
+ VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit])
VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS( [minimal_macosx],[-fobjc-exceptions] )
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
- VLC_ADD_PLUGINS([access_eyetv])
- VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation])
+ [VLC_ADD_PLUGINS([access_eyetv])
+ VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation])
VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit])
- VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
- )])
+ VLC_ADD_BUILTINS([minimal_macosx])
+ VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL])
+ VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit])
+ VLC_ADD_OBJCFLAGS([macosx],[-fobjc-exceptions])
+ VLC_ADD_OBJCFLAGS([minimal_macosx],[-fobjc-exceptions])
+ ])])
CFLAGS=$ORIGCFLAGS
dnl
dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
- [ --enable-ncurses ncurses interface support (default disabled)],
- [if test "${enable_ncurses}" = "yes"; then
- VLC_ADD_PLUGINS([ncurses])
- VLC_ADD_LDFLAGS([ncurses],[-lncurses])
+ [ --disable-ncurses ncurses interface support (default enabled)],
+ [if test "${enable_ncurses}" != "no"; then
+ AC_CHECK_HEADERS(ncursesw/curses.h,
+ [AC_CHECK_LIB( ncursesw, mvprintw,
+ [VLC_ADD_PLUGINS([ncurses])
+ VLC_ADD_LDFLAGS([ncurses],[-lncursesw])])
+ ],
+ [AC_CHECK_HEADER(curses.h,
+ [AC_CHECK_LIB(ncurses, mvprintw,
+ [VLC_ADD_PLUGINS([ncurses])
+ VLC_ADD_LDFLAGS([ncurses],[-lncurses])]
+ )]
+ )]
+ )
fi])
dnl
AS_IF([test "${have_gnutls}" = "yes"], [
VLC_ADD_PLUGINS([gnutls])
VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
+ AS_IF([test "${SYS}" = "mingw32"], [
+ dnl pkg-config --libs gnutls omits these
+ VLC_ADD_LDFLAGS([gnutls], [-lz])
+ VLC_ADD_LDFLAGS([gnutls], [${LTLIBINTL}])
+ ])
+ AC_CHECK_LIB([gcrypt], [gcry_control], [
+ VLC_ADD_LDFLAGS([gnutls], [-lgcrypt -lgpg-error])
+ ], [], [-lgpg-error])
VLC_ADD_LDFLAGS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)])
])
])
- AC_CHECK_LIB([gcrypt], [gcry_control], [
- VLC_ADD_LDFLAGS([gnutls], [-lgcrypt])
- ])
])
-dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
-dnl it and looks for libgcrypt headers in the wrong place.
-if test "${host_cpu}" = "${build_cpu}"
+dnl
+dnl libgcrypt
+dnl
+AC_ARG_ENABLE(libgcrypt,
+ [ --enable-libgcrypt libgcrypts support (default enabled)])
+if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"i
then
- AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
-else
- AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no")
+ dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
+ dnl it and looks for libgcrypt headers in the wrong place.
+ if test "${host_cpu}" = "${build_cpu}"
+ then
+ AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+ else
+ AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no")
+ fi
fi
AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
dnl latest gecko sdk does not have embedstring
if test -d "${real_mozilla_sdk}/embedstring/bin"
then
- VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at])
+ VLC_ADD_LDFLAGS([mozilla],[-lembedstring])
fi
fi
fi
AC_LANG_POP(C++)
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
-dnl Tests for Osso and Xsp
-AC_CHECK_LIB(osso, osso_display_blanking_pause,[
- PKG_CHECK_MODULES(GLIB2, glib-2.0, [
- VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
- VLC_ADD_LDFLAGS([x11],[-losso])
+ dnl Tests for Osso and Xsp
+if test "${enable_x11}" != "no" &&
+ (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
+ test "${enable_x11}" = "yes"); then
+ AC_CHECK_LIB(osso, osso_display_blanking_pause,[
+ PKG_CHECK_MODULES(GLIB2, glib-2.0, [
+ VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+ VLC_ADD_LDFLAGS([x11],[-losso])
+ ])
])
-])
-AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
- VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
- VLC_ADD_LDFLAGS([x11],[-lXsp])
-])
+ AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
+ VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
+ VLC_ADD_LDFLAGS([x11],[-lXsp])
+ ])
+fi
dnl
dnl Mediacontrol Python bindings
VLC_ADD_LDFLAGS([test3],[-lobjc])
VLC_ADD_PLUGINS([${TESTS}])
- #VLC_ADD_BUILTINS([${TESTS}])
fi
dnl
dnl
dnl Plugin and builtin checks
dnl
-builtin_support=false
-plugin_support=:
-
-dnl Support for plugins - this must be AT THE END
-AC_ARG_ENABLE(plugins,
- [ --disable-plugins make all plugins built-in (default plugins enabled)],
- [if test "${enable_plugins}" = "no"
- then
- plugin_support=false
- fi])
+plugin_support=yes
dnl Automagically disable plugins if there is no system support for
dnl dynamically loadable files (.so, .dll, .dylib).
dnl don't forget vlc-win32 still can load .dll as plugins
-if test "${ac_cv_have_plugins}" = "no"
-then
- echo "*** Your system doesn't have plugin support. All plugins will be built"
- echo "statically."
- plugin_support=false
-fi
+AS_IF([test "${ac_cv_have_plugins}" = "no"], [
+ AC_MSG_WARN([*** No plugin support! Building statically! ***])
+ plugin_support=no
+])
-AS_IF([${plugin_support}], [
+AS_IF([test "${enable_shared}" = "no"], [
+ plugin_support=no
+])
+
+AS_IF([test "${plugin_support}" != "no"], [
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
-], [
- VLC_ADD_BUILTINS([${PLUGINS}])
- PLUGINS=""
])
+AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
+
+dnl Temporary(?) hack for plugins/builtins transition
+VLC_ADD_PLUGINS([${BUILTINS}])
+BUILTINS=""
+
dnl
dnl Pic and shared libvlc stuff
dnl
-AS_IF([test "${SYS}" = "mingw32" || test "${enable_libtool}" != "no"], [
- AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
- VLC_ADD_PLUGINS([${BUILTINS}])
- AS_IF([test "${SYS}" = "mingw32"], [
- FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
- VLC_ADD_CPPFLAGS([libvlc],[-DDLL_EXPORT])
- ])
- BUILTINS=""
-], [
- LDFLAGS_vlc="${LDFLAGS_vlc} ${LDFLAGS_libvlc}"
- FILE_LIBVLC_DLL=""
+AS_IF([test "${SYS}" = "mingw32"], [
+ FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
])
- dnl Import conditional variables generated by bootstrap
-VLC_CONDITIONALS
-
dnl
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
-dnl Old definitions for version-dependant plugins
-dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
-dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
-dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
-
dnl New definitions with value matching 0.9.0 release
module_symbol="0_9_0b"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_SUBST(WINE_SDK_PATH)
AC_SUBST(LIBEXT)
AC_SUBST(AM_CPPFLAGS)
-AC_SUBST(ALL_LINGUAS)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(FILE_LIBVLC_DLL)
-dnl Import substitutions generated by bootstrap
-VLC_SUBSTS
-
dnl Create vlc-config.in
VLC_OUTPUT_VLC_CONFIG_IN
modules/audio_filter/channel_mixer/Makefile
modules/audio_filter/converter/Makefile
modules/audio_filter/resampler/Makefile
+ modules/audio_filter/spatializer/Makefile
modules/audio_mixer/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/ffmpeg/Makefile
+ modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/xvmc/Makefile
modules/control/Makefile
modules/gui/beos/Makefile
modules/gui/pda/Makefile
modules/gui/macosx/Makefile
+ modules/gui/minimal_macosx/Makefile
modules/gui/qnx/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
+ modules/misc/lua/Makefile
modules/misc/memcpy/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
vlc aliases :${ALIASES}
plugins/bindings :${PLUGINS_BINDINGS}
+You can check which modules have been enabled
+with \`./vlc-config --list plugin'.
You can tune the compiler flags in vlc-config.
To build vlc and its plugins, type \`./compile' or \`make'.
"
projects / vlc / blobdiff