Fix cvscompile

- Use autoreconf.
- Check as10k1 program in configure.

diff --git a/ld10k1/configure.in b/ld10k1/configure.in
index a17076db055070b247131cd039b6e7a485bec297..8f9078ca56e236911a50b414cd242d3c599b3d0f 100644 (file)
--- 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 f773708d81330871053f300c23514ca0fb7e5fc2..55a685d554460adc6ef58993401427c12133bcab 100644 (file)
--- 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 3a5537d5431ef0320d08f49fb0cf272a1fc0fd47..5ddd1ec5ef56bde7a748b4cb578cfcabc8047cca 100644 (file)
--- 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 14cd60c4d77b6ac15eb5f19ecc35a0ca8436ef67..13a11df2d63b27c8eba3b0e75940b8cb99dd4133 100644 (file)
--- 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 $@ $<