- (djm) Add replacement glob() from OpenBSD libc if the system glob is
missing or lacks the GLOB_ALTDIRFUNC extension
- (djm) Remove -I$(srcdir)/openbsd-compat from CFLAGS, refer to headers
relatively. Avoids conflict between glob.h and /usr/include/glob.h
diff --git a/includes.h b/includes.h
index a4ebbd3..3f834ba 100644
--- a/includes.h
+++ b/includes.h
@@ -21,7 +21,7 @@
#include "config.h"
-#include "bsd-nextstep.h"
+#include "openbsd-compat/bsd-nextstep.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -54,6 +54,9 @@
#ifdef HAVE_BSTRING_H
# include <bstring.h>
#endif
+#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC)
+# include <glob.h>
+#endif
#ifdef HAVE_NETGROUP_H
# include <netgroup.h>
#endif
@@ -95,8 +98,8 @@
# include <vis.h>
#endif
#include "version.h"
-#include "openbsd-compat.h"
-#include "bsd-cygwin_util.h"
+#include "openbsd-compat/openbsd-compat.h"
+#include "openbsd-compat/bsd-cygwin_util.h"
#include "entropy.h"
#endif /* INCLUDES_H */