Index: sudo-1.8.19p1/src/sudo_edit.c
===================================================================
--- sudo-1.8.19p1.orig/src/sudo_edit.c
+++ sudo-1.8.19p1/src/sudo_edit.c
@@ -377,6 +377,11 @@ dir_is_writable(int dfd, struct user_det
  * Directory open flags for use with openat(2).
  * Use O_SEARCH/O_PATH and/or O_DIRECTORY where possible.
  */
+
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+
 #if defined(O_SEARCH)
 # define DIR_OPEN_FLAGS	(O_SEARCH|O_DIRECTORY)
 #elif defined(O_PATH)
Index: sudo-1.8.19p1/configure.ac
===================================================================
--- sudo-1.8.19p1.orig/configure.ac
+++ sudo-1.8.19p1/configure.ac
@@ -1680,8 +1680,6 @@ fi
 
 case "$host" in
     *-*-solaris2*)
-		AC_DEFINE([PAM_SUN_CODEBASE])
-
 		# LD_PRELOAD is space-delimited
 		RTLD_PRELOAD_DELIM=" "
 
@@ -1693,8 +1691,6 @@ case "$host" in
 		if test "$with_AFS" = "yes"; then
 		    AFS_LIBS="-lc -lucb"
 		fi
-		: ${mansectsu='1m'}
-		: ${mansectform='4'}
 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
 		AC_CHECK_FUNCS([priv_set], [PSMAN=1])
 		;;