diff --git a/configure b/configure
index 39bfcb7b2..a0d0188e5 100755
--- a/configure
+++ b/configure
@@ -27464,15 +27464,15 @@ if test ${SUDOERS_LDFLAGS+y}
 then :
 
   case " $SUDOERS_LDFLAGS " in #(
-  *" --tag=disable-shared -static "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains --tag=disable-shared -static"; } >&5
-  (: SUDOERS_LDFLAGS already contains --tag=disable-shared -static) 2>&5
+  *" --tag=disable-shared "*) :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains --tag=disable-shared"; } >&5
+  (: SUDOERS_LDFLAGS already contains --tag=disable-shared) 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; #(
   *) :
 
-     as_fn_append SUDOERS_LDFLAGS " --tag=disable-shared -static"
+     as_fn_append SUDOERS_LDFLAGS " --tag=disable-shared"
      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
   (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
   ac_status=$?
@@ -27483,7 +27483,40 @@ esac
 
 else $as_nop
 
-  SUDOERS_LDFLAGS=--tag=disable-shared -static
+  SUDOERS_LDFLAGS=--tag=disable-shared
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
+  (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+
+if test ${SUDOERS_LDFLAGS+y}
+then :
+
+  case " $SUDOERS_LDFLAGS " in #(
+  *" -static "*) :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains -static"; } >&5
+  (: SUDOERS_LDFLAGS already contains -static) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append SUDOERS_LDFLAGS " -static"
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
+  (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else $as_nop
+
+  SUDOERS_LDFLAGS=-static
   { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
   (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
   ac_status=$?
@@ -27510,15 +27543,15 @@ if test ${SUDOERS_LDFLAGS+y}
 then :
 
   case " $SUDOERS_LDFLAGS " in #(
-  *" --tag=disable-shared -static "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains --tag=disable-shared -static"; } >&5
-  (: SUDOERS_LDFLAGS already contains --tag=disable-shared -static) 2>&5
+  *" --tag=disable-shared "*) :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains --tag=disable-shared"; } >&5
+  (: SUDOERS_LDFLAGS already contains --tag=disable-shared) 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; #(
   *) :
 
-     as_fn_append SUDOERS_LDFLAGS " --tag=disable-shared -static"
+     as_fn_append SUDOERS_LDFLAGS " --tag=disable-shared"
      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
   (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
   ac_status=$?
@@ -27529,7 +27562,40 @@ esac
 
 else $as_nop
 
-  SUDOERS_LDFLAGS=--tag=disable-shared -static
+  SUDOERS_LDFLAGS=--tag=disable-shared
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
+  (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+
+if test ${SUDOERS_LDFLAGS+y}
+then :
+
+  case " $SUDOERS_LDFLAGS " in #(
+  *" -static "*) :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains -static"; } >&5
+  (: SUDOERS_LDFLAGS already contains -static) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append SUDOERS_LDFLAGS " -static"
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
+  (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else $as_nop
+
+  SUDOERS_LDFLAGS=-static
   { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
   (: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
   ac_status=$?
diff --git a/configure.ac b/configure.ac
index 7f8919a6e..680687bfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3845,7 +3845,9 @@ if test ${with_kerb5-'no'} != "no"; then
     if test -n "$KRB5CONFIG"; then
 	AC_DEFINE(HAVE_KERB5)
 	AUTH_OBJS="$AUTH_OBJS kerb5.lo"
-	AX_APPEND_FLAG([`krb5-config --cflags`], [CPPFLAGS])
+	for f in `krb5-config --cflags`; do
+	    AX_APPEND_FLAG([$f], [CPPFLAGS])
+	done
 	SUDOERS_LIBS="$SUDOERS_LIBS `krb5-config --libs`"
 	dnl
 	dnl Try to determine whether we have Heimdal or MIT Kerberos
@@ -4311,7 +4313,8 @@ case "$lt_cv_dlopen" in
 	    AC_DEFINE(STATIC_SUDOERS_PLUGIN)
 	    SUDO_OBJS="${SUDO_OBJS} preload.o"
 	    STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
-	    AX_APPEND_FLAG([--tag=disable-shared -static], [SUDOERS_LDFLAGS])
+	    AX_APPEND_FLAG([--tag=disable-shared], [SUDOERS_LDFLAGS])
+	    AX_APPEND_FLAG([-static], [SUDOERS_LDFLAGS])
 	    LT_STATIC=""
 	else
 	    LT_STATIC="--tag=disable-static"
@@ -4323,7 +4326,8 @@ case "$lt_cv_dlopen" in
 	    AC_DEFINE(STATIC_SUDOERS_PLUGIN)
 	    SUDO_OBJS="${SUDO_OBJS} preload.o"
 	    STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
-	    AX_APPEND_FLAG([--tag=disable-shared -static], [SUDOERS_LDFLAGS])
+	    AX_APPEND_FLAG([--tag=disable-shared], [SUDOERS_LDFLAGS])
+	    AX_APPEND_FLAG([-static], [SUDOERS_LDFLAGS])
 	    LT_STATIC=""
 	else
 	    LT_STATIC="--tag=disable-static"