[openssh-commits] [openssh] 01/04: Remove potentially leftover include compat shims.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit d7a9cd696a316c71e4c16f4158dc516b94abd863
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Mon Feb 23 21:34:48 2026 -0500

    Remove potentially leftover include compat shims.
    
    If we don't need a specific shim, ensure it does not exist.  Prevents
    confusion if configurations change or the directory is reused across
    different platforms.
---
 configure.ac | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e537c982a..110d39088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,7 +542,11 @@ AC_CHECK_HEADERS([ \
     sys/time.h \
     sys/un.h \
     time.h \
-    util.h], [], [
+    util.h \
+    ], [
+	# Remove any old shims.
+	rm -f "$COMPATINCLUDESDIR/$ac_header"
+    ], [
 	COMPATINCLUDES="$COMPATINCLUDESDIR"
 	header="$COMPATINCLUDES/$ac_header"
 	dir=`dirname "$header"`
@@ -1766,11 +1770,13 @@ dnl create a glob.h shim so we don't have to sprinkle ifdefs everywhere.
 AC_MSG_CHECKING([if we can use the system glob])
 if test "x$use_system_glob" = "xyes" ; then
 	AC_MSG_RESULT([yes])
+	# Remove any old shims.
+	rm -f "$COMPATINCLUDESDIR/glob.h"
 else
 	AC_MSG_RESULT([no])
-	COMPATINCLUDES="openbsd-compat/include"
+	COMPATINCLUDES="$COMPATINCLUDESDIR"
 	mkdir -p "$COMPATINCLUDES"
-	echo '# include "openbsd-compat/glob.h"' >$COMPATINCLUDES/glob.h
+	echo '#include "openbsd-compat/glob.h"' >$COMPATINCLUDES/glob.h
 fi
 
 AC_CHECK_DECL([VIS_ALL], ,

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.