if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
- CONTRIB_DIR=${topdir}/extras/contrib
+ CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+ if ! test -d "$CONTRIB_DIR"
+ then
+ gccmachine=`$CC -dumpmachine`
+ CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+ fi
fi
AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
AS_IF([test -d ${CONTRIB_DIR}/lib],[
- AS_IF([test "`grep HOST ${CONTRIB_DIR}/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"],[
- if test "${with_contrib}" = "yes"; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
- else
- AC_MSG_RESULT([no])
- AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
- fi
- ],[
AC_MSG_RESULT([yes])
+ AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include"
export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
fi
+ ],[
+ AC_MSG_RESULT([no])
])
- ],[
- AC_MSG_RESULT([no])
- ])
])
dnl
dnl Set default values
VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([libvlc],[-Wl,-undefined,dynamic_lookup])
- VLC_ADD_LDFLAGS([avcodec avformat swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
enable_skins2="no"
echo " Assuming --disable-skins2"
- enable_x11="no"
- echo " Assuming --disable-x11"
enable_xcb="no"
echo " Assuming --disable-xcb"
- enable_glx="no"
- echo " Assuming --disable-glx"
- enable_xvideo="no"
- echo " Assuming --disable-xvideo"
fi
dnl
dnl Check for Mac OS X SDK settings
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract],[-lm])
AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
VLC_ADD_PLUGIN([growl])
VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
+ VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] )
])
]
)
VLC_ADD_PLUGIN([avformat])
VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+
+ VLC_ADD_PLUGIN([access_avio])
+ VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
], [
VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
dnl
AC_PATH_XTRA()
-AC_ARG_ENABLE(x11,
- [ --enable-x11 X11 support with Xlib (default enabled)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
- enable_x11="yes"
- ], [
- enable_x11="no"
- ])
-])
-
-CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
-
-AS_IF([test "${enable_x11}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h)
-
-dnl Check for DPMS
- AC_CHECK_HEADERS(X11/extensions/dpms.h, [
- AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h)
- AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(DPMSINFO_IN_DPMS_H, 1,
- Define if <X11/extensions/dpms.h> defines DPMSInfo.)
- ],[
- AC_MSG_RESULT(no)
- ])
- ],,[
- #include <X11/Xlib.h>
- ])
-])
-
-dnl
-dnl GLX module
-dnl (enabled by default except on win32)
-dnl
-AC_ARG_ENABLE(glx,
- [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
- enable_glx="$enable_x11"
-])
-AS_IF([test "${enable_glx}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h)
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
- [[#if !defined(HAVE_X11_XLIB_H) || !defined(HAVE_GL_GLU_H) || !defined(HAVE_GL_GLX_H)
- choke me
- #endif]]),
- [
- VLC_ADD_PLUGIN([glx])
- VLC_ADD_LIBS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
- VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
- ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])])
-])
-
-dnl End of Xlib tests
-CPPFLAGS="${CPPFLAGS_save}"
-
dnl
dnl X C Bindings modules
])
AS_IF([test "${enable_glx}" != "no"], [
PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb])
- PKG_CHECK_MODULES(GLU, [glu])
-
+ PKG_CHECK_MODULES(GL, [gl],, [
+ AC_CHECK_HEADER([GL/gl.h], [
+ GL_CFLAGS=""
+ GL_LIBS="-lGL"
+ ], [
+ AC_MSG_ERROR([GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx.])
+ ])
+ ])
VLC_ADD_PLUGIN([xcb_glx])
])
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
dnl
dnl MacOS X video output/gui modules
dnl
AC_ARG_ENABLE(macosx,
- [ --enable-macosx MacOS X support (default enabled on MacOS X)])
+ [ --enable-macosx full Mac OS X support (default enabled on Mac OS X)])
if test "x${enable_macosx}" = "xyes"
then
VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
- VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle])
- VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle])
+ VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([access_eyetv])
VLC_ADD_PLUGIN([qtcapture])
VLC_ADD_PLUGIN([opengllayer])
fi
+dnl
+dnl MacOS X video output/gui modules
+dnl
+AC_ARG_ENABLE(macosx-minimal,
+ [ --enable-macosx-minimal minimal Mac OS X support (default disabled)])
+if test "x${enable_macosx_minimal}" = "xyes"
+then
+ VLC_ADD_LDFLAGS([minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
+ VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,Carbon])
+ VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,CoreServices])
+ VLC_ADD_LDFLAGS([minimal_macosx], [-Wl,-framework,AGL])
+
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
+ VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
+ VLC_ADD_OBJCFLAGS([minimal_macosx opengllayer], [-fobjc-exceptions] )
+
+ VLC_ADD_PLUGIN([qtcapture])
+ VLC_ADD_PLUGIN([minimal_macosx])
+ VLC_ADD_PLUGIN([opengllayer])
+fi
+
dnl
dnl QNX RTOS module
dnl
modules/video_output/Makefile
modules/video_output/msw/Makefile
modules/video_output/qte/Makefile
- modules/video_output/x11/Makefile
modules/visualization/Makefile
modules/visualization/visual/Makefile
])
projects / vlc / blobdiff