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])
])
])
+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
THREAD_LIB=""
fi
-dnl Check for cthreads under GNU/Hurd for instance
-AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
+VLC_ADD_LIBS([libvlc plugin],[${THREAD_LIB}])
-dnl
-dnl GNU portable threads
-dnl
-AC_ARG_ENABLE(pth,
- [ --enable-pth GNU Pth support (default disabled)],
- [ if test "${enable_pth}" = "yes"; then
- AC_CHECK_LIB(pth,pth_init)
- AC_MSG_CHECKING(for pth_init in pth.h)
- AC_EGREP_HEADER(pth_init,pth.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
- Define if <pth.h> defines pth_init)
- THREAD_LIB="-lpth"
- ],[
- AC_MSG_RESULT(no)
- ])
- fi
+AC_CHECK_LIB(rt, clock_nanosleep, [
+ VLC_ADD_LIBS([libvlc],[-lrt])
+ AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
+], [
+ dnl HP/UX port
+ AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlc],[-lrt])])
])
-dnl
-dnl State Threads
-dnl
-AC_ARG_ENABLE(st,
- [ --enable-st State Threads (default disabled)],
- [ if test "${enable_st}" = "yes"; then
- AC_CHECK_LIB(st,st_init)
- AC_MSG_CHECKING(for st_init in st.h)
- AC_EGREP_HEADER(st_init,st.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(ST_INIT_IN_ST_H, 1,
- Define if <st.h> defines st_init)
- THREAD_LIB="-lst"
- ],[
- AC_MSG_RESULT(yes)
- ])
- fi
+have_nanosleep=false
+AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
+ AC_CHECK_LIB(rt,nanosleep,
+ [VLC_ADD_LIBS([libvlc],[-lrt]) have_nanosleep=:],
+ [AC_CHECK_LIB(posix4,nanosleep,
+ [VLC_ADD_LIBS([libvlc],[-lposix4]) have_nanosleep=:])]
+ )
])
-
-VLC_ADD_LIBS([libvlc plugin],[${THREAD_LIB}])
-
-dnl Don't link with rt when using GNU-pth
-if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
- AC_CHECK_LIB(rt, clock_nanosleep, [
- VLC_ADD_LIBS([libvlc],[-lrt])
- AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
- ], [
- dnl HP/UX port
- AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlc],[-lrt])])
- ])
-
- have_nanosleep=false
- AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
- AC_CHECK_LIB(rt,nanosleep,
- [VLC_ADD_LIBS([libvlc],[-lrt]) have_nanosleep=:],
- [AC_CHECK_LIB(posix4,nanosleep,
- [VLC_ADD_LIBS([libvlc],[-lposix4]) have_nanosleep=:])]
- )
- ])
- if ${have_nanosleep}; then
- AC_DEFINE(HAVE_NANOSLEEP, 1,
- Define if nanosleep is available.)
- fi
+if ${have_nanosleep}; then
+ AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.])
fi
dnl Check for misc headers
dnl Check for threads library
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
+AC_CHECK_HEADERS(pthread.h kernel/scheduler.h kernel/OS.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Find where are the X headers and libraries
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_PLUGINS([caca])
VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`])
+ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h>
+ caca_event_t ev;]],
+ [[ev.type = 0;]]
+ )],
+ [],
+ [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])]
+ )
fi
fi
if test "${ac_cv_wx_headers}" = "yes"
then
VLC_ADD_PLUGINS([wxwidgets])
+ AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.])
ALIASES="${ALIASES} wxvlc"
fi
CPPFLAGS="${CPPFLAGS_save}"
(test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [
PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0],
[ VLC_ADD_PLUGINS([qt4])
+ AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc"
enableqt4=true
VLC_ADD_LIBS([qt4],[$QT4_LIBS])
[ --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
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