Make SWIG required only when building svn version. Building from distribution tarball...

git-svn-id: svn://svn.gna.org/svn/jackmixer/code@45 330dde89-2920-0410-a79a-889b863ea5ce

diff --git a/Makefile.am b/Makefile.am
index d94609d1e6d6c57929b8e3b5b00584ee54361fa0..37d7bc20e14b3305d87733e75217efd9b98c4079 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,15 +31,14 @@ _jack_mixer_c_la_LIBADD = @JACK_LIBS@
 dist_jack_mixer_DATA = abspeak.py channel.py gui.py meter.py scale.py serialization.py serialization_xml.py slider.py jack_mixer.glade
 
 jack_mixer_c.py jack_mixer_wrap.c: $(top_srcdir)/jack_mixer.h
-       $(SWIG) -o jack_mixer_wrap.c -I$(top_srcdir) -python $(top_srcdir)/jack_mixer.h
+       swig -o jack_mixer_wrap.c -I$(top_srcdir) -python $(top_srcdir)/jack_mixer.h
 
 pkgpyexec_SCRIPTS = jack_mixer_c.py
 
 CLEANFILES = jack_mixer_c.py jack_mixer_wrap.c *.pyc
-EXTRA_DIST = test.py gpl.txt jack_mixer.schemas jack_mixer.py
+EXTRA_DIST = test.py gpl.txt jack_mixer.schemas jack_mixer.py jack_mixer_c.py
 
-_jack_mixer_c_la_SOURCES = jack_mixer.c jack_mixer.h list.h
-nodist__jack_mixer_c_la_SOURCES = jack_mixer_wrap.c
+_jack_mixer_c_la_SOURCES = jack_mixer.c jack_mixer.h list.h jack_mixer_wrap.c
 
 bin_SCRIPTS = $(srcdir)/jack_mixer.py
 

diff --git a/configure.ac b/configure.ac
index eb9d73df849fe64988f6bbe35d747d6782d13f48..255d1a70f39628e0d5982d8eb152793cbec4d72c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,6 @@ AC_PROG_LIBTOOL
 
 PKG_CHECK_MODULES(JACK, jack)
 
-AC_PROG_SWIG(1.3.31)
-
 # JACK MIDI
 have_jackmidi="unknown"
 AC_ARG_ENABLE(jackmidi, [AS_HELP_STRING(--disable-jackmidi, [Force disable JACK MIDI support [default=no]])], [ have_jackmidi="no" ])