Modify includes of config.h so that out-of-tree builds, i.e. CMake
authorGraham Bloice <graham.bloice@trihedral.com>
Fri, 22 Aug 2014 21:13:05 +0000 (22:13 +0100)
committerGraham Bloice <graham.bloice@trihedral.com>
Sun, 24 Aug 2014 08:04:08 +0000 (08:04 +0000)
don't pick up the in-tree copy.

Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71
Reviewed-on: https://code.wireshark.org/review/3798
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
31 files changed:
capinfos.c
capture_info.c
capture_opts.c
capture_stop_conditions.c
captype.c
cfile.c
color_filters.c
conditions.c
dftest.c
dumpcap.c
echld_test.c
editcap.c
extcap.c
extcap.h
extcap_parser.c
file.c
fileset.c
frame_tvbuff.c
mergecap.c
pcapio.c
randpkt.c
rawshark.c
reordercap.c
ringbuffer.c
summary.c
sync_pipe_write.c
text2pcap.c
tfshark.c
tshark.c
version_info.c
wsutil/unicode-utils.h

index b3b58be8d70526d0f62419320a469469f4267fa8..571c419047f4cc5d00e98cbe4f12f77b9c437ad2 100644 (file)
@@ -54,7 +54,7 @@
  */
 
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
index 3ef12df504da1434b085c0c260045a5996d48e40..3a4abc3d02e3ffb5f7b59b7856ec1aa48d19d921 100644 (file)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_LIBPCAP
 
index 9d5620c0f2e465fcc055cb53070a021df952a69d..f783d9f811460bb6bdee04824a042eb59394a023 100644 (file)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
index 9f375924508c47c0c0558727e99791de3a471656..b42facdb8e8c886f357e5b36f60e01d5f4b6a975 100644 (file)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <time.h>
 #include <string.h>
index d37ee90d78293d7372f8fb7f1c4c8bfabfe17785..6dd1769ac27c94f031ac216ad8a36c28a32ef9cc 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/cfile.c b/cfile.c
index 08d73bed9070a2ddf54ea836b2c878aa660f53d9..7d6a0d8e43f4e1b9eacfe1d5dda02f7cc82c87e0 100644 (file)
--- a/cfile.c
+++ b/cfile.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 
index d30871573a34128db97ac9ccd930609dfdc6002a..297d4ead4ca0a02f3c1fba2ea6870252eb4760e6 100644 (file)
@@ -23,7 +23,7 @@
  * Updated 1 Dec 10 jjm
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 
index 458168b298c9ac9fed61ec290ac8924eaf1a856e..aaaf959946ac265cf0d334ee1d2cdf00eecdd7c5 100644 (file)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 #include <stdlib.h>
index db9eeb0d2c0e15a004e46e4dd58078691c96dc56..0ef6a9342e5aee3bf63b72001e0a326efeed4db4 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
index 7bb7dd994ff380cd1b60c54db25c8d73a2a458db..68ce88fd0c3dbf31fbd245cff534c3a62a97aa0c 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h> /* for exit() */
index 0cc30b38ab5d05942d8b3e6e03710f7eace612dc..1abb3ae8d2710907e6f0d2b3f46e20545c149d7e 100644 (file)
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
index ebdab74d34797f8cfc92958c7550282e8e12cc96..7d0381cdcc6c90e44ccf804e36b2e25a6c1f3c7a 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -26,7 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
index a676fc7233b5d20f68199589e62cd77697b72679..73b04bf2caf3e2e0e7d97159f4803c91b797e218 100644 (file)
--- a/extcap.c
+++ b/extcap.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -178,7 +178,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb,
                        argv[argc+1] = NULL;
 
                        status = g_spawn_sync(dirname, argv, NULL,
-                               (GSpawnFlags) 0, NULL, NULL, 
+                               (GSpawnFlags) 0, NULL, NULL,
                                        &command_output, NULL, &exit_status, &error);
 
                        if (status && exit_status == 0)
