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

[Andrei Kholodnyi]

From: William Hubbs <address@hidden>
To: address@hidden

renamed src/server/config.c and src/server/config.h so there is not a
conflict with config.h which is generated by autoconf.
---
 src/api/c/Makefile.am                    |    3 +--
 src/audio/Makefile.am                    |    3 +--
 src/server/Makefile.am                   |    2 +-
 src/server/{config.c => configuration.c} |    2 +-
 src/server/{config.h => configuration.h} |    0
 src/server/speechd.c                     |    2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename src/server/{config.c => configuration.c} (99%)
 rename src/server/{config.h => configuration.h} (100%)

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"\"
 
 lib_LTLIBRARIES = libspeechd.la
 libspeechd_la_SOURCES = libspeechd.c
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
@@ -1,10 +1,9 @@
 
-localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/include/"
 
 include_HEADERS = spd_audio_plugin.h
 
-am_cflags = -DLOCALEDIR=\"$(localedir)\" $(inc_local)
+am_cflags = $(inc_local)
 
 spdlib_LTLIBRARIES = libsdaudio.la
 libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS)
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 15dc622..9ab37f8 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,6 +1,6 @@
 
 bin_PROGRAMS = speech-dispatcher
-speech_dispatcher_SOURCES = speechd.c speechd.h server.c server.h history.c 
history.h module.c module.h config.c config.h parse.c parse.h set.c set.h msg.h 
alloc.c alloc.h compare.c compare.h speaking.c speaking.h options.c options.h 
output.c output.h sem_functions.c sem_functions.h index_marking.c 
index_marking.h
+speech_dispatcher_SOURCES = speechd.c speechd.h server.c server.h history.c 
history.h module.c module.h configuration.c configuration.h parse.c parse.h 
set.c set.h msg.h alloc.c alloc.h compare.c compare.h speaking.c speaking.h 
options.c options.h output.c output.h sem_functions.c sem_functions.h 
index_marking.c index_marking.h
 
 speech_dispatcher_LDADD = $(top_builddir)/src/common/libcommon.la 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread 
@EXTRA_SOCKET_LIBS@
 speech_dispatcher_LDFLAGS = @RDYNAMIC@
diff --git a/src/server/config.c b/src/server/configuration.c
similarity index 99%
rename from src/server/config.c
rename to src/server/configuration.c
index 4fa0f10..14376a4 100644
--- a/src/server/config.c
+++ b/src/server/configuration.c
@@ -25,7 +25,7 @@
 #include <dotconf.h>
 
 #include "speechd.h"
-#include "config.h"
+#include "configuration.h"
 #include <fdsetconv.h>
 
 static TFDSetClientSpecific *cl_spec_section;
diff --git a/src/server/config.h b/src/server/configuration.h
similarity index 100%
rename from src/server/config.h
rename to src/server/configuration.h
diff --git a/src/server/speechd.c b/src/server/speechd.c
index b0fe736..2b7d76d 100644
--- a/src/server/speechd.c
+++ b/src/server/speechd.c
@@ -31,7 +31,7 @@
 #include "speechd.h"
 
 /* Declare dotconf functions and data structures*/
-#include "config.h"
+#include "configuration.h"
 
 /* Declare functions to allocate and create important data
  * structures */
-- 
1.6.0.4