festival/trunk/speechconfig.patch

   1 diff -aur speech_tools.old//config/compilers/jdk.mak speech_tools/config/compilers/jdk.mak
   2 --- speech_tools.old//config/compilers/jdk.mak  2001-04-04 19:55:32.000000000 +0800
   3 +++ speech_tools/config/compilers/jdk.mak       2010-12-08 12:14:56.076668109 +0800
   4 @@ -52,7 +52,7 @@
   5  endif
   6  endif
   7
   8 -JAVAFLAGS = -depend
   9 +JAVAFLAGS =
  10
  11  DEBUG_JAVAFLAGS = -g
  12
  13 diff -aur speech_tools.old//config/config.in speech_tools/config/config.in
  14 --- speech_tools.old//config/config.in  2008-10-29 03:20:49.000000000 +0800
  15 +++ speech_tools/config/config.in       2010-12-08 12:17:50.110001443 +0800
  16 @@ -15,7 +15,7 @@
  17  ## You may need to set this explicitly if automounter or NFS
  18  ## side effects cause problems
  19
  20 -EST_HOME := $(shell (cd $(EST); pwd))
  21 +EST_HOME := /usr
  22
  23  ###########################################################################
  24  ## System type.
  25 @@ -28,14 +28,14 @@
  26  ##
  27  ## Examples: sparc_SunOS5 intel_Linux2.0
  28
  29 -SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
  30 +SYSTEM_TYPE=Linux
  31
  32  ###########################################################################
  33  ## Compiler.
  34  ## The definitions are in compilers/$(COMPILER).mak
  35  ## Examples: gcc suncc egcs gcc28
  36
  37 -COMPILER=@COMPILERTYPE@
  38 +COMPILER=gcc
  39
  40  ###########################################################################
  41  ## Java system to use if you include the Java interface.
  42 @@ -61,7 +61,7 @@
  43  # VERBOSE=1
  44  #DEBUG=1
  45  # PROFILE=gprof
  46 -#SHARED=2
  47 +SHARED=2
  48
  49  ## Directory specific selections which override the above
  50
  51 @@ -98,7 +98,7 @@
  52  ## It may not work under all systems, so may be optionally omitted.
  53  INCLUDE_MODULES += EDITLINE
  54
  55 -TERMCAPLIB = @TERMCAPLIB@
  56 +TERMCAPLIB =
  57  # speech recognition
  58  #INCLUDE_MODULES += ASR
  59
  60 Only in speech_tools/config: config.in.orig
  61 diff -aur speech_tools.old//config/systems/default.mak speech_tools/config/systems/default.mak
  62 --- speech_tools.old//config/systems/default.mak        2005-07-17 21:06:49.000000000 +0800
  63 +++ speech_tools/config/systems/default.mak     2010-12-08 12:14:56.076668109 +0800
  64 @@ -40,7 +40,7 @@
  65  ###########################################################################
  66  ## Installation directories
  67
  68 -INSTALL_PREFIX=/usr/local
  69 +INSTALL_PREFIX=/usr
  70
  71  BINDIR=$(INSTALL_PREFIX)/bin
  72  LIBDIR=$(INSTALL_PREFIX)/lib
  73 @@ -63,8 +63,8 @@
  74  ###########################################################################
  75  ## Where to find Enlightenment Speech Demon
  76
  77 -ESD_INCLUDE = /usr/local/include
  78 -ESD_LIB = /usr/local/lib
  79 +ESD_INCLUDE = /usr/include
  80 +ESD_LIB = /usr/lib
  81
  82  ###########################################################################
  83  ## Where to find X11
  84 @@ -75,14 +75,14 @@
  85  ###########################################################################
  86  ## TCL support
  87
  88 -TCL_INCLUDE = /usr/local/include
  89 -TCL_LIB     = /usr/local/lib
  90 -TCL_LIBRARY = -ltcl7.6
  91 +TCL_INCLUDE = /usr/include
  92 +TCL_LIB     = /usr/lib
  93 +TCL_LIBRARY = -ltcl
  94
  95  ###########################################################################
  96  ## Efence library for malloc debugging
  97
  98 -EFENCE_LIB = /usr/local/lib
  99 +EFENCE_LIB = /usr/lib
 100
 101  ###########################################################################
 102  ## Commands.
 103 diff -aur speech_tools.old//config/systems/Linux.mak speech_tools/config/systems/Linux.mak
 104 --- speech_tools.old//config/systems/Linux.mak  2001-04-04 19:55:32.000000000 +0800
 105 +++ speech_tools/config/systems/Linux.mak       2010-12-08 12:14:56.076668109 +0800
 106 @@ -40,13 +40,13 @@
 107
 108  include $(EST)/config/systems/default.mak
 109
 110 -DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
 111 +DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 112  JAVA=/usr/bin/java
 113  JAVAC=/usr/bin/javac
 114  JAVAH=/usr/bin/javah
 115
 116  TCL_LIBRARY = -ltcl
 117 -OS_LIBS = -ldl
 118 +OS_LIBS = -ldl -lncurses
 119
 120  ## the native audio module for this type of system
 121  NATIVE_AUDIO_MODULE = LINUX16