bugfix: itemsize was not respected, sizeof(float) was allways used

[debian/gnuradio] / config / grc_gr_audio_jack.m4

diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4
index 3d4a00daed3c9b60c2abea803157e07fa9d7e8fe..5947648f007d9921c57ec4e993c8d58e502efd19 100644 (file)
--- a/config/grc_gr_audio_jack.m4
+++ b/config/grc_gr_audio_jack.m4
@@ -14,28 +14,25 @@ dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
 dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl Boston, MA 02111-1307, USA.
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_JACK],[
-    AC_CONFIG_SRCDIR([gr-audio-jack/src/audio_jack.i])
+    GRC_ENABLE([gr-audio-jack])
 
-    succeeded=yes
-    PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no])
-    if test $succeeded = yes; then
-        LIBS="$LIBS $JACK_LIBS"
+    AC_CONFIG_FILES([ \
+       gr-audio-jack/Makefile \
+        gr-audio-jack/src/Makefile \
+       gr-audio-jack/src/run_tests \
+    ])
 
-        AC_CONFIG_FILES([\
-          gr-audio-jack/Makefile \
-          gr-audio-jack/src/Makefile \
-         gr-audio-jack/src/run_tests \
-       ])
+    passed=yes
+    PKG_CHECK_MODULES(JACK, jack >= 0.8,[],
+        [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not found.])])
 
+    GRC_BUILD_CONDITIONAL([gr-audio-jack],[
+       AC_SUBST(JACK_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x gr-audio-jack/src/run_tests])
-        subdirs="$subdirs gr-audio-jack"
-    else
-       AC_MSG_RESULT([failed: $JACK_PKG_ERRORS])
-       failed="$failed gr-audio-jack"
-    fi
+    ])
 ])