From: Andre Noll Date: Mon, 5 Jul 2010 21:42:31 +0000 (+0200) Subject: Make autoconf-2.66 happy. X-Git-Tag: v0.4.4~6^2 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=5842e3e7f2aa17fe16cb806b4ba955ce1f25ce53;p=paraslash.git Make autoconf-2.66 happy. 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 --- diff --git a/configure.ac b/configure.ac index f0c27872..8fbf49a6 100644 --- a/configure.ac +++ b/configure.ac @@ -675,28 +675,19 @@ lyrics_id duration directory lyrics_name image_name path hash channels last_played num_chunks chunk_time amplification artist title year album comment" -# $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 -)]) +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]) -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 \"$i\", " +done +AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result], + [char * array of all status items]) AC_SUBST(executables, add_para($executables))