* 0.32.2

* applied some jackstart patches from fernando
* check the proper jackd binary in jackstart
* verify functionality of capabilities autoconf checks


git-svn-id: svn+ssh://jackaudio.org/trunk/jack@203 0c269be4-1314-0410-8aa9-9f06e86f4224

configure.in

@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.)
 
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=32
-JACK_MICRO_VERSION=1
+JACK_MICRO_VERSION=2
 
 BETA=
 

jackd/Makefile.am

@@ -10,7 +10,7 @@ endif
 
 bin_PROGRAMS = jackd $(CAP_PROGS)
 
-AM_CFLAGS = $(JACK_CFLAGS) $(GLIB_CFLAGS)
+AM_CFLAGS = $(JACK_CFLAGS) -DJACKD_LOCATION=\"$(bindir)/jackd\" $(GLIB_CFLAGS)
 
 jackd_SOURCES = jackd.c engine.c
 jackd_LDADD = ../libjack/libjack.la -lm -ldl -lpthread $(GLIB_LIBS) $(CAP_LIBS)
@@ -22,7 +22,7 @@ jackdinclude_HEADERS = md5.h
 BUILT_SOURCES = md5.h
 
 md5.h: jackd
-	echo "#define JACKD_MD5_SUM \"`md5sum jackd | awk '{print $1}'`\"" > md5.h
+	echo "#define JACKD_MD5_SUM \"`md5sum .libs/jackd | awk '{print $$1}'`\"" > md5.h
 
 jackstart_SOURCES = jackstart.c
 jackstart_LDFLAGS = -lcap -lssl

jackd/jackstart.c

@@ -38,14 +38,12 @@
 #include <sys/capability.h>
 
 #include "jack/start.h"
-#include "jack/md5.h"
+#include "md5.h"
 
 #define READ_BLOCKSIZE 4096
 
-/* FIXME this should be coupled to the --prefix that was specified
-   in configure so that this is the real full path to jackd
-*/
-static char *jackd_bin_path = "/usr/bin/jackd";
+/* JACKD_LOCATION must be passed on the gcc command line */
+static char *jackd_bin_path = JACKD_LOCATION;
 
 static char *jackd_md5_sum = JACKD_MD5_SUM;