Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 20 Feb 2011 11:44:05 +0000 (12:44 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 20 Feb 2011 11:44:05 +0000 (12:44 +0100)
Conflicts:
configure.ac

1  2 
configure.ac

diff --cc configure.ac
@@@ -732,11 -633,6 +732,10 @@@ don
  AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
        [char * array of all status items])
  
 +AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
 +      [formats supported by para_server and para_afh])
 +
 +AC_SUBST(executables, add_para($executables))
  
  recv_objs="$recv_cmdline_objs $recv_errlist_objs"
  filter_objs="$filter_cmdline_objs $filter_errlist_objs"