if test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"; then
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])
+ 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])
+ AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
fi
else
if test -d ${topdir}/extras/contrib/lib; then
case "${build_os}" in
cygwin|msys)
ac_executable_extensions=".exe"
- ;;
+ ;;
*)
- ;;
+ ;;
esac
dnl
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)], 1, [${LIBS_socket}])
+AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${LIBS_socket}])
dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro
dnl are
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlc],[-ldl]),
+ VLC_ADD_LIBS([libvlc realaudio],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlc],[-lsvld]))))
[
VLC_ADD_PLUGINS([notify])
VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS])
- VLC_ADD_LIBS(notify, [$NOTIFY_LIBS])
+ VLC_ADD_LIBS(notify, [$NOTIFY_LIBS])
],[
- AS_IF([test "${enable_notify}" = "yes"],[
- AC_MSG_WARN( libnotify not found) ])
+ AS_IF([test "${enable_notify}" = "yes"],[
+ AC_MSG_WARN( libnotify not found) ])
])
])
[ --enable-musicbrainz MusicBrainz support (default disabled) ])
AS_IF([test "${enable_musicbrainz}" = "yes"],[
PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
- [ VLC_ADD_PLUGINS([musicbrainz])
- VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS])
- VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ],
+ [ VLC_ADD_PLUGINS([musicbrainz])
+ VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS])
+ VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ],
[AC_MSG_WARN(MusicBrainz library not found)])
])
[ --enable-fribidi fribidi support (default enabled)])
if test "${enable_freetype}" != "no"
then
- FREETYPE_PATH="${PATH}"
- AC_ARG_WITH(freetype-config-path,
- [ --with-freetype-config-path=PATH freetype-config path (default search in \$PATH)],
- [ if test "${with_freetype_config_path}" != "no"
- then
- FREETYPE_PATH="${with_freetype_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
-
- if test "${FREETYPE_CONFIG}" != "no"
- then
- VLC_ADD_PLUGINS([freetype])
- VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
- VLC_ADD_LIBS([freetype],[`${FREETYPE_CONFIG} --libs`])
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([freetype],[-lxml2])
- fi
+ PKG_CHECK_MODULES(FREETYPE, freetype2,[
+ VLC_ADD_PLUGINS([freetype])
+ have_freetype=yes
+ VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
+ VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_LIBS([freetype skins2],[-lxml2])
+ fi
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
- [VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG])
+ [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
VLC_ADD_LIBS([freetype],[-lfontconfig])])
AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
- elif test "${enable_freetype}" = "yes"
- then
+ ],[
+ have_freetype=no
+ AS_IF([ test "${enable_freetype}" = "yes"],[
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
+ ])
])
- fi
+ ])
dnl fribidi support
if test "${enable_fribidi}" != "no"
then
- FRIBIDI_PATH="${PATH}"
- AC_ARG_WITH(fribidi-config-path,
- [ --with-fribidi-config-path=PATH fribidi-config path (default search in \$PATH)],
- [ if test "${with_fribidi_config_path}" != "no"
- then
- FRIBIDI_PATH="${with_fribidi_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no, ${FRIBIDI_PATH})
-
- if test "${FRIBIDI_CONFIG}" != "no"
- then
- VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
- VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
- VLC_ADD_LIBS([freetype], [`${FRIBIDI_CONFIG} --libs`])
- VLC_ADD_LIBS([skins2], [`${FRIBIDI_CONFIG} --libs`])
+ PKG_CHECK_MODULES(FRIBIDI, fribidi, [
+ VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
+ VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
+ ])
fi
- fi
fi
dnl
skins2_missing_lib="no"
dnl freetype
- if test "${FREETYPE_CONFIG}" != "no"; then
- VLC_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`])
- VLC_ADD_LIBS([skins2],[`${FREETYPE_CONFIG} --libs`])
- else
+ if test "${have_freetype}" != "yes"; then
skins2_missing_lib="yes"
if test "${enable_skins2}" = "yes"; then
AC_MSG_ERROR([Could not find freetype (required for skins2)])
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc"
enableqt4=true
- VLC_ADD_LIBS([qt4],[$QT4_LIBS])
+ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"; then
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
+ else
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS])
+ fi
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_ARG_WITH(,[Misc options:])
+dnl
+dnl libgcrypt
+dnl
+AC_ARG_ENABLE(libgcrypt,
+ [ --enable-libgcrypt libgcrypts support (default enabled)])
+
+GCRYPT_PATH="${PATH}"
+AC_ARG_WITH(libgcrypt-config-path,
+[ --with-libgcrypt-config-path=PATH libgcrypt-config path (default search in \$PATH)],
+ [ if test "${with_libgcrypt_config_path}" != "no"
+ then
+ GCRYPT_PATH="${with_libgcrypt_config_path}:${PATH}"
+ fi ])
+
+if test "${enable_libgcrypt}" != "no"
+then
+ 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"])
+AS_IF([test "${have_libgcrypt}" = "yes"],[
+ # look for libgcrypt-config
+ AC_PATH_PROG(GCRYPT_CONFIG, "libgcrypt-config", no, ${GCRYPT_PATH})
+ GCRYPT_CFLAGS=`${GCRYPT_CONFIG} --cflags`
+ GCRYPT_LIBS=`${GCRYPT_CONFIG} --libs`
+])
+
dnl
dnl TLS/SSL
dnl
[ --enable-gnutls gnutls TLS/SSL support (default enabled)])
AS_IF([test "${enable_gnutls}" != "no"], [
- PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.3.3], [have_gnutls="yes"], [have_gnutls="no"])
-
- AS_IF([test "${have_gnutls}" = "yes"], [
+ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.3.3], [
VLC_ADD_PLUGINS([gnutls])
VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
AS_IF([test "${SYS}" = "mingw32"], [
VLC_ADD_LIBS([gnutls], [-lz])
VLC_ADD_LIBS([gnutls], [${LTLIBINTL}])
])
- AC_CHECK_LIB([gcrypt], [gcry_control], [
- VLC_ADD_LIBS([gnutls], [-lgcrypt -lgpg-error])
- ], [], [-lgpg-error])
+ AS_IF([test "${have_libgcrypt}" = "yes"],[
+ VLC_ADD_LIBS([gnutls], ${GCRYPT_LIBS})
+ VLC_ADD_CFLAGS([gnutls], ${GCRYPT_CFLAGS})
+ ], [-lgpg-error])
VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
])
])
-dnl
-dnl libgcrypt
-dnl
-AC_ARG_ENABLE(libgcrypt,
- [ --enable-libgcrypt libgcrypts support (default enabled)])
-if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"
-then
- 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
dnl update checking system
dnl
then
AC_MSG_ERROR([libgcrypt is required for update checking system])
fi
- VLC_ADD_LIBS([libvlc], [-lgcrypt])
+ VLC_ADD_LIBS([libvlc], ${GCRYPT_LIBS})
+ VLC_ADD_CFLAGS([libvlc], ${GCRYPT_CFLAGS})
AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader])
VLC_ADD_LIBS([quicktime],[../../libs/loader/libloader.la -lpthread])
VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER])
- VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la -ldl -lpthread])
+ VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la])
])
dnl
projects / vlc / blobdiff