@@ -1,21 +1,27 @@
 AC_INIT(objfw, 0.1, js@webkeks.org)
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
 
 AC_PROG_CC
 AC_PROG_OBJC
 AC_PROG_CPP
 AC_PROG_LN_S
 AC_PROG_EGREP
 
 CFLAGS="$CFLAGS -Wall"
 OBJCFLAGS="$OBJCFLAGS -Wall -fobjc-exceptions"
+OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString"
 LIBS="$LIBS -lobjc"
 
+AX_CHECK_COMPILER_FLAGS(-pipe, [
+	CFLAGS="$CFLAGS -pipe"
+	OBJCFLAGS="$OBJCFLAGS -pipe"])
+AX_CHECK_COMPILER_FLAGS(-fno-constant-cfstrings,
+	[OBJCFLAGS="$OBJCFLAGS -fno-constant-cfstrings"])
+
 AC_DEFINE(OF_CONFIG_H, 1, [Define so that we know we got our config.h])
 
 BUILDSYS_LIB
 AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
 
@@ -131,13 +137,10 @@
 test x"$ac_cv_have_ipv6" = x"yes" && \
 	AC_DEFINE(HAVE_IPV6, 1, "Whether we have IPv6 support")
 
 AC_CHECK_HEADERS(sys/mman.h)
 
-test x"$GCC" = x"yes" && CFLAGS="$CFLAGS -Werror -pipe -g"
-test x"$GCC" = x"yes" && OBJCFLAGS="$OBJCFLAGS -Werror -pipe -g"
-
 if test x"$cross_compiling" = x"yes"; then
 	case "$target" in
 		*-*-mingw*)
 			AC_PATH_PROG(WINE, wine)