use libjack.la for linking

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

Makefile.am

@@ -15,19 +15,24 @@ AM_CFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\" @GLIB_CFLAGS@
 AM_CXXFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\"
 
 jackd_SOURCES = jackd.c engine.c
-jackd_LDFLAGS = -L. -ljack -ldl -lpthread $(GLIB_LIBS)
+jackd_LDFLAGS = -ldl -lpthread $(GLIB_LIBS)
+jackd_LDADD = libjack.la
 
 jack_simple_client_SOURCES = simple_client.c
-jack_simple_client_LDFLAGS = -L. -ljack -ldl -lpthread
+jack_simple_client_LDFLAGS = -ldl -lpthread
+jack_simple_client_LDADD = libjack.la
 
 jack_monitor_client_SOURCES = monitor_client.c
-jack_monitor_client_LDFLAGS = -L. -ljack -ldl -lpthread
+jack_monitor_client_LDFLAGS = -ldl -lpthread
+jack_monitor_client_LDADD = libjack.la
 
 jack_fltk_client_SOURCES = fltk_client.cc
-jack_fltk_client_LDFLAGS = -L. -L/usr/X11R6/lib -lfltk -lX11 -lXext -ljack -ldl -lpthread
+jack_fltk_client_LDFLAGS = -L/usr/X11R6/lib -lfltk -lX11 -lXext -ldl -lpthread
+jack_fltk_client_LDADD = libjack.la
 
 jackrec_SOURCES = capture_client.c
-jackrec_LDFLAGS = -L. -lsndfile -ljack -ldl -lpthread
+jackrec_LDFLAGS = -lsndfile -ldl -lpthread
+jackrec_LDADD = libjack.la
 
 lib_LTLIBRARIES    = libjack.la jack_alsa.la
 

alsa_driver.c

@@ -365,7 +365,7 @@ alsa_driver_set_parameters (alsa_driver_t *driver, nframes_t frames_per_cycle, n
 	if (p_format != c_format) {
 		jack_error ("Sorry. The audio interface \"%s\""
 			  "doesn't support the same sample format for capture and playback."
-			  "Ardour cannot use this hardware.", driver->alsa_name);
+			  "this JACK/ALSA driver cannot use this hardware.", driver->alsa_name);
 		return -1;
 	}
 

configure.in

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