[PATCH] remove double include from speechd.conf

[william hubbs]

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

There was an extra include directive in speechd.conf, which was also the
reason this file was being generated from speechd.conf.in.  If this
directive was in place and the file was installed as the system
configuration and not a user level configuration, the client settings
were being included twice.
If the system level configuration includes the files in clients/, that
will cover the default settings.  If a user wants to include the system
level client settings, they should add an include directive to their
user level configuration file to do so.  By default, spd-conf copies the
client settings over to the user's configuration, so they will not need
to do this.
---
 config/Makefile.am     |   10 --
 config/speechd.conf    |  264 +++++++++++++++++++++++++++++++++++++++++++++++
 config/speechd.conf.in |  265 ------------------------------------------------
 3 files changed, 264 insertions(+), 275 deletions(-)
 create mode 100644 config/speechd.conf
 delete mode 100644 config/speechd.conf.in

diff --git a/config/Makefile.am b/config/Makefile.am
index 7f6f1f3..fc6bef0 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -2,16 +2,6 @@
 
 SUBDIRS= modules clients
 
-all-local: speechd.conf
-
-speechd.conf: speechd.conf.in
-       sed -e s:INCLUDE_PATH:$(spdconfdir):g speechd.conf.in > speechd.conf
-
-
 spdconf_DATA= speechd.conf
 
 spdconforig_DATA= speechd.conf
