@@ -3,15 +3,17 @@
 
 AC_CANONICAL_HOST
 
 AC_LANG([Objective C])
 AC_PROG_OBJC
-AC_PROG_CPP
+AC_PROG_OBJCPP
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_PROG_EGREP
 
+CPP="$OBJCPP"
+CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS"
 OBJCFLAGS="$OBJCFLAGS -Wall -fobjc-exceptions"
 OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString"
 LIBS="$LIBS -lobjc"
 
 AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCFLAGS="$OBJCFLAGS -pipe"])
@@ -195,10 +197,15 @@
 else
 	AC_SUBST(TESTS, "tests")
 fi
 
 BUILDSYS_TOUCH_DEPS
+
+dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
+dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself
+AC_SUBST(CPP)
+AC_SUBST(CPPFLAGS)
 
 AC_SUBST(PACKAGE, ObjFW)
 AC_CONFIG_FILES([buildsys.mk extra.mk objfw-config])
 AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT