if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm])
- VLC_ADD_LDFLAGS([vlc activex mozilla],[-mwindows])
+ 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
m4_undefine([AC_DEPLIBS_CHECK_METHOD])
m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
-AC_ARG_ENABLE(libtool,
- [ --enable-libtool use libtool (default enabled)])
-AS_IF([test "x{enable_libtool}" = "xno"], [
- AC_MSG_WARN([Disabling libtool is strongly discouraged. There are known bugs.])
-])
-
lt_cv_deplibs_check_method=pass_all
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}"
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],
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([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])
AS_IF([test "${SYS}" = "mingw32"], [
dnl pkg-config --libs gnutls omits these
VLC_ADD_LDFLAGS([gnutls], [-lz])
- AS_IF([test "${enable_libtool}" != "no"], [
- VLC_ADD_LDFLAGS([gnutls], [${LTLIBINTL}])
- ], [
- VLC_ADD_LDFLAGS([gnutls], [${LIBINTL}])
- ])
+ VLC_ADD_LDFLAGS([gnutls], [${LTLIBINTL}])
])
AC_CHECK_LIB([gcrypt], [gcry_control], [
VLC_ADD_LDFLAGS([gnutls], [-lgcrypt -lgpg-error])
[AC_CHECK_HEADERS(olectl.h,
[ VLC_ADD_CPPFLAGS([activex],[-DUNICODE -D_UNICODE -D_MIDL_USE_GUIDDEF_])
VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
- VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi -lgdi32])
+ VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi])
AC_CHECK_HEADERS(objsafe.h,
VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
[
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
dnl
dnl Pic and shared libvlc stuff
dnl
-AS_IF([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"
- ])
- BUILTINS=""
-], [
- LDFLAGS_vlc="${LDFLAGS_vlc} ${LDFLAGS_libvlc}"
- FILE_LIBVLC_DLL=""
- VLC_ADD_CPPFLAGS([libvlc],[-DDLL_EXPORT])
+VLC_ADD_PLUGINS([${BUILTINS}])
+AS_IF([test "${SYS}" = "mingw32"], [
+ FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
])
+BUILTINS=""
dnl
dnl Stuff used by the program
projects / vlc / blobdiff