diff options
| author | Andre Noll <maan@systemlinux.org> | 2010-07-05 23:42:31 +0200 |
|---|---|---|
| committer | Andre Noll <maan@systemlinux.org> | 2011-02-20 12:40:17 +0100 |
| commit | 4d5a9b90c3e9cbdff019776d05792beb57fbfa31 (patch) | |
| tree | 37fdb7b5bdd5b9571d65bc3eae42600db94a74f2 | |
| parent | ffb82bb4f4e34c36653a06c8ae90c6e5db0fdcd8 (diff) | |
Make autoconf-2.66 happy.v0.3
This removes more lines than it adds and avoids the following warning;
configure.ac:689: warning: AC_DEFINE_UNQUOTED: `
configure.ac:689: result=
configure.ac:689: for i in $status_items; do
configure.ac:689: result="$result SI_$(echo $i | tr 'a-z' 'A-Z')' is not a valid preprocessor define value
(cherry picked from commit 5842e3e7f2aa17fe16cb806b4ba955ce1f25ce53)
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 74a3c742..f7b70c1c 100644 --- a/configure.ac +++ b/configure.ac @@ -619,28 +619,19 @@ offset seconds_total stream_start current_time audiod_uptime image_id lyrics_id duration directory lyrics_name image_name path hash channels last_played num_chunks chunk_time amplification" -# $1: prefix, $2: items -AC_DEFUN([make_enum_items], [$( - for i in $2; do - printf "$1_$(echo $i | tr 'a-z' 'A-Z'), " - done -)]) - -# $1: prefix, $2: items -AC_DEFUN([make_enum_array], [$( - for i in $2; do - printf "\"$i\", " - done -)]) - -AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, - make_enum_items(SI, $status_items), - [enum of all status items] -) -AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, - make_enum_array(SI, $status_items), - [char * array of all status items] -) +result= +for i in $status_items; do + result="$result SI_$(echo $i | tr 'a-z' 'A-Z'), " +done +AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, [$result], + [enum of all status items]) + +result= +for i in $status_items; do + result="$result \"$i\", " +done +AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result], + [char * array of all status items]) recv_objs="$recv_cmdline_objs $recv_errlist_objs" |
