From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Jun 2014 20:24:50 +0000 (+0200)
Subject: build: convert vorbis detection to new macros.
X-Git-Tag: v0.5.5~44^2~14
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=aa95c5c31ea1d990cd02907e5537eef477a539d3;p=paraslash.git

build: convert vorbis detection to new macros.

Also introduces NEED_OGG_OBJECTS() and NEED_VORBIS_OBJECTS(). These
two macros are identical at the moment, but they will start to differ
when opus and speex will be converted.
---

diff --git a/afh_common.c b/afh_common.c
index edfc8d1d..f77880ba 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -42,7 +42,7 @@ static struct audio_format_handler afl[] = {
 	},
 	{
 		.name = "ogg",
-#ifdef HAVE_OGGVORBIS
+#if defined(HAVE_OGG) && defined(HAVE_VORBIS)
 		.init = ogg_init,
 #endif
 	},
diff --git a/configure.ac b/configure.ac
index 0cecd25d..20b8b52c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,11 +323,22 @@ AC_CHECK_HEADERS([ogg/ogg.h], [], [HAVE_OGG=no])
 AC_CHECK_LIB([ogg], [ogg_stream_init], [], [HAVE_OGG=no])
 LIB_SUBST_FLAGS(ogg)
 UNSTASH_FLAGS
+######################################################################### vorbis
+STASH_FLAGS
+LIB_ARG_WITH([vorbis], [-lvorbis -lvorbisfile])
+HAVE_VORBIS=yes
+AC_CHECK_HEADERS([vorbis/codec.h], [], [HAVE_VORBIS=no])
+AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [HAVE_VORBIS=no])
+LIB_SUBST_FLAGS(vorbis)
+UNSTASH_FLAGS
+
+AC_DEFUN([NEED_OGG_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_VORBIS" = 'yes'
+}])
+AC_DEFUN([NEED_VORBIS_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_VORBIS" = 'yes'
+}])
 ####################################################### ogg/vorbis/speex/opus
-AC_ARG_WITH(vorbis_headers, [AS_HELP_STRING(--with-vorbis-headers=dir,
-	[look for vorbis headers also in dir])])
-AC_ARG_WITH(vorbis_libs, [AS_HELP_STRING(--with-vorbis-libs=dir,
-	[look for vorbis libs also in dir])])
 AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir,
 	[look for speex headers also in dir])])
 AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
@@ -337,27 +348,9 @@ AC_ARG_WITH(opus_headers, [AS_HELP_STRING(--with-opus-headers=dir,
 AC_ARG_WITH(opus_libs, [AS_HELP_STRING(--with-opus-libs=dir,
 	[look for opus libs also in dir])])
 
-have_vorbis="yes"
 have_speex="yes"
 have_opus="yes"
 if test "$HAVE_OGG" = 'yes'; then
-	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LDFLAGS="$LDFLAGS"
-	OLD_LIBS="$LIBS"
-	# vorbis
-	if test -n "$with_vorbis_headers"; then
-		vorbis_cppflags="-I$with_vorbis_headers"
-		CPPFLAGS="$CPPFLAGS $vorbis_cppflags"
-	fi
-	if test -n "$with_vorbis_libs"; then
-		vorbis_libs="-L$with_vorbis_libs"
-		LDFLAGS="$LDFLAGS $vorbis_libs"
-	fi
-	AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
-	AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
-	CPPFLAGS="$OLD_CPPFLAGS"
-	LDFLAGS="$OLD_LDFLAGS"
-	LIBS="$OLD_LIBS"
 
 	# speex
 	OLD_CPPFLAGS="$CPPFLAGS"
@@ -396,28 +389,10 @@ if test "$HAVE_OGG" = 'yes'; then
 	LIBS="$OLD_LIBS"
 else
 	AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
-	have_vorbis="no"
 	have_speex="no"
 	have_opus="no"
 fi
 
-msg="support in para_server/para_filter/para_afh"
-if test "$have_vorbis" = "yes" || \
-		test "$have_speex" = "yes" || \
-		test "$have_opus" = "yes"; then
-	AC_SUBST(ogg_cppflags)
-	ogg_ldflags="$ogg_libs -logg"
-	if test "$OSTYPE" = "Darwin"; then
-		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
-	fi
-	AC_SUBST(ogg_ldflags)
-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
 if test "$have_speex" = "yes"; then
 	AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
 	AC_SUBST(speex_cppflags)
@@ -831,14 +806,8 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 	if test "$have_gcrypt" = "yes"; then
 		server_errlist_objs="$server_errlist_objs gcrypt"
 	fi
-	if test "$have_vorbis" = "yes" || \
-			test "$have_speex" = "yes" || \
-			test "$have_opus" = "yes"; then
-		server_errlist_objs="$server_errlist_objs ogg_afh_common"
-	fi
-	if test "$have_vorbis" = "yes"; then
-		server_errlist_objs="$server_errlist_objs ogg_afh"
-	fi
+	NEED_OGG_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh_common"
+	NEED_VORBIS_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh"
 	if test "$have_speex" = "yes"; then
 		server_errlist_objs="$server_errlist_objs spx_afh spx_common"
 	fi
@@ -960,10 +929,10 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
 		audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
 	fi
-	if test "$have_vorbis" = "yes"; then
+	NEED_VORBIS_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 		audiod_audio_formats="$audiod_audio_formats ogg"
-	fi
+	}
 	if test "$have_speex" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
 		audiod_audio_formats="$audiod_audio_formats spx"
@@ -1128,11 +1097,10 @@ filter_cmdline_objs="
 	prebuffer_filter
 	sync_filter
 "
-
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
 	filters="$filters oggdec"
 	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-fi
+}
 if test "$have_speex" = "yes"; then
 	filters="$filters spxdec"
 	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
@@ -1204,14 +1172,10 @@ recv_errlist_objs="
 	mp3_afh
 	version
 "
-if test "$have_vorbis" = "yes" || \
-		test "$have_speex" = "yes" || \
-		test "$have_opus" = "yes"; then
+if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || test "$have_opus" = 'yes'; then
 	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
 fi
-if test "$have_vorbis" = "yes"; then
-	recv_errlist_objs="$recv_errlist_objs ogg_afh"
-fi
+NEED_VORBIS_OBJECTS && recv_errlist_objs="$recv_errlist_objs ogg_afh"
 if test "$have_speex" = "yes"; then
 	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 fi
@@ -1244,15 +1208,13 @@ afh_errlist_objs="
 	version
 	ggo
 "
-if test "$have_vorbis" = "yes" || \
-		test "$have_speex" = "yes" || \
-		test "$have_opus" = "yes"; then
+if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || test "$have_opus" = 'yes'; then
 	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 fi
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs ogg_afh"
 	audio_format_handlers="$audio_format_handlers ogg"
-fi
+}
 if test "$have_speex" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
 	audio_format_handlers="$audio_format_handlers spx"
@@ -1325,14 +1287,12 @@ if test "$have_core_audio" = "yes"; then
 	play_errlist_objs="$play_errlist_objs osx_write ipc"
 	play_cmdline_objs="$play_cmdline_objs osx_write"
 fi
-if test "$have_vorbis" = "yes" || \
-		test "$have_speex" = "yes" || \
-		test "$have_opus" = "yes"; then
+if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || test "$have_opus" = 'yes'; then
 	play_errlist_objs="$play_errlist_objs ogg_afh_common"
 fi
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
-fi
+}
 if test "$have_speex" = "yes"; then
 	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
 fi