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}"
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])
then
echo ""
echo "Building with Mac OS X defaults:"
+ with_macosx_version_min="10.4"
+ echo " Assuming --with-macosx-version-min=10.4"
enable_macosx="yes"
echo " Assuming --enable-macosx"
enable_faad="yes"
enable_xvideo="no"
echo " Assuming --disable-xvideo"
- with_macosx_sdk="no"
- echo " Compiling without SDK usage"
+ with_macosx_sdk=""
+ echo " Compiling with default SDK"
fi
if test ".`uname -p`" = ".i386"; then
dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code
echo " Assuming --disable-sse (due to a bug in ld)"
fi
fi
+ dnl
+ dnl Check for Mac OS X SDK settings
+ dnl
+ AC_ARG_WITH(macosx-sdk,
+ [ --with-macosx-sdk=DIR compile using the SDK in DIR])
+ if test "${with_macosx_sdk}" != "" ; then
+ CC="${CC} -isysroot ${with_macosx_sdk}"
+ CXX="${CXX} -isysroot ${with_macosx_sdk}"
+ OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
+ LD="${LD} -syslibroot ${with_macosx_sdk}"
+ fi
+ AC_ARG_WITH(macosx-version-min,
+ [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
+ if test "${with_macosx_version_min}" != "" ; then
+ CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
+ CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
+ OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
+ LD="${LD} -macosx_version_min=${with_macosx_version_min}"
+ CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CFLAGS="${CFLAGS_save}"
+ CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; OBJCFLAGS="${OBJCFLAGS_save}"
+ MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
+ export MACOSX_DEPLOYMENT_TARGET
+ fi
;;
*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
AC_CHECK_TOOL(WINDRES, windres, :)
lt_cv_deplibs_check_method=pass_all
-dnl
-dnl Check for Mac OS X SDK settings
-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
- 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
-else
- MACOSX_DEPLOYMENT_TARGET="10.4"
- export MACOSX_DEPLOYMENT_TARGET
-fi
-
dnl
dnl Gettext stuff
dnl
])
])
+AC_CHECK_HEADERS(zlib.h, [
+ VLC_ADD_LIBS([access_http],[-lz])
+])
+
dnl Check for socklen_t
AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
[AC_TRY_COMPILE(
dnl we purposedly make the test fail on Windows
LIBS_save="${LIBS}"
AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.])
-AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${LIBS_socket}])
+AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)], 1, [${LIBS_socket}])
dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro
dnl are
if test "${enable_hal}" != "no"
then
PKG_CHECK_MODULES(HAL, hal >= 0.5.0,
- [ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API])
- AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] )
+ [ AC_DEFINE( HAVE_HAL_1, 1 , [Define if you have the new HAL library API])
+ AC_DEFINE( HAVE_HAL, 1, [Define if you have the HAL library] )
VLC_ADD_PLUGINS([hal probe_hal])
VLC_ADD_LIBS([libvlc hal probe_hal],[$HAL_LIBS])
VLC_ADD_CFLAGS([libvlc hal probe_hal],[$HAL_CFLAGS])],
dnl No hal 0.5 Test for 0.2
[ PKG_CHECK_MODULES( HAL, hal >= 0.2.97,
- [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
+ [AC_DEFINE(HAVE_HAL, 1, [Define if you have the HAL library])
VLC_ADD_PLUGINS([hal])
VLC_ADD_LIBS([libvlc hal],[$HAL_LIBS])
VLC_ADD_CFLAGS([libvlc hal],[$HAL_CFLAGS])],
[ --enable-shout libshout output plugin (default disabled)])
if test "${enable_shout}" = "yes"; then
PKG_CHECK_MODULES(SHOUT, shout >= 2.1,
- [AC_DEFINE(HAVE_SHOUT, [], [Define if you have the libshout library])
+ [AC_DEFINE(HAVE_SHOUT, 1, [Define if you have the libshout library])
VLC_ADD_PLUGINS([access_output_shout])
VLC_ADD_LIBS([access_output_shout],[$SHOUT_LIBS])
VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])],
])
])
if test "x${have_lua}" = "xyes" ; then
- AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library])
+ AC_DEFINE(HAVE_LUA, 1, [Define if you have the lua library])
VLC_ADD_PLUGINS([lua])
VLC_ADD_LIBS([lua],[$LUA_LIBS])
VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
AC_MSG_ERROR([cannot find libsmbclient headers])
fi ])
AC_CHECK_MEMBER([struct _SMBCCTX.close_fn],
- AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], [1], [Define if samba has _SMBCCTX.close_fn]),,
+ AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),,
[#include <libsmbclient.h>])
fi
then
PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2,
have_libcdio=yes
- AC_DEFINE(HAVE_LIBCDIO, [],
+ AC_DEFINE(HAVE_LIBCDIO, 1,
[Define if you have libcdio 0.78.2 or greater installed]),
[AC_MSG_WARN(CD Reading and information library not found)])
PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
[have_libvcdinfo=yes
- AC_DEFINE(HAVE_VCDINFO, [],
+ AC_DEFINE(HAVE_VCDINFO, 1,
[Define if you have libvcdinfo 0.7.22 or greater installed])],
[AC_MSG_WARN(VCD information library not found)])
fi
then
if test "$have_libcdio" = "yes"
then
- AC_DEFINE(HAVE_CDDAX, [], [Define for the audio CD plugin using libcdio])
+ AC_DEFINE(HAVE_CDDAX, 1, [Define for the audio CD plugin using libcdio])
VLC_ADD_LIBS([cddax],[$LIBCDIO_LIBS])
VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
VLC_ADD_PLUGINS([cddax])
if test "$enable_libcddb" != "no"; then
PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [
HAVE_LIBCDDB=yes
- AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+ AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed])
VLC_ADD_LIBS([cddax],[$LIBCDDB_LIBS])
VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
],
if test "$have_libvcdinfo" = "yes"
then
- AC_DEFINE(HAVE_VCDX, [],
+ AC_DEFINE(HAVE_VCDX, 1,
[Define for the VCD plugin using libcdio/libvcdinfo])
VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
if test "$enable_libcddb" != "no"; then
PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [
HAVE_LIBCDDB=yes
- AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+ AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed])
VLC_ADD_LIBS([cdda],[$LIBCDDB_LIBS])
VLC_ADD_CFLAGS([cdda],[$LIBCDDB_CFLAGS])
],:
VLC_ADD_LIBS([png],[-lpng -lz])
VLC_ADD_PLUGINS([png])
VLC_ADD_PLUGINS([osdmenu osd_parser])
- AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
+ AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
])
dnl
dnl MacOS X video output/gui modules
dnl
-AC_ARG_ENABLE(macosx, [--enable-macosx MacOS X support (default enabled on MacOS X)])
+AC_ARG_ENABLE(macosx,
+ [ --enable-macosx MacOS X support (default enabled on MacOS X)])
if test "x${enable_macosx}" = "xyes"
then
- VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation])
+ VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,Cocoa])
VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon])
then
PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3,
[PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6,
- [AC_DEFINE(HAVE_AVAHI_06, [], [Define if you have avahi-client 0.6 or greater])],)
- AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library])
+ [AC_DEFINE(HAVE_AVAHI_06, 1, [Define if you have avahi-client 0.6 or greater])],)
+ AC_DEFINE(HAVE_AVAHI_CLIENT, 1, [Define if you have the avahi-client library])
VLC_ADD_LIBS([bonjour access_output_http],[$BONJOUR_LIBS])
VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS])
VLC_ADD_PLUGINS([bonjour]) ],
AC_MSG_ERROR([libgcrypt is required for update checking system])
fi
VLC_ADD_LIBS([libvlc], [-lgcrypt])
- AC_DEFINE([UPDATE_CHECK], [1], [Define if you want to use the VLC update mechanism])
+ AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
dnl
MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h"
fi
if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then
- VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt])
+ AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
+ VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
fi
VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}])
AC_CHECK_LIB(Xt,XtStrings,
[
VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
- VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
+ VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE -lXpm])
],
[],
- [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
+ [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm]
])
+ AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
LDFLAGS="${LDFLAGS_save}"
fi
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_REVISION)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure])
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])
modules/access/mms/Makefile
modules/access/cdda/Makefile
modules/access/rtsp/Makefile
+ modules/access/v4l2/Makefile
modules/access/vcd/Makefile
modules/access/vcdx/Makefile
modules/access/screen/Makefile
projects / vlc / blobdiff