New version 2.13.2

diff --git a/ChangeLog b/ChangeLog
index ddc168d..d7d211d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-03  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+       * NEWS: Add new entry for 2.13.2
+       * configure.in: Change version to 2.13.2
+
 2004-10-02  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
        * interface/wrdt_wcon.c : Fix double definition of print_ecmd()

diff --git a/NEWS b/NEWS
index 1c0460b..6420b56 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+04/10/2004
+    * Version 2.13.2
+      This is a bug fix release that fixes the compile error on Win32
+      platform.  All other platforms aren't affected to this, so you
+      don't have to update if you are not compiling TiMidity++ on
+      Windows.
+      
 29/09/2004
     * Version 2.13.1
     *  Newly supported output formats

diff --git a/configure b/configure
index 64cec81..717344d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for TiMidity++ 2.13.1.
+# Generated by GNU Autoconf 2.59 for TiMidity++ 2.13.2.
 #
 # Report bugs to <root@mput.dip.jp>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='TiMidity++'
 PACKAGE_TARNAME='TiMidity++'
-PACKAGE_VERSION='2.13.1'
-PACKAGE_STRING='TiMidity++ 2.13.1'
+PACKAGE_VERSION='2.13.2'
+PACKAGE_STRING='TiMidity++ 2.13.2'
 PACKAGE_BUGREPORT='root@mput.dip.jp'
 
 ac_unique_file="timidity/timidity.c"
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TiMidity++ 2.13.1 to adapt to many kinds of systems.
+\`configure' configures TiMidity++ 2.13.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -851,7 +851,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TiMidity++ 2.13.1:";;
+     short | recursive ) echo "Configuration of TiMidity++ 2.13.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1081,7 +1081,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-TiMidity++ configure 2.13.1
+TiMidity++ configure 2.13.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1095,7 +1095,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TiMidity++ $as_me 2.13.1, which was
+It was created by TiMidity++ $as_me 2.13.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1788,7 +1788,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='TiMidity++'
- VERSION='2.13.1'
+ VERSION='2.13.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20221,7 +20221,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by TiMidity++ $as_me 2.13.1, which was
+This file was extended by TiMidity++ $as_me 2.13.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20284,7 +20284,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-TiMidity++ config.status 2.13.1
+TiMidity++ config.status 2.13.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 7237a55..9f2835b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,7 @@ dnl             (such as -fPIC)
 # AC_PREREQ(2.56)
 
 # "AC_INIT(timidity/timidity.c)" is obsolate yet.
-AC_INIT([TiMidity++],[2.13.1],[root@mput.dip.jp],[TiMidity++])
+AC_INIT([TiMidity++],[2.13.2],[root@mput.dip.jp],[TiMidity++])
 AC_CONFIG_AUX_DIR([autoconf])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([gnu dist-bzip2])

diff --git a/interface/Makefile.in b/interface/Makefile.in
index b4688e8..f68cfe5 100644 (file)
--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -491,9 +491,9 @@ EXTRA_DIST = \
        interface_n.txt \
        interface_s.txt
 
-@ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
 
 @ENABLE_TCLTK_TRUE@install_tk = install.tk
+@ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
 @ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw
 
 @ENABLE_XAW_TRUE@install_xaw = install.xaw

diff --git a/timidity/Makefile.in b/timidity/Makefile.in
index de78153..23e332e 100644 (file)
--- a/timidity/Makefile.in
+++ b/timidity/Makefile.in
@@ -460,14 +460,20 @@ EXTRA_timidity_SOURCES = \
 
 
 calcnewt_SOURCES = calcnewt.c
-@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = w32g_res.res
-@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
 
 @BORLANDC_TRUE@@ENABLE_W32GUI_TRUE@W32GUI_RES = w32g_res.res
+@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
 
 @BORLANDC_FALSE@@ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
+@BORLANDC_TRUE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@W32GUI_RES = w32g_res.res
 
 @BORLANDC_FALSE@CLEANFILES = newton_table.c
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_LDADD = \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      interface.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      arc.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      unimod.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      utils.lib
+
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(top_builddir)/interface/libinterface.a \
@@ -476,12 +482,6 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(top_builddir)/utils/libutils.a \
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(W32GUI_RES)
 
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_LDADD = \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      interface.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      arc.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      unimod.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@      utils.lib
-
 
 @VCPP_TRUE@timidity_LDADD = \
 @VCPP_TRUE@    $(SYSEXTRAS:.c=.$(OBJEXT)) \
@@ -498,6 +498,13 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_TRUE@@VCPP_FALSE@      unimod.lib \
 @BORLANDC_TRUE@@VCPP_FALSE@      utils.lib
 
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/interface/interface.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/libarc/arc.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/libunimod/unimod.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/utils/utils.lib \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(W32GUI_RES)
+
 
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(top_builddir)/interface/libinterface.a \
@@ -506,13 +513,6 @@ calcnewt_SOURCES = calcnewt.c
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(top_builddir)/utils/libutils.a \
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@   $(W32GUI_RES)
 
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/interface/interface.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/libarc/arc.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/libunimod/unimod.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(top_builddir)/utils/utils.lib \
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(W32GUI_RES)
-
 
 @VCPP_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @VCPP_TRUE@    $(top_builddir)/interface/interface.lib \