Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
78d4a87f
Commit
78d4a87f
authored
Feb 02, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hopefully fix libgcrypt linking
parent
b1db6c5c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
25 deletions
+40
-25
configure.ac
configure.ac
+40
-25
No files found.
configure.ac
View file @
78d4a87f
...
...
@@ -5509,6 +5509,39 @@ fi
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
...
...
@@ -5516,9 +5549,7 @@ AC_ARG_ENABLE(gnutls,
[ --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"], [
...
...
@@ -5526,9 +5557,10 @@ AS_IF([test "${enable_gnutls}" != "no"], [
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"], [
...
...
@@ -5537,24 +5569,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [
])
])
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
...
...
@@ -5566,7 +5580,8 @@ then
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment