On Sat, May 9, 2020 at 1:10 AM Gregg Smith <g...@gknw.net> wrote:
>
> > htdbm and htpasswd :
> > support\passwd_common.h(31,10): fatal error C1083: Cannot open include
> > file: 'ap_config_auto.h': No such file or directory.
> >
> This gives me a deja vu feeling with what stopped mod_ssl from building
> in 2.4.42. The winbuilds dsp/mak files generate headers by copying a
> .h.in file of the same name like ap_config_layout.h.in. This deja vu
> feeling tells me just feeding it an empty ap_config_auto.h will not do.
> It might build at least and seem to work but wouldn't be correct.
> Yann? :)

I think we should not #include ap_config_auto.h directly, but
ap_config.h instead (which has the necessary #ifnot WINW32..).

So how about the attached patch?

Regards,
Yann.
Index: modules/dav/fs/mod_dav_fs.c
===================================================================
--- modules/dav/fs/mod_dav_fs.c	(revision 1876933)
+++ modules/dav/fs/mod_dav_fs.c	(working copy)
@@ -17,9 +17,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "apr_strings.h"
-#if !defined(_MSC_VER) && !defined(NETWARE)
-#include "ap_config_auto.h"
-#endif
+#include "ap_config.h"
 
 #include "mod_dav.h"
 #include "repos.h"
Index: modules/proxy/mod_serf.h
===================================================================
--- modules/proxy/mod_serf.h	(revision 1876933)
+++ modules/proxy/mod_serf.h	(working copy)
@@ -23,9 +23,7 @@
 
 #include "httpd.h"
 #include "http_config.h"
-#if !defined(WIN32) && !defined(NETWARE)
-#include "ap_config_auto.h"
-#endif
+#include "ap_config.h"
 #ifdef HAVE_SERF
 #include "serf.h"
 #endif
Index: support/ab.c
===================================================================
--- support/ab.c	(revision 1876933)
+++ support/ab.c	(working copy)
@@ -153,9 +153,7 @@
 #include <unistd.h> /* for getpid() */
 #endif
 
-#if !defined(WIN32) && !defined(NETWARE)
-#include "ap_config_auto.h"
-#endif
+#include "ap_config.h"
 
 #if defined(HAVE_OPENSSL)
 
Index: support/passwd_common.h
===================================================================
--- support/passwd_common.h	(revision 1876933)
+++ support/passwd_common.h	(working copy)
@@ -28,7 +28,7 @@
 #include "apu_version.h"
 #endif
 
-#include "ap_config_auto.h"
+#include "ap_config.h"
 
 #define MAX_STRING_LEN 256
 

Reply via email to