-
-CLEANFILES = speechd.conf
-
-EXTRA_DIST = speechd.conf.in
diff --git a/config/speechd.conf b/config/speechd.conf
new file mode 100644
index 0000000..9f3cb9a
--- /dev/null
+++ b/config/speechd.conf
@@ -0,0 +1,264 @@
+
+# Global configuration for Speech Dispatcher
+# ==========================================
+
+# -----SYSTEM OPTIONS-----
+
+# CommunicationMethod specifies the method to be used by Speech Dispatcher to 
communicate with
+# its clients. Two basic methods are "unix_socket" and "inet_socket".
+#
+# unix_socket -- communication over Unix sockets represented by a file in the
+# filesystem (see SocketPath bellow). This method works only locally, but is
+# prefered for standard session setup, where every user runs his own instance 
of Speech
+# Dispatcher to get voice feedback on his own computer.
+#
+# inet_socket -- alternatively, you can start Speech Dispatcher on
+# a TCP port and connect to it via hostname/port. This allows for a more
+# flexible setup, where you can use Speech Dispatcher over network
+# from different machines. See also the Port and LocalhostAccessOnly
+# configuration variables.
+#
+# CommunicationMethod "unix_socket"
+
+# SocketPath is either "default" or a full path to the filesystem
+# where the driving Unix socket file should be created in case the
+# CommunicationMethod is set to "unix_socket". The default is
+# ~/.speech-dispatcher/speechd.sock where ~ is the given users home directory.
+# Do not change this unless you have a reason and know what you are doing.
+
+# SocketPath "default"
+
+# The Port on which Speech Dispatcher should be available to clients if the 
"inet_socket"
+# communication method is used.
+
+# Port 6560
+
+# By default, if "inet_socket" communication method is used, the specified 
port is opened only
+# for connections comming from localhost. If LocalhostAccessOnly is set to 0 
it disables this
+# access controll. It means that the port will be accessible from all 
computers on the
+# network. If you turn off this option, please make sure you set up some 
system rules on what
+# computers are and are not allowed to access the Speech Dispatcher port.
+
+# LocalhostAccessOnly 1
+
+# -----LOGGING CONFIGURATION-----
+
+# The LogLevel is a number between 0 and 5 that specifies
+# how much of the logging information should be printed
+# out on the screen or in the logfile (see LogFile)
+# 0 means nothing, 5 means everything (not recommended).
+
+LogLevel  3
+
+# The LogDir specifies where Speech Dispatcher writes its logging messages
+# (status information, error messages, etc.).  Specify "stdout" for
+# standard console output or a directory path. 'default' means that
+# the logs are written to the default destination (e.g. a preconfigured
+# system directory or the home directory if .speech-dispatcher is present)
+# DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
+# want to influence it.
+
+LogDir  "default"
+#LogDir  "/var/log/speech-dispatcher/"
+#LogDir  "stdout"
+
+# The CustomLogFile allows logging all messages of the given kind,
+# regardless their priority, to the given destination.
+
+#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log"
+
+# ----- VOICE PARAMETERS -----
+
+# The DefaultRate controls how fast the synthesizer is going to speak.
+# The value must be between -100 (slowest) and +100 (fastest), default
+# is 0.
+
+# DefaultRate  0
+
+# The DefaultPitch controls the pitch of the synthesized voice.  The
+# value must be between -100 (lowest) and +100 (highest), default is
+# 0.
+
+# DefaultPitch  0
+
+# The DefaultVolume constrols the default volume of the voice.  It is
+# a value between -100 (softly) and +100 (loudly).  Currently, +100
+# maps to the default volume of the synthesizer.
+
+DefaultVolume 100
+
+# The DefaultVoiceType controls which voice type should be used by
+# default.  Voice types are symbolic names which map to particular
+# voices provided by the synthesizer according to the output module
+# configuratuion.  Please see the synthesizer-specific configuration
+# in etc/speechd/modules/ to see which voices are assigned to
+# different symbolic names.  The following symbolic names are
+# currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3,
+# CHILD_MALE, CHILD_FEMALE
+
+# DefaultVoiceType  "MALE1"
+
+# The Default language with which to speak
+
+# DefaultLanguage "en"
+
+
+# ----- MESSAGE DISPATCHING CONTROLL -----
+
+# The DefaultClientName specifies the name of a client who didn't
+# introduce himself at the beginning of an SSIP session.
+
+# DefaultClientName  "unknown:unknown:unknown"
+
+# The Default Priority. Use with caution, normally this shouldn't be
+# changed globally (at this place)
+
+# DefaultPriority  "text"
+
+# The DefaultPauseContext specifies by how many index marks a speech
+# cursor should return when resuming after a pause. This is roughly
+# equivalent to the number of sentences before the place of the
+# execution of pause that will be repeated.
+
+# DefaultPauseContext 0
+
+# -----SPELLING/PUNCTUATION/CAPITAL LETTERS  CONFIGURATION-----
+
+# The DefaultPunctuationMode sets the way dots, comas, exclamation
+# marks, question marks etc. are interpreted.  none: they are ignored
+# some: some of them are sent to synthesis (see
+# DefaultPunctuationSome) all: all punctuation marks are sent to
+# synthesis
+
+# DefaultPunctuationMode "none"
+
+# The DefaultCapLetRecognition: if set to "spell", capital letters
+# should be spelled (e.g. "capital b"), if set to "icon",
+# capital letters are indicated by inserting a special sound
+# before them but they should be read normally, it set to "none"
+# capital letters are not recognized (by default)
+
+# DefaultCapLetRecognition  "none"
+
+# The DefaultSpelling: if set to On, all messages will be spelled
+# unless set otherwise (this is usually not something you want to do.)
+
+# DefaultSpelling  Off
+
+# ----- AUDIO CONFIGURATION -----------
+
+# -- AUDIO OUTPUT --
+
+# Chooses between the possible sound output systems:
+#       "pulse" - PulseAudio
+#       "alsa"  - Advanced Linux Sound System
+#       "oss"   - Open Sound System
+#       "nas"   - Network Audio System
+#       "libao" - A cross platform audio library
+# Pulse audio is the default and recommended sound server. OSS and ALSA
+# are only provided for compatibility with architectures that do not
+# include Pulse Audio. NAS provides network transparency, but is not
+# very well tested. libao is a cross platform library with plugins for
+# different sound systems and provides alternative output for Pulse Audio
+# and ALSA as well as for other backends.
+
+# AudioOutputMethod "pulse"
+
+# -- Pulse Audio parameters --
+
+# Pulse audio server name or "default" for the default pulse server
+
+#AudioPulseServer "default"
+
+#AudioPulseMinLength 100
+
+# -- ALSA parameters --
+
+# Audio device for ALSA output
+
+#AudioALSADevice "default"
+
+# -- OSS parameters --
+
+# Audio device for OSS output
+
+#AudioOSSDevice "/dev/dsp"
+
+# -- NAS parameters --
+
+# Route to the Network Audio System server when NAS
+# was chosen for the audio output. Note that NAS
+# server doesn't need to run on your machine,
+# you can use it also over network (for instance
+# when working on remote machines).
+
+#AudioNASServer "tcp/localhost:5450"
+
+
+
+# -----OUTPUT MODULES CONFIGURATION-----
+
+# Each AddModule line loads an output module.
+#  Syntax: AddModule "name" "binary" "configuration" "logfile"
+#  - name is the name under which you can acces this module
+#  - binary is the path to the binary executable of this module,
+#    either relative (to lib/speech-dispatcher-modules/) or absolute
+#  - configuration is the path to the config file of this module,
+#    either relative (to etc/speechd/modules/) or absolute
+
+AddModule "espeak"       "sd_espeak"   "espeak.conf"
+AddModule "festival"     "sd_festival"  "festival.conf"
+#AddModule "flite"        "sd_flite"     "flite.conf"
+#AddModule "ivona"      "sd_ivona"    "ivona.conf"
+#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+#AddModule "espeak-mbrola-generic" "sd_generic" "espeak-mbrola-generic.conf"
+#AddModule "swift-generic" "sd_generic" "swift-generic.conf"
+#AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
+#AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
+#AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
+#AddModule "cicero"        "sd_cicero"     "cicero.conf"
+
+# DO NOT REMOVE the following line unless you have
+# a specific reason -- this is the fallback output module
+# that is only used when no other modules are in use
+AddModule "dummy"         "sd_dummy"      ""
+
+# The output module testing doesn't actually connect to anything. It
+# outputs the requested commands to standard output and reads
+# responses from stdandard input. This way, Speech Dispatcher's
+# communication with output modules can be tested easily.
+
+# AddModule "testing"
+
+# The DefaultModule selects which output module is the default.  You
+# must use one of the names of the modules loaded with AddModule.
+
+DefaultModule espeak
+
+# The LanguageDefaultModule selects which output modules are prefered
+# for specified languages.
+
+#LanguageDefaultModule "en"  "espeak"
+#LanguageDefaultModule "cs"  "festival"
+#LanguageDefaultModule "es"  "festival"
+
+# -----CLIENT SPECIFIC CONFIGURATION-----
+
+# Here you can include the files with client-specific configuration
+# for different types of clients. They must contain one or more sections with
+# this structure:
+#     BeginClient "emacs:*"
+#          DefaultPunctuationMode "some"
+#          ...and/or some other settings
+#     EndClient
+# The parameter of BeginClient tells Speech Dispatcher to which clients
+# it should apply this settings (it does glob-style matching, you can use
+# * to match any number of characters and ? to match one character)
+
+# There are some sample client settings
+
+Include "clients/*.conf"
+
+# The DisableAutoSpawn option will disable the autospawn mechanism.
+# Thus the server will not start automatically on requests from the clients
+# DisableAutoSpawn
diff --git a/config/speechd.conf.in b/config/speechd.conf.in
deleted file mode 100644
index 2638e04..0000000
--- a/config/speechd.conf.in
+++ /dev/null
@@ -1,265 +0,0 @@
-
-# Global configuration for Speech Dispatcher
-# ==========================================
-
-# -----SYSTEM OPTIONS-----
-
-# CommunicationMethod specifies the method to be used by Speech Dispatcher to 
communicate with
-# its clients. Two basic methods are "unix_socket" and "inet_socket".
-#
-# unix_socket -- communication over Unix sockets represented by a file in the
-# filesystem (see SocketPath bellow). This method works only locally, but is
-# prefered for standard session setup, where every user runs his own instance 
of Speech
-# Dispatcher to get voice feedback on his own computer.
-#
-# inet_socket -- alternatively, you can start Speech Dispatcher on
-# a TCP port and connect to it via hostname/port. This allows for a more
-# flexible setup, where you can use Speech Dispatcher over network
-# from different machines. See also the Port and LocalhostAccessOnly
-# configuration variables.
-#
-# CommunicationMethod "unix_socket"
-
-# SocketPath is either "default" or a full path to the filesystem
-# where the driving Unix socket file should be created in case the
-# CommunicationMethod is set to "unix_socket". The default is
-# ~/.speech-dispatcher/speechd.sock where ~ is the given users home directory.
-# Do not change this unless you have a reason and know what you are doing.
-
-# SocketPath "default"
-
-# The Port on which Speech Dispatcher should be available to clients if the 
"inet_socket"
-# communication method is used.
-
-# Port 6560
-
-# By default, if "inet_socket" communication method is used, the specified 
port is opened only
-# for connections comming from localhost. If LocalhostAccessOnly is set to 0 
it disables this
-# access controll. It means that the port will be accessible from all 
computers on the
-# network. If you turn off this option, please make sure you set up some 
system rules on what
-# computers are and are not allowed to access the Speech Dispatcher port.
-
-# LocalhostAccessOnly 1
-
-# -----LOGGING CONFIGURATION-----
-
-# The LogLevel is a number between 0 and 5 that specifies
-# how much of the logging information should be printed
-# out on the screen or in the logfile (see LogFile)
-# 0 means nothing, 5 means everything (not recommended).
-
-LogLevel  3
-
-# The LogDir specifies where Speech Dispatcher writes its logging messages
-# (status information, error messages, etc.).  Specify "stdout" for
-# standard console output or a directory path. 'default' means that
-# the logs are written to the default destination (e.g. a preconfigured
-# system directory or the home directory if .speech-dispatcher is present)
-# DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
-# want to influence it.
-
-LogDir  "default"
-#LogDir  "/var/log/speech-dispatcher/"
-#LogDir  "stdout"
-
-# The CustomLogFile allows logging all messages of the given kind,
-# regardless their priority, to the given destination.
-
-#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log"
-
-# ----- VOICE PARAMETERS -----
-
-# The DefaultRate controls how fast the synthesizer is going to speak.
-# The value must be between -100 (slowest) and +100 (fastest), default
-# is 0.
-
-# DefaultRate  0
-
-# The DefaultPitch controls the pitch of the synthesized voice.  The
-# value must be between -100 (lowest) and +100 (highest), default is
-# 0.
-
-# DefaultPitch  0
-
-# The DefaultVolume constrols the default volume of the voice.  It is
-# a value between -100 (softly) and +100 (loudly).  Currently, +100
-# maps to the default volume of the synthesizer.
-
-DefaultVolume 100
-
-# The DefaultVoiceType controls which voice type should be used by
-# default.  Voice types are symbolic names which map to particular
-# voices provided by the synthesizer according to the output module
-# configuratuion.  Please see the synthesizer-specific configuration
-# in etc/speechd/modules/ to see which voices are assigned to
-# different symbolic names.  The following symbolic names are
-# currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3,
-# CHILD_MALE, CHILD_FEMALE
-
-# DefaultVoiceType  "MALE1"
-
-# The Default language with which to speak
-
-# DefaultLanguage "en"
-
-
-# ----- MESSAGE DISPATCHING CONTROLL -----
-
-# The DefaultClientName specifies the name of a client who didn't
-# introduce himself at the beginning of an SSIP session.
-
-# DefaultClientName  "unknown:unknown:unknown"
-
-# The Default Priority. Use with caution, normally this shouldn't be
-# changed globally (at this place)
-
-# DefaultPriority  "text"
-
-# The DefaultPauseContext specifies by how many index marks a speech
-# cursor should return when resuming after a pause. This is roughly
-# equivalent to the number of sentences before the place of the
-# execution of pause that will be repeated.
-
-# DefaultPauseContext 0
-
-# -----SPELLING/PUNCTUATION/CAPITAL LETTERS  CONFIGURATION-----
-
-# The DefaultPunctuationMode sets the way dots, comas, exclamation
-# marks, question marks etc. are interpreted.  none: they are ignored
-# some: some of them are sent to synthesis (see
-# DefaultPunctuationSome) all: all punctuation marks are sent to
-# synthesis
-
-# DefaultPunctuationMode "none"
-
-# The DefaultCapLetRecognition: if set to "spell", capital letters
-# should be spelled (e.g. "capital b"), if set to "icon",
-# capital letters are indicated by inserting a special sound
-# before them but they should be read normally, it set to "none"
-# capital letters are not recognized (by default)
-
-# DefaultCapLetRecognition  "none"
-
-# The DefaultSpelling: if set to On, all messages will be spelled
-# unless set otherwise (this is usually not something you want to do.)
-
-# DefaultSpelling  Off
-
-# ----- AUDIO CONFIGURATION -----------
-
-# -- AUDIO OUTPUT --
-
-# Chooses between the possible sound output systems:
-#       "pulse" - PulseAudio
-#       "alsa"  - Advanced Linux Sound System
-#       "oss"   - Open Sound System
-#       "nas"   - Network Audio System
-#       "libao" - A cross platform audio library
-# Pulse audio is the default and recommended sound server. OSS and ALSA
-# are only provided for compatibility with architectures that do not
-# include Pulse Audio. NAS provides network transparency, but is not
-# very well tested. libao is a cross platform library with plugins for
-# different sound systems and provides alternative output for Pulse Audio
-# and ALSA as well as for other backends.
-
-# AudioOutputMethod "pulse"
-
-# -- Pulse Audio parameters --
-
-# Pulse audio server name or "default" for the default pulse server
-
-#AudioPulseServer "default"
-
-#AudioPulseMinLength 100
-
-# -- ALSA parameters --
-
-# Audio device for ALSA output
-
-#AudioALSADevice "default"
-
-# -- OSS parameters --
-
-# Audio device for OSS output
-
-#AudioOSSDevice "/dev/dsp"
-
-# -- NAS parameters --
-
-# Route to the Network Audio System server when NAS
-# was chosen for the audio output. Note that NAS
-# server doesn't need to run on your machine,
-# you can use it also over network (for instance
-# when working on remote machines).
-
-#AudioNASServer "tcp/localhost:5450"
-
-
-
-# -----OUTPUT MODULES CONFIGURATION-----
-
-# Each AddModule line loads an output module.
-#  Syntax: AddModule "name" "binary" "configuration" "logfile"
-#  - name is the name under which you can acces this module
-#  - binary is the path to the binary executable of this module,
-#    either relative (to lib/speech-dispatcher-modules/) or absolute
-#  - configuration is the path to the config file of this module,
-#    either relative (to etc/speechd/modules/) or absolute
-
-AddModule "espeak"       "sd_espeak"   "espeak.conf"
-AddModule "festival"     "sd_festival"  "festival.conf"
-#AddModule "flite"        "sd_flite"     "flite.conf"
-#AddModule "ivona"      "sd_ivona"    "ivona.conf"
-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
-#AddModule "espeak-mbrola-generic" "sd_generic" "espeak-mbrola-generic.conf"
-#AddModule "swift-generic" "sd_generic" "swift-generic.conf"
-#AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
-#AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
-#AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
-#AddModule "cicero"        "sd_cicero"     "cicero.conf"
-
-# DO NOT REMOVE the following line unless you have
-# a specific reason -- this is the fallback output module
-# that is only used when no other modules are in use
-AddModule "dummy"         "sd_dummy"      ""
-
-# The output module testing doesn't actually connect to anything. It
-# outputs the requested commands to standard output and reads
-# responses from stdandard input. This way, Speech Dispatcher's
-# communication with output modules can be tested easily.
-
-# AddModule "testing"
-
-# The DefaultModule selects which output module is the default.  You
-# must use one of the names of the modules loaded with AddModule.
-
-DefaultModule espeak
-
-# The LanguageDefaultModule selects which output modules are prefered
-# for specified languages.
-
-#LanguageDefaultModule "en"  "espeak"
-#LanguageDefaultModule "cs"  "festival"
-#LanguageDefaultModule "es"  "festival"
-
-# -----CLIENT SPECIFIC CONFIGURATION-----
-
-# Here you can include the files with client-specific configuration
-# for different types of clients. They must contain one or more sections with
-# this structure:
-#     BeginClient "emacs:*"
-#          DefaultPunctuationMode "some"
-#          ...and/or some other settings
-#     EndClient
-# The parameter of BeginClient tells Speech Dispatcher to which clients
-# it should apply this settings (it does glob-style matching, you can use
-# * to match any number of characters and ? to match one character)
-
-# There are some sample client settings
-
-Include "INCLUDE_PATH/clients/*.conf"
-Include "clients/*.conf"
-
-# The DisableAutoSpawn option will disable the autospawn mechanism.
-# Thus the server will not start automatically on requests from the clients
-# DisableAutoSpawn
-- 
1.7.1