build: remove autoconf.h from dist

We were including "autoconf.h" in our dist releases, however this file
is generated by ./configure. This can be problematic in out of tree
builds as the one included in the dist, not the generated one may be
used.

Also using "autoconf.h" instead of <autoconf.h> so it is searched for
relative to the file including it which is necessary if a library/plugin
does something like "#include "suricata/foo.h".

diff --git a/src/Makefile.am b/src/Makefile.am
index 166555e8c0b83eb7f4e932f237b82d48a7666800..661959505476b0d8d5969ec22ad6352ab8f43d9e 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,6 @@ noinst_HEADERS = \
        app-layer-ssh.h \
        app-layer-ssl.h \
        app-layer-tftp.h \
-       autoconf.h \
        build-info.h \
        conf.h \
        conf-yaml-loader.h \
@@ -1298,6 +1297,10 @@ install-headers:
                $(INSTALL_DATA) $$header "$(DESTDIR)${includedir}/suricata"; \
        done
 
+# Until we can remove autoconf.h from our headers, we need to to
+# provide this for library/plugin users.
+       $(INSTALL_DATA) autoconf.h "$(DESTDIR)${includedir}/suricata"
+
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes)
 

diff --git a/src/suricata-common.h b/src/suricata-common.h
index 297a6fc4521e6339149a932ee07d95e3b7f21aec..23bf6335eab655cba9167ede8678498321cbd8dc 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -48,7 +48,7 @@
 #endif
 
 #if HAVE_CONFIG_H
-#include <autoconf.h>
+#include "autoconf.h"
 #endif
 
 #ifndef CLS