diff --git a/m4/as-arts.m4 b/m4/as-arts.m4
index 29256e9a9b..2d628199e2 100644
--- a/m4/as-arts.m4
+++ b/m4/as-arts.m4
@@ -158,7 +158,7 @@ int main ()
         :
       else
          echo "*** Could not run ARTS test program, checking why..."
-         CFLAGS="$CFLAGS $ARTS_CFLAGS"
+         CFLAGS="$CFLAGS $ARTS_CXXFLAGS"
          LIBS="$LIBS $ARTS_LIBS"
          AC_TRY_LINK([
 #include <stdio.h>
@@ -181,11 +181,11 @@ int main ()
           LIBS="$ac_save_LIBS"
       fi
     fi
-    ARTS_CFLAGS=""
+    ARTS_CXXFLAGS=""
     ARTS_LIBS=""
     ifelse([$3], , :, [$3])
   fi
-  AC_SUBST(ARTS_CFLAGS)
+  AC_SUBST(ARTS_CXXFLAGS)
   AC_SUBST(ARTS_LIBS)
   rm -f conf.artstest
 ])
diff --git a/m4/gst-artsc.m4 b/m4/gst-artsc.m4
index c0f683df08..723041b82d 100644
--- a/m4/gst-artsc.m4
+++ b/m4/gst-artsc.m4
@@ -10,8 +10,7 @@ dnl
 AC_DEFUN(GST_CHECK_ARTSC,
 [ 
   AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no)
-  if test x$ARTSC_CONFIG = xno; then
-  if test x$ARTSC_CONFIG = xno; then
+  if test "x$ARTSC_CONFIG" = "xno"; then
     AC_MSG_WARN([Couldn't find artsc-config])
     HAVE_ARTSC=no
     ARTSC_LIBS=