autoreconfed

diff --git a/Makefile.in b/Makefile.in
index d8b9951..0fc6292 100644 (file)
--- a/Makefile.in
+++ b/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,
@@ -154,6 +154,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@
@@ -194,6 +196,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@
@@ -262,8 +265,8 @@ EXTRA_DIST = \
        README.jp \
        timidity.ide \
        timidity.mak \
-       TiMidity-uj.ad \
-       TiMidity.ad
+       TiMidity-uj.ad.in \
+       TiMidity.ad.in
 
 
 TOOLSDIR = timidity-tools
@@ -272,7 +275,7 @@ subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
 CONFIG_HEADER = config.h interface.h
-CONFIG_CLEAN_FILES = common.makefile
+CONFIG_CLEAN_FILES = common.makefile TiMidity.ad TiMidity-uj.ad
 DIST_SOURCES =
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
@@ -281,8 +284,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
        installdirs-recursive install-recursive uninstall-recursive \
        check-recursive installcheck-recursive
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-       Makefile.in NEWS TODO aclocal.m4 common.makefile.in config.h.in \
-       configure configure.in interface.h.in
+       Makefile.in NEWS TODO TiMidity-uj.ad.in TiMidity.ad.in \
+       aclocal.m4 common.makefile.in config.h.in configure \
+       configure.in interface.h.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h interface.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -337,6 +341,10 @@ distclean-hdr:
        -rm -f config.h stamp-h1 interface.h stamp-h2
 common.makefile: $(top_builddir)/config.status common.makefile.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+TiMidity.ad: $(top_builddir)/config.status TiMidity.ad.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+TiMidity-uj.ad: $(top_builddir)/config.status TiMidity-uj.ad.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -419,9 +427,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in interface.h.in $(TAGS_DEP
                $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
+       if (etags --etags-include --version) >/dev/null 2>&1; then \
+         include_option=--etags-include; \
+       else \
+         include_option=--include; \
+       fi; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
-           test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+           test -f $$subdir/TAGS && \
+             tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
        list='$(SOURCES) $(HEADERS) config.h.in interface.h.in $(LISP) $(TAGS_FILES)'; \
@@ -541,12 +555,12 @@ distcheck: dist
        $(am__remove_distdir)
        GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
        chmod -R a-w $(distdir); chmod a+w $(distdir)
-       mkdir $(distdir)/=build
-       mkdir $(distdir)/=inst
+       mkdir $(distdir)/_build
+       mkdir $(distdir)/_inst
        chmod a-w $(distdir)
-       dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-         && cd $(distdir)/=build \
+         && cd $(distdir)/_build \
          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
            $(DISTCHECK_CONFIGURE_FLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) \
@@ -573,7 +587,7 @@ distcheck: dist
        @echo "$(distdir).tar.gz is ready for distribution" | \
          sed 'h;s/./=/g;p;x;p;x'
 distuninstallcheck:
-       cd $(distuninstallcheck_dir) \
+       @cd $(distuninstallcheck_dir) \
        && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
           || { echo "ERROR: files left after uninstall:" ; \
                if test -n "$(DESTDIR)"; then \
@@ -582,11 +596,11 @@ distuninstallcheck:
                $(distuninstallcheck_listfiles) ; \
                exit 1; } >&2
 distcleancheck: distclean
-       if test '$(srcdir)' = . ; then \
+       @if test '$(srcdir)' = . ; then \
          echo "ERROR: distcleancheck can only run from a VPATH build" ; \
          exit 1 ; \
        fi
-       test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
          || { echo "ERROR: files left in build directory after distclean:" ; \
               $(distcleancheck_listfiles) ; \
               exit 1; } >&2

diff --git a/configure b/configure
index 3309ef9..211d97d 100755 (executable)
--- a/configure
+++ b/configure
@@ -16288,7 +16288,7 @@ SHLD="$SHLD $SHLDFLAGS"
 
 
 
-                                                                                                                                                                ac_config_files="$ac_config_files Makefile autoconf/Makefile common.makefile configs/Makefile doc/Makefile doc/C/Makefile doc/ja_JP.ujis/Makefile interface/Makefile interface/motif_bitmaps/Makefile interface/bitmaps/Makefile interface/pixmaps/Makefile libarc/Makefile libunimod/Makefile timidity/Makefile utils/Makefile script/Makefile"
+                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile autoconf/Makefile common.makefile configs/Makefile doc/Makefile doc/C/Makefile doc/ja_JP.ujis/Makefile interface/Makefile interface/motif_bitmaps/Makefile interface/bitmaps/Makefile interface/pixmaps/Makefile libarc/Makefile libunimod/Makefile timidity/Makefile utils/Makefile script/Makefile TiMidity.ad TiMidity-uj.ad"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17155,6 +17155,8 @@ do
   "timidity/Makefile" ) CONFIG_FILES="$CONFIG_FILES timidity/Makefile" ;;
   "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
   "script/Makefile" ) CONFIG_FILES="$CONFIG_FILES script/Makefile" ;;
+  "TiMidity.ad" ) CONFIG_FILES="$CONFIG_FILES TiMidity.ad" ;;
+  "TiMidity-uj.ad" ) CONFIG_FILES="$CONFIG_FILES TiMidity-uj.ad" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   "interface.h" ) CONFIG_HEADERS="$CONFIG_HEADERS interface.h" ;;