Commit 147305c6 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Restored Makefile.am and added a test for cross-compiling in configure.ac. The...

Restored Makefile.am and added a test for cross-compiling in configure.ac. The LIBGCRYPT macro didn't test for the cross-compile situation.
parent 52cc3eab
......@@ -12,11 +12,8 @@ NULL =
# - . should come before mozilla/bindings because the plugin needs libvlc.a
# - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it
SUBDIRS = intl po libs/loader
if HAVE_LIBGCRYPT
SUBDIRS += libs/srtp
endif
SUBDIRS += src modules . \
SUBDIRS = intl po libs/loader libs/srtp \
src modules . \
mozilla bindings activex share doc
DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
......
......@@ -5311,7 +5311,14 @@ AS_IF([test "${enable_gnutls}" != "no"], [
])
])
AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
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
AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment