--- speech-tools-1.2.3.orig/config/rules/bin_process.mak

+++ speech-tools-1.2.3/config/rules/bin_process.mak

@@ -55,6 +55,7 @@

 		Makefile ) : ;; \

 		VCLocalRules ) : ;; \

 		RCS|CVS ) : ;; \

+		SCCS|BitKeeper ) : ;; \

 		* ) $(ECHO_N) " $$i"; $(RM) -f "$$i";; \

 	    esac \

 	done

--- speech-tools-1.2.3.orig/config/compilers/egcs.mak

+++ speech-tools-1.2.3/config/compilers/egcs.mak

@@ -54,7 +54,7 @@

 CXX=$(EGCS_CXX)

 ifndef EGCS_MAKE_SHARED_LIB

-    MAKE_SHARED_LIB = gcc -shared -fno-shared-data -o XXX -Xlinker -h -Xlinker XXX

+    MAKE_SHARED_LIB = gcc -shared -o XXX -Wl,-soname -Wl,YYY

 else

     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)

 endif

--- speech-tools-1.2.3.orig/config/compilers/gcc295.mak

+++ speech-tools-1.2.3/config/compilers/gcc295.mak

@@ -34,23 +34,44 @@

  ##                 Author: Alan W Black (awb@cs.cmu.edu)                 ##

  ##                   Date: Thu Sept 2 1999                               ##

  ## --------------------------------------------------------------------  ##

- ## Settings for GCC-2.95.1                                               ##

+ ## Settings for GCC-2.95.2                                               ##

  ##                                                                       ##

  ###########################################################################

 include $(EST)/config/compilers/gcc_defaults.mak

-COMPILER_DESC=FSF gcc2.95.1

+COMPILER_DESC=FSF gcc2.95.2

 ifndef GCC295

     GCC295 = gcc

 endif

 CC= $(GCC295)

-CXX = $(GCC295)

+CXX = g++

-CXXFLAGS  +=  -fguiding-decls

+# We do not actually need -fguiding-decls, because the code is in fact

+# correct despite the bogus in-class declarations of templated ostream

+# operator functions.  (See EST_TList.h, EST_TKVL.h, etc...)

+#

+# All the header files that contain these bogus declarations also

+# contain correct out-of-class, templated declarations for the

+# functions in question (they have to, otherwise the code simply

+# wouldn't link without -fguiding-decls).

+#

+# GCC 2.95 "helpfully" (yeah right) produces unbelievably verbose

+# warnings for this by default.  This makes it STFU, which is what we

+# want, since guiding declarations are almost certainly still required

+# by inferior compilers.

+

+WARN_CXXFLAGS += -Wno-non-template-friend

 STATIC_LINKFLAGS = -Dstatic

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)

+

+ifndef GCC295_MAKE_SHARED_LIB

+    MAKE_SHARED_LIB = gcc -shared -o XXX -Wl,-soname -Wl,YYY

+else

+    MAKE_SHARED_LIB = $(GCC295_MAKE_SHARED_LIB)

+endif

+

--- speech-tools-1.2.3.orig/config/compilers/gcc296.mak

+++ speech-tools-1.2.3/config/compilers/gcc296.mak

@@ -47,13 +47,13 @@

 endif

 CC= $(GCC296)

-CXX = $(GCC296)

+CXX = g++

 WARN_CXXFLAGS  +=  -Wno-non-template-friend

 STATIC_LINKFLAGS = -Dstatic

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)

--- speech-tools-1.2.3.orig/config/compilers/gcc_defaults.mak

+++ speech-tools-1.2.3/config/compilers/gcc_defaults.mak

@@ -39,7 +39,7 @@

  ###########################################################################

 CC=gcc

-CXX=gcc

+CXX=g++

 ifeq ($(OSTYPE),Darwin)

 CXX=g++

 endif

@@ -48,7 +48,8 @@

 COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//'

 CFLAGS  = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS)

-CXXFLAGS  =  $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS)

+#CXXFLAGS  =  $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS)

+CXXFLAGS  =  $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS)

 DEBUG_CCFLAGS   = -g

 DEBUG_CXXFLAGS  = -g

@@ -95,7 +96,7 @@

 ## The -lgcc here is redundant - gcc does this anyway - but it

 ## helps java know what needs to be loaded.

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ -lgcc

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lgcc

 ## special ways of doing things, blank means default

--- speech-tools-1.2.3.orig/config/compilers/gcc28.mak

+++ speech-tools-1.2.3/config/compilers/gcc28.mak

@@ -45,7 +45,7 @@

 endif

 CC= $(GCC28)