index 64ea8550451234427b41fffd5ea09fe346ec134c..675a817dbb96400a62646de02e80c1950ea67e38 100644 (file)
--- a/extcap.h
+++ b/extcap.h
@@ -24,7 +24,7 @@
 #ifndef __EXTCAP_H__
 #define __EXTCAP_H__
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 
index 274428f981a0e552c6c693f4bec23040647cd09b..8fdbb1f0f53345f3306f6b802ac8613824c7681c 100644 (file)
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <glib.h>
diff --git a/file.c b/file.c
index edfca6a860ef95ff8edc9363ebe85dc022e8a537..8324b7ab7fcdaa8679c2d2d761b9a46c6784611d 100644 (file)
--- a/file.c
+++ b/file.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
index 1c1a69fb4f03254433dab039e7cc69c349cdcec5..9caf95f1415d00ec8f61d946531119314487ce87 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
index c577f4693adc57537976c2320e7b8393358c1364..70b1e1d103fac57063fe917fc2336f5ba35ebae1 100644 (file)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 
index 748a317febb73b84f672dde8b4ffad727a30c77b..3e26f9c6825647ebb405927265bcc84db7666121 100644 (file)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
index 91cec77f5266123c53074a8524a4cd96887eb185..9020acd4a3e0c2eaaed1e788d416e662384d19cd 100644 (file)
--- a/pcapio.c
+++ b/pcapio.c
@@ -38,7 +38,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
index 5393fa9ee19d51477822712da5261e7e47e1b5cd..c08109ddea77bfcfca067b4a1a5d1c6ceb48d047 100644 (file)
--- a/randpkt.c
+++ b/randpkt.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
index 53ad1ac0221a9b7c9551f6f4015cd9d2a69eb996..7de15440c9592e2e6e70c2e41f9366547ce00737 100644 (file)
@@ -32,7 +32,7 @@
  * - Prints a status line, followed by fields from a specified list.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
index fc610fab5a3155fd195e139260792bfa6a3a82e8..7ca14144ed372c2dbd625901e9e6a0e54f4e0760 100644 (file)
@@ -21,7 +21,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
index 63cf47f00cede581d63b50b8abe28fd49adaf016..ffd02ae3566bb1a8b3f84bc6273f68749f42ade1 100644 (file)
@@ -40,7 +40,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_LIBPCAP
 
index dd492d62e07f3662e1a4274345c10bbae973dcfe..d7f77a4ff6742a8a0dcce9a2d1bc7214b9b46129 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <wiretap/pcap-encap.h>
 
index d8a09fc91b6f15b9cb556d0adfcc563c72c96015..ea732ee3cd5706e7faf6d5dbe822622bf2c1e56c 100644 (file)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 
index 3292902a8fdd81f68032c43c9e25fef7ee4465f1..f15001bd99052a9522b0f1776427b95ad9828d01 100644 (file)
@@ -75,7 +75,7 @@
  * snaplength is automatically set to 64KiB-1.
  */
 
-#include "config.h"
+#include <config.h>
 
 /*
  * Just make sure we include the prototype for strptime as well
index e7d4dd3515fc82b7c83a7eae67d6c7a321752a38..445c79ff6b56423ff73340080110e2518e8207c8 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
index 3ab45edb718c96c28acf94bf79544d88a6fc040d..e800eb63caf65df63e3ea0d8ddb9a11955412424 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
index 03785f91422688dd988c8edeb1669a5ef4c0a6d4..8ea91627780b9f026c463aa7505a1357bc7e71f2 100644 (file)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <glib.h>
 
index 2674a6ca8fa08e5e8f1fbaa49c72d0236a227871..21e74968ee2d67bbe5e0a5e3fa026862c931ea67 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef __UNICODEUTIL_H__
 #define __UNICODEUTIL_H__
 
-#include "config.h"
+#include <config.h>
 
 #include "ws_symbol_export.h"