Make autoconf-2.66 happy.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 04b0b6b45a86e0495befbe1cc7a897b789310e63..f7b70c1cba512ebbf0caff7cd961a5837731d228 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [0.3.5], maan@systemlinux.org)
+AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -498,7 +498,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
        ],
        [
                have_oss="no"
-               AC_MSG_WARN([no linux/soundcard.h $msg])
+               AC_MSG_WARN([no sys/soundcard.h $msg])
        ]
 )
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -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"