--- configure.orig	2017-01-31 07:45:59.000000000 +1100
+++ configure	2017-11-18 20:15:51.000000000 +1100
@@ -296,10 +296,13 @@
 
 echo LDFLAGS=$LDFLAGS >> Makefile.settings
 
-echo CFLAGS=$CFLAGS $CPPFLAGS >> Makefile.settings
-echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings
+echo CFLAGS=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings
+# Potential -I flags in $CPPFLAGS need to come after the above
+echo CFLAGS+=$CFLAGS $CPPFLAGS >> Makefile.settings
+echo ARCHFLAGS=$ARCHFLAGS >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H -D_GNU_SOURCE >> Makefile.settings
+echo CC=${CC} >> Makefile.settings
 
 if [ -n "$CC" ]; then
 	CC=$CC