-CXX = $(GCC28)

+CXX = g++

 COMPILER_DESC=FSF gcc2.8

@@ -56,7 +56,7 @@

 # gcc-2.8.1 has problems in optimizing some files

 HONOUR_NOOPT=1

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)

--- speech-tools-1.2.3.orig/config/compilers/gcc30.mak

+++ speech-tools-1.2.3/config/compilers/gcc30.mak

@@ -47,13 +47,13 @@

 endif

 CC= $(GCC30)

-CXX = $(GCC30)

+CXX = g++

 WARN_CXXFLAGS  +=  -Wno-non-template-friend

 STATIC_LINKFLAGS = -Dstatic

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)

--- speech-tools-1.2.3.orig/config/compilers/gcc31.mak

+++ speech-tools-1.2.3/config/compilers/gcc31.mak

@@ -47,13 +47,13 @@

 endif

 CC= $(GCC31)

-CXX = $(GCC31)

+CXX = g++

 WARN_CXXFLAGS  +=  -Wno-non-template-friend

 STATIC_LINKFLAGS = -Dstatic

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)

--- speech-tools-1.2.3.orig/config/compilers/gcc32.mak

+++ speech-tools-1.2.3/config/compilers/gcc32.mak

@@ -55,7 +55,7 @@

 MAKE_DEPEND = $(CC) -MM $(INCLUDES) $(WARN_CXXFLAGS) $(TEMPLATES) $(TEMPLATE_SPECIFIC)

-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++

+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)

--- speech-tools-1.2.3.orig/config/config.in

+++ speech-tools-1.2.3/config/config.in

@@ -61,7 +61,7 @@

 # VERBOSE=1

 # DEBUG=1

 # PROFILE=gprof

-#SHARED=2

+SHARED=2

 ## Directory specific selections which override the above

--- speech-tools-1.2.3.orig/config/system.sh

+++ speech-tools-1.2.3/config/system.sh

@@ -60,8 +60,7 @@

 	sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'`

 # Sort out various flavours of Linux

-if [ "$OSTYPE" = Linux ]

-    then

