From: Andre Noll <maan@systemlinux.org>
Date: Thu, 29 Aug 2013 20:35:54 +0000 (+0000)
Subject: build: Replace $extras by per-executable variable.
X-Git-Tag: v0.5.1~1^2~65
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=4ec04c614fc2e835a2d106ee61482ba0c729f5e6;p=paraslash.git

build: Replace $extras by per-executable variable.

This changes the summary at the end of the configure script to
output one line per optional executable rather than to list all
optional executables in a single line.

The new build_xxx variables are also useful to compute the set of
all $all_errlist_objects at a single location, which will be done
in a subsequent patch.
---

diff --git a/configure.ac b/configure.ac
index ff32efe3..47817e82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,7 @@ fi
 AC_CHECK_HEADER(osl.h, [], have_osl=no)
 AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
 if test "$have_osl" = "no"; then
+	build_server="no"
 	AC_MSG_WARN([libosl not found, can not build para_server.
 Download libosl at
 	http://systemlinux.org/~maan/osl
@@ -239,7 +240,7 @@ or execute
 	git clone git://git.tuebingen.mpg.de/osl
 	])
 else
-	extras="$extras server"
+	build_server="yes"
 	executables="$executables server"
 	server_cmdline_objs="add_cmdline(server)"
 	server_errlist_objs="
@@ -486,9 +487,10 @@ AC_CHECK_LIB([ncursesw], [initscr],
 )
 if test "$have_curses" = "yes"; then
 	AC_SUBST(curses_cppflags)
-	extras="$extras gui"
+	build_gui="yes"
 	executables="$executables gui"
 else
+	build_gui="no"
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -990,7 +992,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### fade
 if test -n "$mixers"; then
-	extras="$extras fade"
+	build_fade="yes"
 	executables="$executables fade"
 	all_errlist_objs="$all_errlist_objs fade"
 	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
@@ -1023,6 +1025,7 @@ if test -n "$mixers"; then
 	AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers)
 	mixer_summary="supported mixers:: $mixers, default: $default_mixer"
 else
+	build_fade="no"
 	AC_MSG_WARN([no mixer support])
 	mixer_summary="para_fade: no"
 fi
@@ -1340,6 +1343,9 @@ audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
 filters: $filters
 writers: $writers
-optional executables: $extras
+
 $mixer_summary
+para_server: $build_server
+para_gui: $build_gui
+para_fade: $build_fade
 ])