Merge branch 'master' into next

Conflicts:
	gr-qtgui/lib/Makefile.am

6 files changed, 23 insertions, 22 deletions

diff --git a/config/ax_boost_base.m4 b/config/ax_boost_base.m4
index e9790227e..e9d42ee9a 100644
--- a/config/ax_boost_base.m4
+++ b/config/ax_boost_base.m4
@@ -276,7 +276,7 @@ AC_DEFUN([_AX_BOOST_CHECK_LIB_],[
 
 dnl $1 is unit name.  E.g., boost_thread
 AC_DEFUN([_AX_BOOST_WITH],[
-    _AX_BOOST_WITH_($1,m4_bpatsubst($1,_,-))
+    _AX_BOOST_WITH_([$1], [m4_bpatsubst($1,_,-)])
 ])
 
 dnl $1 is unit name.  E.g., boost_thread
@@ -315,9 +315,9 @@ AC_DEFUN([_AX_BOOST_CHECK_],[
         LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
         AC_CACHE_CHECK([whether the boost::m4_substr([$1],6) includes are available], [$4],
 		       [AC_LANG_PUSH([C++])
-                        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([$2],[$3]),[$4]=yes,[$4]=no)
+                        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$2],[$3])], [[$4]=yes], [[$4]=no])
                         AC_LANG_POP([C++])
-                       ])
+			])
 	if test "$[$4]" = "yes"; then
 	    _AX_BOOST_CHECK_LIB([$1])
 	fi
@@ -330,5 +330,5 @@ dnl $1 is unit name.  E.g., boost_thread
 dnl $2 is AC_LANG_PROGRAM argument 1
 dnl $3 is AC_LANG_PROGRAM argument 2
 AC_DEFUN([_AX_BOOST_CHECK],[
-    _AX_BOOST_CHECK_($1,$2,$3,ax_cv_$1)
+    _AX_BOOST_CHECK_([$1], [$2], [$3], [ax_cv_$1])
 ])
diff --git a/config/ax_boost_python.m4 b/config/ax_boost_python.m4
index 3c6c666f7..59c86ad0e 100644
--- a/config/ax_boost_python.m4
+++ b/config/ax_boost_python.m4
@@ -65,14 +65,14 @@ ac_cv_boost_python,
  if test x$PYTHON_INCLUDE_DIR != x; then
    CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
  fi
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  #include <boost/python/module.hpp>
  using namespace boost::python;
  BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
-               [[return 0;]]),
-               ac_cv_boost_python=yes, ac_cv_boost_python=no)
+               [[return 0;]])],
+               [ac_cv_boost_python=yes, ac_cv_boost_python=no)
  AC_LANG_RESTORE
- CPPFLAGS=$CPPFLAGS_SAVE
+ CPPFLAGS=$CPPFLAGS_SAVE]
 ])
 if test "$ac_cv_boost_python" = "yes"; then
   AC_LANG_PUSH([C++])
diff --git a/config/ax_boost_thread.m4 b/config/ax_boost_thread.m4
index 4df23224a..8e42510ea 100644
--- a/config/ax_boost_thread.m4
+++ b/config/ax_boost_thread.m4
@@ -46,19 +46,19 @@ AC_DEFUN([AX_BOOST_THREAD],
         LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS"
 	CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
 
-        AC_CACHE_CHECK(whether the boost::thread includes are available,
-                       ax_cv_boost_thread,
+        AC_CACHE_CHECK([whether the boost::thread includes are available],
+                       [ax_cv_boost_thread],
         [AC_LANG_PUSH([C++])
-             AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
                                    [[boost::thread_group thrds;
-                                   return 0;]]),
-                   ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
+                                   return 0;]])],
+                   [ax_cv_boost_thread=yes], [ax_cv_boost_thread=no])
              AC_LANG_POP([C++])
         ])
 
         if test "$ax_cv_boost_thread" = "yes"; then
 	    BOOST_CXXFLAGS="$PTHREAD_CFLAGS"
-            AC_SUBST(BOOST_CXXFLAGS)
+            AC_SUBST([BOOST_CXXFLAGS])
 	    _AX_BOOST_CHECK_LIB([boost_thread])
 	    if test "$link_ok" = "yes" && test -n "$PTHREAD_LIBS"; then
 	        BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS"
diff --git a/config/gr_check_createfilemapping.m4 b/config/gr_check_createfilemapping.m4
index 5f9b4a49a..a7e290dd3 100644
--- a/config/gr_check_createfilemapping.m4
+++ b/config/gr_check_createfilemapping.m4
@@ -25,7 +25,7 @@ dnl ])
 
 AC_DEFUN([GR_CHECK_CREATEFILEMAPPING],[
   AC_MSG_CHECKING([for CreateFileMapping function])
-  AC_COMPILE_IFELSE([
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <windows.h>
 int main (int argc, char **argv)
 { 
@@ -41,12 +41,13 @@ int main (int argc, char **argv)
                      seg_name);                 // name of mapping object
     return 0;
 }
-],[HAVE_CREATEFILEMAPPING=yes
-   AC_DEFINE(HAVE_CREATEFILEMAPPING,[1],[Define if you have the CreateFilemapping function(win32).])],
+])],[HAVE_CREATEFILEMAPPING=yes
+     AC_DEFINE([HAVE_CREATEFILEMAPPING],[1],
+	[Define if you have the CreateFilemapping function(win32).])],
   [HAVE_CREATEFILEMAPPING=no])
 
-  AC_MSG_RESULT($HAVE_CREATEFILEMAPPING)
-  AM_CONDITIONAL(HAVE_CREATEFILEMAPPING,     test x$HAVE_CREATEFILEMAPPING = xyes)
+  AC_MSG_RESULT([$HAVE_CREATEFILEMAPPING])
+  AM_CONDITIONAL([HAVE_CREATEFILEMAPPING], [test x$HAVE_CREATEFILEMAPPING = xyes])
 ])
 
 
diff --git a/config/gr_lib64.m4 b/config/gr_lib64.m4
index 751f774b4..92f1bd917 100644
--- a/config/gr_lib64.m4
+++ b/config/gr_lib64.m4
@@ -40,7 +40,7 @@ AC_DEFUN([GR_LIB64],[
 
   AC_MSG_CHECKING([gr_libdir_suffix])
   gr_libdir_suffix=""
-  AC_SUBST(gr_libdir_suffix)
+  AC_SUBST([gr_libdir_suffix])
 
   case "$host_os" in
     linux*) is_linux=yes ;;
diff --git a/config/gr_qwt.m4 b/config/gr_qwt.m4
index 537348ac6..035e94091 100644
--- a/config/gr_qwt.m4
+++ b/config/gr_qwt.m4
@@ -61,7 +61,7 @@ AC_DEFUN([GR_QWT],
     if test "$qwt_incdir" = "" ; then
         dnl check qwt-qt4/qwt.h (as in Ubuntu)
         AC_CHECK_HEADER(
-            [qwt-qt4/qwt_double_interval.h],
+            [qwt-qt4/qwt_math.h],
             [qwt_qt4_qwt_h=yes],
             [qwt_qt4_qwt_h=no]
         )
@@ -71,7 +71,7 @@ AC_DEFUN([GR_QWT],
         else
             dnl check qwt/qwt.h (as in Fedora)
             AC_CHECK_HEADER(
-                [qwt/qwt_double_interval.h],
+                [qwt/qwt_math.h],
 	        [qwt_qwt_h=yes],
                 [qwt_qwt_h=no]
             )