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

diff --git a/Makefile.am b/Makefile.am
index 9cae27346892e8db36bc6c457a167eebc9014c7e..e4552a3bb8f2dcc93565e40245e1d45511a62d27 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 

diff --git a/configure.ac b/configure.ac
index 4a9fbf0fce30857784a45243023ca2b0946f8d8e..71299e5037528576c82841980bacb3d8eaaddbd4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"])