+case "$OSTYPE" in Linux|GNU|GNU/*)

     if [ -f "/etc/redhat-release" ]

 	then

 	OSTYPE=RedHatLinux

@@ -74,7 +73,8 @@

 	# Generic unknown GNU/Linux system.

 	OSTYPE=Linux

     fi

-fi

+;;

+esac

 # Make sure we actually have a .mak file for it, otherwise fall back

 # to sensible defaults (for example, kernel version and architecture

--- speech-tools-1.2.3.orig/config/modules/esd_audio.mak

+++ speech-tools-1.2.3/config/modules/esd_audio.mak

@@ -45,6 +45,6 @@

 AUDIO_DEFINES += -DSUPPORT_ESD

 AUDIO_INCLUDES += -I$(ESD_INCLUDE)

 MODULE_LIBS += -L$(ESD_LIB) -lesd -laudiofile

-MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt

+

--- speech-tools-1.2.3.orig/config/config

+++ speech-tools-1.2.3/config/config

@@ -0,0 +1,172 @@

+########################################################-*-mode:Makefile-*-

+##                                                                       ##

+##  Edinburgh Speech Tools: local configuration file                     ##

+##                                                                       ##

+###########################################################################

+##

+##  Specific config file for local installation

+##

+

+###########################################################################

+## Where the speech_tools tree will be installed.

+## 

+## The default is that the speech_tools will remain where it is compiled.

+##

+## You may need to set this explicitly if automounter or NFS

+## side effects cause problems

+

+EST_HOME := $(shell (cd $(EST); pwd))

+

+###########################################################################

+## System type. 

+##

+## The system will attempt to determine this, but if it is wrong you may

+## need to set it explicitly. The definitions are in 

+## systems/$(SYSTEM_TYPE).mak

+##

+## Format: machine _ os osrev

+## 

+## Examples: sparc_SunOS5 intel_Linux2.0

+

+SYSTEM_TYPE=unknown_DebianGNULinux

+

+###########################################################################

+## Compiler.

+## The definitions are in compilers/$(COMPILER).mak

+## Examples: gcc suncc egcs gcc28

+

+COMPILER=gcc295

+

+###########################################################################

+## Java system to use if you include the Java interface.

+## Examples jdk

+

+JAVA_COMPILER=jdk

+

+###########################################################################

+## Pre defined configurations (for directory locations, setup peculiarities

+## etc.)

+##

+## Examples: default cstr rjc

+

+CONFIGURATION = 

+

+###########################################################################

+## Compilation options.

+##

+## OPTIMISE=4 will turn off DEBUG

+

+OPTIMISE=3

+WARN=1

+# VERBOSE=1

+DEBUG=1

+# PROFILE=gprof

+SHARED=2

+

+## Directory specific selections which override the above

+

+OPTIMISE_sigpr = 3

+

+###########################################################################

+## Feature selection.

+##

+## Select modules to include.

+

+## AUDIO

+## various audio devices are supported directly but you can always

+## specify a program to play files in a desired format.

+

+## NCD's network audio system, This is recommended.

+# INCLUDE_MODULES += NAS_AUDIO

+

+## Elightenment Sound Demon, for KDE etc.

+INCLUDE_MODULES += ESD_AUDIO

+

+## Native audio for your platform (sun, linux, freebsd, irix, windows)

+INCLUDE_MODULES += NATIVE_AUDIO

+

+## Special code to run Windows MPLAYER

+# INCLUDE_MODULES += MPLAYER_AUDIO

+

+## USER INTERFACE

+

+## Command-line editing. This option gives command line editing and history.

+## It may not work under all systems, so may be optionally omitted.

+INCLUDE_MODULES += EDITLINE

+

+# speech recognition

+#INCLUDE_MODULES += ASR

+

+

+## Scheme

+

+## Scheme In One Defun interpreter and data structures

+INCLUDE_MODULES += SIOD

+

+## The following subsystems depend on the Scheme subsystem and so

+## must be removed if Scheme is not included

+

+INCLUDE_MODULES += WAGON

+INCLUDE_MODULES += SCFG

+INCLUDE_MODULES += WFST

+INCLUDE_MODULES += OLS

+

+## Java

+

+

+## Define this to include the pure Java code

+# INCLUDE_MODULES += JAVA

+# JAVA_HOME = PUT_SOMETHING_HERE

+

+## Define this to compile the Java interface to the EST classes. You

+## need to compile with the SHARED option above. This is required for

+## fringe.

+# INCLUDE_MODULES += JAVA_CPP

+

+## Define this to have the Java code use the Java Media API to

+## play sounds etc.

+# INCLUDE_MODULES += JAVA_MEDIA

+# JMF_HOME = PUT_SOMETHING_HERE

+

+## Richard Tobin's RXP XML parser.

+INCLUDE_MODULES += RXP

+

+## Debugging, You should probably ony do one or the other of these.

+

+## Efence protected malloc library to catch memory errors

+# INCLUDE_MODULES += EFENCE

+

+## Dmalloc, another chekcing malloc library

+# INCLUDE_MODULES += DMALLOC

+

+## Additional subsystems to include should be listed here.

+

+ALSO_INCLUDE=

+

+## Turn this on to compile all known modules. This is intended for

+## portability testing.

+

+# INCLUDE_EVERYTHING=1

+

+

+###########################################################################

+## Now include the settings

+

+include $(EST)/config/systems/$(SYSTEM_TYPE).mak

+

+include $(EST)/config/compilers/$(COMPILER).mak

+

+ifneq ($(JAVA_COMPILER),none)

+    include $(EST)/config/compilers/$(JAVA_COMPILER).mak

+endif

+

+ifneq ($(CONFIGURATION),)

+    include $(CONFIGURATION:%=$(EST)/config/configs/%.mak)

+endif

+

+###########################################################################

+##

+## Any settings you need to describe how your system differs from the

+## assumed defaults should go below. See config/ReadMe for a description

+## of the most common things you might need.

+

--- speech-tools-1.2.3.orig/Makefile

+++ speech-tools-1.2.3/Makefile

@@ -59,7 +59,7 @@

 ALL = .config_error .sub_directories

 # Try and say if config hasn't been created

-config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; )  >&2)

+#config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; )  >&2)

 # force a check on the system file

 system_dummy := $(shell $(MAKE) -C $(TOP)/config -f make_system.mak TOP=.. system.mak)

@@ -105,8 +105,9 @@

 		exit 2 ;\

 	fi

-config/config: config/config.in config.status

-	./config.status

+# This clashes badly with Debian package setup

+#config/config: config/config.in config.status

+#	./config.status

 configure: configure.in

 	autoconf

--- speech-tools-1.2.3.orig/configure.in

+++ speech-tools-1.2.3/configure.in

@@ -34,6 +34,7 @@

 AC_CANONICAL_SYSTEM

 AC_PROG_CC

+AC_PROG_CXX

 if test "x$GCC" = "xyes"; then

 	CFLAGS="$CFLAGS -Wall"

 fi