autoreconfed

diff --git a/ChangeLog b/ChangeLog
index a275a6a..fad8b1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-25  mput <root@mput.dip.jp>
+
+       * configure,timidity/Makefile.in: To fit with Iwai's changes
+
 2003-08-25  Takashi Iwai <tiwai@suse.de>
 
        * configure.in, timidity/Makefile.am, timidity/output.c,

diff --git a/configure b/configure
index fb90c08..5fa150b 100755 (executable)
--- a/configure
+++ b/configure
@@ -10502,7 +10502,7 @@ fi;
 # audio section
 #
 
-audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas arts esd vorbis gogo portaudio'
+audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas arts esd vorbis gogo portaudio jack'
 
 
 # Check whether --with-nas-library or --without-nas-library was given.
@@ -11959,6 +11959,19 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+echo "$as_me:$LINENO: checking enable_audio=jack" >&5
+echo $ECHO_N "checking enable_audio=jack... $ECHO_C" >&6
+if test "x$au_enable_jack" = xyes; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SYSEXTRAS="$SYSEXTRAS jack_a.c"
+  EXTRALIBS="$EXTRALIBS $(pkg-config --libs jack)"
+  EXTRADEFS="$EXTRADEFS -DAU_JACK $(pkg-config --cflags jack)"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 echo "$as_me:$LINENO: checking enable_audio=vorbis" >&5
 echo $ECHO_N "checking enable_audio=vorbis... $ECHO_C" >&6
 if test "x$au_enable_vorbis" = xyes; then

diff --git a/timidity/Makefile.in b/timidity/Makefile.in
index 50d93ce..af1d8cf 100644 (file)
--- a/timidity/Makefile.in
+++ b/timidity/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.7.5 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -176,6 +176,8 @@ MINGW_FALSE = @MINGW_FALSE@
 MINGW_TRUE = @MINGW_TRUE@
 NEEDDLOPEN_FALSE = @NEEDDLOPEN_FALSE@
 NEEDDLOPEN_TRUE = @NEEDDLOPEN_TRUE@
+NEEDGETOPT_FALSE = @NEEDGETOPT_FALSE@
+NEEDGETOPT_TRUE = @NEEDGETOPT_TRUE@
 NETSRCS = @NETSRCS@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -217,6 +219,7 @@ ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
 build = @build@
@@ -399,6 +402,7 @@ EXTRA_timidity_SOURCES = \
        esd_a.c \
        hpux_a.c \
        hpux_d_a.c \
+       jack_a.c \
        oss_a.c \
        mac_a.c \
        mac_qt_a.c \
@@ -445,6 +449,7 @@ timidity_dep = $(SYSEXTRAS:.c=.o) \
        $(W32GUI_RES)
 
 subdir = timidity
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/interface.h
 CONFIG_CLEAN_FILES =
@@ -507,10 +512,10 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   ./$(DEPDIR)/filter.Po ./$(DEPDIR)/freq.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/gogo_a.Po ./$(DEPDIR)/hpux_a.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/hpux_d_a.Po ./$(DEPDIR)/instrum.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/list_a.Po ./$(DEPDIR)/loadtab.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/m2m.Po ./$(DEPDIR)/mac_a.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/mac_dlog.Po ./$(DEPDIR)/mac_main.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/mac_qt_a.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/jack_a.Po ./$(DEPDIR)/list_a.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/loadtab.Po ./$(DEPDIR)/m2m.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/mac_a.Po ./$(DEPDIR)/mac_dlog.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/mac_main.Po ./$(DEPDIR)/mac_qt_a.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/mac_soundspec.Po ./$(DEPDIR)/mfi.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/mfnode.Po ./$(DEPDIR)/miditrace.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/mix.Po ./$(DEPDIR)/mod.Po \
@@ -609,6 +614,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpux_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpux_d_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/instrum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jack_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadtab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m2m.Po@am__quote@
@@ -665,7 +671,7 @@ distclean-depend:
 .c.o:
 @am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 @am__fastdepCC_TRUE@     -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@   then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@   fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -675,14 +681,14 @@ distclean-depend:
 
 .c.obj:
 @am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@     -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@   then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@     -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 @am__fastdepCC_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 @am__fastdepCC_TRUE@   fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCC_FALSE@  $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 uninstall-info-am:
 
 ETAGS = etags
@@ -777,7 +783,6 @@ all-am: Makefile $(PROGRAMS)
 
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(bindir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am