diff -ruN neon-0.32.2-orig/configure.ac neon-0.32.2/configure.ac
--- neon-0.32.2-orig/configure.ac	2022-01-11 06:20:48.000000000 -0600
+++ neon-0.32.2/configure.ac	2022-03-19 20:20:11.000000000 -0500
@@ -79,14 +79,14 @@
 # Leave till last to prevent CFLAGS affecting checks.
 NEON_WARNINGS
 
-CPPFLAGS="$CPPFLAGS -I\${top_builddir}"
+CPPFLAGS="-I\${top_builddir} $CPPFLAGS"
 
 AC_ARG_ENABLE(memleak, 
   AS_HELP_STRING([--enable-memleak],
                  [for test builds only: enable memory leak checking]))
 
 if test "$enable_memleak" = "yes"; then
-  CPPFLAGS="$CPPFLAGS -DNEON_MEMLEAK -I\$(top_srcdir)/src"
+  CPPFLAGS="-DNEON_MEMLEAK -I\$(top_srcdir)/src $CPPFLAGS"
   # disable 'make install'
   ALLOW_INSTALL=memleak
 fi
diff -ruN neon-0.32.2-orig/macros/neon.m4 neon-0.32.2/macros/neon.m4
--- neon-0.32.2-orig/macros/neon.m4	2022-01-11 06:20:48.000000000 -0600
+++ neon-0.32.2/macros/neon.m4	2022-03-19 20:21:29.000000000 -0500
@@ -463,7 +463,7 @@
 
 if test "$ne_cv_os_uname" = "Darwin"; then
   CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
-  LDFLAGS="$LDFLAGS -flat_namespace" 
+  LDFLAGS="$LDFLAGS" 
   # poll has various issues in various Darwin releases
   if test x${ac_cv_func_poll+set} != xset; then
     ac_cv_func_poll=no
@@ -1116,8 +1116,8 @@
      KRB5_CONF_TOOL=pkgconf],
     [AC_PATH_PROG([KRB5_CONF_TOOL], krb5-config, none, $PATH:/usr/kerberos/bin)
      if test "x$KRB5_CONF_TOOL" != "xnone"; then
-        NE_GSSAPI_LIBS="`${KRB5_CONF_TOOL} --libs gssapi`"
-        NE_GSSAPI_CFLAGS="`${KRB5_CONF_TOOL} --cflags gssapi`"
+        NE_GSSAPI_LIBS="`${KRB5_CONF_TOOL} --libs krb5`"
+        NE_GSSAPI_CFLAGS="`${KRB5_CONF_TOOL} --cflags krb5`"
         NE_GSSAPI_VERSION="`${KRB5_CONF_TOOL} --version`"
      fi])
 else
diff -ruN neon-0.32.2-orig/test/Makefile.in neon-0.32.2/test/Makefile.in
--- neon-0.32.2-orig/test/Makefile.in	2022-01-11 06:20:48.000000000 -0600
+++ neon-0.32.2/test/Makefile.in	2022-03-19 20:20:11.000000000 -0500
@@ -1,7 +1,7 @@
 # Makefile for neon test suite.
 
 SHELL = @SHELL@
-CPPFLAGS = @CPPFLAGS@ -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common
+CPPFLAGS = -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common @CPPFLAGS@
 CFLAGS = @CFLAGS@ @NEON_CFLAGS@
 LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@