Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -21,22 +21,22 @@
 AC_PROG_INSTALL
 AC_PROG_EGREP
 
 CPP="$OBJCXXCPP"
 CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
-OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
+OBJCXXFLAGS="$OBJCXXFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
 LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)"
 LIBS="$LIBS $($OBJFW_CONFIG --libs)"
 
 AX_CHECK_COMPILER_FLAGS(-std=c++11, [OBJCXXFLAGS="$OBJCXXFLAGS -std=c++11"], [
 	AC_MSG_ERROR(You need a compiler that supports C++11!)
 ])
 
-AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCFLAGS="$OBJCFLAGS -pipe"])
-AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCFLAGS="$OBJCFLAGS -fno-common"])
+AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCXXFLAGS="$OBJCXXFLAGS -pipe"])
+AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCXXFLAGS="$OBJCXXFLAGS -fno-common"])
 AX_CHECK_COMPILER_FLAGS(-Wobjc-missing-property-synthesis -Werror,
-	[OBJCFLAGS="$OBJCFLAGS -Wobjc-missing-property-synthesis"])
+	[OBJCXXFLAGS="$OBJCXXFLAGS -Wobjc-missing-property-synthesis"])
 AX_CHECK_COMPILER_FLAGS(-Wno-ignored-attributes -Werror,
 	[OBJCXXFLAGS="$OBJCXXFLAGS -Wno-ignored-attributes"])
 
 AC_CHECK_TOOL(AR, ar)
 AC_PROG_RANLIB
@@ -85,12 +85,12 @@
 	CPPFLAGS="$CPPFLAGS $Qt5Widgets_CFLAGS"
 	LIBS="$LIBS $Qt5Widgets_LIBS"
 ], [
 	AC_MSG_ERROR(You need Qt5Widgets >= 5.5 installed!)
 ])
-AS_IF([test x"$GOBJC" = x"yes"], [
-	OBJCFLAGS="$OBJCFLAGS -Wwrite-strings -Wpointer-arith -Werror"
+AS_IF([test x"$GOBJCXX" = x"yes"], [
+	OBJCXXFLAGS="$OBJCXXFLAGS -Wwrite-strings -Wpointer-arith -Werror"
 ])
 
 AC_MSG_CHECKING(whether Qt requires PIC)
 AC_EGREP_CPP(yes, [
 	#include <qglobal.h>
@@ -110,10 +110,8 @@
 dnl We don't call AC_PROG_CPP or AC_PROG_OBJC, but only AC_PROG_OBJCPPCXX and
 dnl set CPP and OBJCC to OBJCPPCXX and add OBJCXXCPPFLAGS to CPPFLAGS, thus we
 dnl need to AC_SUBST these ourself.
 AC_SUBST(CPP)
 AC_SUBST(CPPFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(OBJCFLAGS)
 
 AC_CONFIG_FILES([buildsys.mk extra.mk])
 AC_OUTPUT