From 83b4a93e03f8c075061c09d4b6b9677be7c2bb20 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 18 Mar 2005 16:34:28 +0000
Subject: [PATCH] Fix cvscompile

- Use autoreconf.
- Check as10k1 program in configure.
---
 ld10k1/configure.in                           |  5 +++++
 ld10k1/contrib/emu10k1MIDIEffects/Makefile.am |  2 +-
 ld10k1/cvscompile                             | 18 +-----------------
 ld10k1/setup/effects/Makefile.am              |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/ld10k1/configure.in b/ld10k1/configure.in
index a17076d..8f9078c 100644
--- a/ld10k1/configure.in
+++ b/ld10k1/configure.in
@@ -15,6 +15,11 @@ LIBS="$LIBS $ALSA_LIBS"
 effectsdir='$(pkgdatadir)/effects'
 AC_SUBST(effectsdir)
 
+AC_CHECK_PROG(AS10K1, as10k1, as10k1)
+if test -z "$AS10K1"; then
+  AC_MSG_ERROR([as10k1 is not installed])
+fi
+
 #taken from alsa-lib
 dnl Make a symlink for inclusion of lo10k1/xxx.h
 if test ! -L include/lo10k1 ; then
diff --git a/ld10k1/contrib/emu10k1MIDIEffects/Makefile.am b/ld10k1/contrib/emu10k1MIDIEffects/Makefile.am
index f773708..55a685d 100644
--- a/ld10k1/contrib/emu10k1MIDIEffects/Makefile.am
+++ b/ld10k1/contrib/emu10k1MIDIEffects/Makefile.am
@@ -31,4 +31,4 @@ CLEANFILES = $(dist_effects_DATA)
 SUFFIXEC = .asm .emu10k1
 
 .asm.emu10k1:
-	as10k1 -o $@ $<
+	$(AS10K1) -o $@ $<
diff --git a/ld10k1/cvscompile b/ld10k1/cvscompile
index 3a5537d..5ddd1ec 100644
--- a/ld10k1/cvscompile
+++ b/ld10k1/cvscompile
@@ -1,22 +1,6 @@
 #!/bin/bash
 
-if test "x$AUTOMAKE_DIR" = "x"; then
-  if test -d /usr/local/share/automake; then
-    AUTOMAKE_DIR=/usr/local/share/automake
-  fi
-  if test -d /usr/share/automake; then
-    AUTOMAKE_DIR="/usr/share/automake"
-  fi
-fi
-
-for f in install-sh mkinstalldirs missing; do
-  cp -av $AUTOMAKE_DIR/$f .
-done
-
-aclocal $ACLOCAL_FLAGS
-automake --add-missing --copy
-touch depcomp
-autoconf
+autoreconf -fi
 export CFLAGS='-O2 -Wall -pipe -g'
 echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
diff --git a/ld10k1/setup/effects/Makefile.am b/ld10k1/setup/effects/Makefile.am
index 14cd60c..13a11df 100644
--- a/ld10k1/setup/effects/Makefile.am
+++ b/ld10k1/setup/effects/Makefile.am
@@ -15,4 +15,4 @@ CLEANFILES = $(dist_effects_DATA)
 SUFFIXEC = .asm .emu10k1
 
 .asm.emu10k1:
-	as10k1 -o $@ $<
+	$(AS10K1) -o $@ $<
-- 
2.47.1