check dispatch header and then do the blocks runtime

.travis.yml

@@ -2,5 +2,5 @@ language: c
 compiler: clang
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libpng-dev libjpeg-dev libblas-dev libgsl0-dev libblocksruntime-dev
+  - sudo apt-get install -qq libpng-dev libjpeg-dev libblas-dev libgsl0-dev
 script: cd lib && ./configure && make && cd ../test && make test

lib/configure

@@ -3381,7 +3381,8 @@ if test $CC = clang; then
 	ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default"
 if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then :
   DEFINE_MACROS="$DEFINE_MACROS-D USE_DISPATCH "
- MKLDFLAGS="$MKLDFLAGS-ldispatch "
+ MKCFLAGS="$MKCFLAGS-fblocks "
+ MKLDFLAGS="$MKLDFLAGS-ldispatch -lBlocksRuntime "
 
 fi
 
@@ -3556,13 +3557,6 @@ else
 $as_echo "no" >&6; }
 fi
 
-# check for block support, only enable dispatch when this is presented
-if test $CC = clang; then :
-  MKCFLAGS="$MKCFLAGS-fblocks "
- MKLDFLAGS="$MKLDFLAGS-lBlocksRuntime "
-
-fi
-
 # for display only, concatenate CFLAGS and DEFINE_MACROS
 DISCFLAGS="$MKCFLAGS$DEFINE_MACROS"
 

lib/configure.ac

@@ -35,7 +35,7 @@ AC_CHECK_HEADER([libswscale/swscale.h],
 # only check dispatch if compiled with clang
 if test $CC = clang; then
 	AC_CHECK_HEADER([dispatch/dispatch.h],
-					[AC_SUBST(DEFINE_MACROS, ["$DEFINE_MACROS-D USE_DISPATCH "]) AC_SUBST(MKLDFLAGS, ["$MKLDFLAGS-ldispatch "])])
+					[AC_SUBST(DEFINE_MACROS, ["$DEFINE_MACROS-D USE_DISPATCH "]) AC_SUBST(MKCFLAGS, ["$MKCFLAGS-fblocks "]) AC_SUBST(MKLDFLAGS, ["$MKLDFLAGS-ldispatch -lBlocksRuntime "])])
 fi
 
 # check for gsl, and I need to first check these two before I can check gsl
@@ -62,9 +62,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-# check for block support, only enable dispatch when this is presented
-AS_IF([test $CC = clang], [AC_SUBST(MKCFLAGS, ["$MKCFLAGS-fblocks "]) AC_SUBST(MKLDFLAGS, ["$MKLDFLAGS-lBlocksRuntime "])])
-
 # for display only, concatenate CFLAGS and DEFINE_MACROS
 AC_SUBST(DISCFLAGS, ["$MKCFLAGS$DEFINE_MACROS"])