From: Andre Noll <maan@systemlinux.org>
Date: Fri, 2 May 2014 20:07:24 +0000 (+0200)
Subject: build: Fix --with-gcrypt-headers and --with-vorbis-headers.
X-Git-Tag: v0.5.3~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=99d094f7464a783789cf3505b6ff57a3813839cd

build: Fix --with-gcrypt-headers and --with-vorbis-headers.

The configure script sets the autoconf output variable gcrypt_cppflags
according to the configure option --with-gcrypt-headers, but
gcrypt_cppflags is never used for the build.  Hence, if libgcrypt is
installed in a non-standard location, and that location is specified
as the argument to --with-gcrypt-headers, configure detects the gcrypt
header correctly, but the build fails nevertheless.

The same type of bug also exists for the --with-vorbis-headers option.

To fix this omission this patch sets both variables in Makefile.in
and references it in Makefile.real to compile the affected objects
with the correct flags.
---

diff --git a/Makefile.in b/Makefile.in
index 6762b449..a869c890 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,10 +34,12 @@ play_objs := @play_objs@
 
 speex_cppflags := @speex_cppflags@
 opus_cppflags := @opus_cppflags@
+vorbis_cppflags := @vorbis_cppflags@
 arch_cppflags := @arch_cppflags@
 osl_cppflags := @osl_cppflags@
 id3tag_cppflags := @id3tag_cppflags@
 openssl_cppflags := @openssl_cppflags@
+gcrypt_cppflags := @gcrypt_cppflags@
 ogg_cppflags := @ogg_cppflags@
 mad_cppflags := @mad_cppflags@
 faad_cppflags := @faad_cppflags@
diff --git a/Makefile.real b/Makefile.real
index 2973637e..99c87cda 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -178,6 +178,7 @@ $(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
 
 $(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
 $(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags)
 $(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
 $(object_dir)/compress_filter.o: CPPFLAGS += -O3
 $(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
@@ -187,6 +188,10 @@ $(object_dir)/aac_common.o \
 $(object_dir)/aac_afh.o \
 : CPPFLAGS += $(faad_cppflags)
 
+$(object_dir)/ogg_afh.o \
+$(object_dir)/oggdec_filter.o \
+: CPPFLAGS += $(vorbis_cppflags)
+
 $(object_dir)/spx_common.o \
 $(object_dir)/spxdec_filter.o \
 $(object_dir)/spx_afh.o \
diff --git a/configure.ac b/configure.ac
index 639da81f..16927c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,6 +440,7 @@ if test "$have_vorbis" = "yes" || \
 fi
 if test "$have_vorbis" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
+	AC_SUBST(vorbis_cppflags)
 	vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
 	AC_SUBST(vorbis_ldflags)
 fi