We always HAVE_CONFIG_H so don't bother checking whether we have it or not.

svn path=/trunk/; revision=44997

8 files changed, 8 insertions, 26 deletions

diff --git a/doc/README.developer b/doc/README.developer
index bdfe293213..f8ee681f8b 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -794,9 +794,7 @@ SVN repository (committed).
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #if 0
 /* Include only as needed */
diff --git a/doc/README.stats_tree b/doc/README.stats_tree
index fa6fc4fdd4..712523d466 100644
--- a/doc/README.stats_tree
+++ b/doc/README.stats_tree
@@ -65,9 +65,7 @@ A small example of a very basic stats_tree plugin follows.
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifndef ENABLE_STATIC
 #include <gmodule.h>
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.xml b/docbook/wsdg_src/WSDG_chapter_dissection.xml
index 52c5eac0cb..6bdfd4784f 100644
--- a/docbook/wsdg_src/WSDG_chapter_dissection.xml
+++ b/docbook/wsdg_src/WSDG_chapter_dissection.xml
@@ -76,9 +76,7 @@
 	   </para>
 	   <example><title>Dissector Initialisation.</title>
    <programlisting>
-<![CDATA[#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+<![CDATA[#include "config.h"
 
 #include <epan/packet.h>
 
@@ -970,9 +968,7 @@ static gint *ett[] =
 		<example>
 			<title>Reassembling TCP fragments</title>
 			<programlisting>
-<![CDATA[#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+<![CDATA[#include "config.h"
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/tools/make-dissector-reg b/tools/make-dissector-reg
index 6bf9a28adf..de486de3e2 100755
--- a/tools/make-dissector-reg
+++ b/tools/make-dissector-reg
@@ -37,9 +37,7 @@ echo '/* It is created automatically by the Makefile. */'>>${outfile}-tmp
 if [ "$registertype" = plugin ]
 then
 	cat <<"EOF" >>${outfile}-tmp
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <gmodule.h>
 
diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py
index 01baa0d22b..531a63ddbe 100755
--- a/tools/make-dissector-reg.py
+++ b/tools/make-dissector-reg.py
@@ -184,9 +184,7 @@ reg_code.write(preamble)
 # Make the routine to register all protocols
 if registertype == "plugin" or registertype == "plugin_wtap":
 	reg_code.write("""
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <gmodule.h>
 
diff --git a/tools/make-sminmpec.pl b/tools/make-sminmpec.pl
index 97d6c8c6a3..1cc17bea8e 100755
--- a/tools/make-sminmpec.pl
+++ b/tools/make-sminmpec.pl
@@ -127,9 +127,7 @@ print OUT <<"_SMINMPEC";
  *       with "(Unknown)" as the name so that direct (indexed) access
  *       to the list is possible.
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index c784291bc9..2b0ae2dacd 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -5719,9 +5719,7 @@ def produce_code():
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <glib.h>
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index 4e398bffb9..db2c2d5772 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -1994,9 +1994,7 @@ static int hf_operationrequest = -1;/* Request_Operation field */
 
     template_Includes = """\
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <gmodule.h>