[PATCH 1/2] rename src/server/config.c and src/server/config.h to fix an autotools conflict

[Christopher Brannon]

Andrei Kholodnyi <andrei.kholodnyi at gmail.com> writes:

> diff --git a/src/api/c/Makefile.am b/src/api/c/Makefile.am
> index d763655..5c8129f 100644
> --- a/src/api/c/Makefile.am
> +++ b/src/api/c/Makefile.am
> @@ -1,8 +1,7 @@
>  
> -localedir = $(datadir)/locale
>  inc_local = "-I$(top_srcdir)/include/"
>  
> -AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE 
> -I/usr/include/ $(inc_local) $(GLIB_CFLAGS) 
> -DSPD_SPAWN_CMD=\""@prefix@/bin/speech-dispatcher"\"
> +AM_CFLAGS = @ERROR_CFLAGS@ -D_GNU_SOURCE -I/usr/include/ $(inc_local) 
> $(GLIB_CFLAGS) -DSPD_SPAWN_CMD=\""@prefix@/bin/speech-dispatcher"\"

Hi Andrei,
This change doesn't belong in this patch.

> diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
> index 0d67162..d2784ef 100644
> --- a/src/audio/Makefile.am
> +++ b/src/audio/Makefile.am


Nor this one.

Other than that, this patch looks good.  So does your other patch to
include config.h.

-- Chris
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://lists.freebsoft.org/pipermail/speechd/attachments/20100919/a964a1b7/attachment-0001.pgp>