Move Autoconf's macro definitions into config.h.

This makes "make" output slightly more readable.

diff --git a/configure.ac b/configure.ac
index 22f263d4eb3777c5fd090767e2a8797244e88fb5..eb5f9fdd72c111295b834b5dfa541ccbcfddebe5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_PREREQ(2.59)
 AC_INIT(openflow, v0.8.1, info@openflowswitch.org)
+AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC

diff --git a/controller/controller.c b/controller/controller.c
index c43926c40f0be33ada72c492f118cdff80152833..8e2c7b5c802160a07fd0b4017e95bba1c2bb0682 100644 (file)
--- a/controller/controller.c
+++ b/controller/controller.c
@@ -31,6 +31,8 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
+
 #include <errno.h>
 #include <getopt.h>
 #include <limits.h>

diff --git a/lib/buffer.c b/lib/buffer.c
index 1abe240647f8721ed93367c11de0bc14a6447333..2014248dcb8c744950e3428354901a2994d82c32 100644 (file)
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "buffer.h"
 #include <assert.h>
 #include <stdlib.h>

diff --git a/lib/command-line.c b/lib/command-line.c
index 5ad98d76d08ba9e5109ea0335ac55762857c0498..7ab08a4d3d96bf3198ac698fb09132197a403627 100644 (file)
--- a/lib/command-line.c
+++ b/lib/command-line.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "command-line.h"
 #include <getopt.h>
 #include <limits.h>

diff --git a/lib/csum.c b/lib/csum.c
index 6e9b06b028fec7a6839475a281c5444d9b4fdb98..81b3dc13b493faabec2537ed5e9d4062654219be 100644 (file)
--- a/lib/csum.c
+++ b/lib/csum.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "csum.h"
 
 /* Returns the IP checksum of the 'n' bytes in 'data'. */

diff --git a/lib/daemon.c b/lib/daemon.c
index e3c2b13e007b7e96e34c7847c6a10c95597a91cb..2a835be9702591c773ca66f6a310bcfc9734c462 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "daemon.h"
 #include <errno.h>
 #include <stdlib.h>

diff --git a/lib/dhcp-client.c b/lib/dhcp-client.c
index 98f9b445219d400c6be93be8518958d81d58a958..c1724477f5a49f9e01df53a41e63bc5a4a7cc91f 100644 (file)
--- a/lib/dhcp-client.c
+++ b/lib/dhcp-client.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "dhcp-client.h"
 #include <arpa/inet.h>
 #include <assert.h>

diff --git a/lib/dhcp.c b/lib/dhcp.c
index 851c5638f1c06a372e5d27af8bc5bce1afbbba3d..1e8918f7a491f345142f6e6eb29cd705fb3d19ff 100644 (file)
--- a/lib/dhcp.c
+++ b/lib/dhcp.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "dhcp.h"
 #include <arpa/inet.h>
 #include <assert.h>

diff --git a/lib/dpif.c b/lib/dpif.c
index 5d9c33c6a17f7a4b37d2c6d34a76d82310cd8fb2..202a1828380de6aef8517a6d1e605464fc2dca90 100644 (file)
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "dpif.h"
 
 #include <ctype.h>

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index f08e8cb526a9b00e1176dfa3a4f3802104a2e71c..d12739b7551a751a7a6f42c60496adf5804d16f0 100644 (file)
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "dynamic-string.h"
 #include <assert.h>
 #include <stdlib.h>

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 43b27a39a0d0e3b1311eb54402b4fb2e43f8744d..33bc594273331a5efc7cee09eea6952b6b11537a 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -30,6 +30,7 @@
  * advertising or publicity pertaining to the Software or any
  * derivatives without specific, written prior permission.
  */
+#include <config.h>
 #include "fatal-signal.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/lib/fault.c b/lib/fault.c
index 0967f7dbbe33bd9a345b7adfde3334c2f0f6ed84..762357097d7dc6d5edd042ac02fbda2189d4aa27 100644 (file)
--- a/lib/fault.c
+++ b/lib/fault.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "fault.h"
 #include <dlfcn.h>
 #include <inttypes.h>

diff --git a/lib/flow.c b/lib/flow.c
index 449a286f78dea7144415d56a944c8902c671bd01..7340e7d48a54d643795f9d48b44a77748bc90058 100644 (file)
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -30,6 +30,7 @@
  * advertising or publicity pertaining to the Software or any
  * derivatives without specific, written prior permission.
  */
+#include <config.h>
 #include <sys/types.h>
 #include "flow.h"
 #include <inttypes.h>

diff --git a/lib/hash.c b/lib/hash.c
index b65a49df275758a62d812de394dd9608d76d4a87..8e87216b8a9dee863a38510dfdce36f25c2722c6 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -30,6 +30,7 @@
  * advertising or publicity pertaining to the Software or any
  * derivatives without specific, written prior permission.
  */
+#include <config.h>
 #include "hash.h"
 
 uint32_t

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 3b432d3b288351e7e260a32bd01ba8201598fd38..b477e7051cbb49bbd527cf81842d51a8a48c4a3e 100644 (file)
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "learning-switch.h"
 
 #include <errno.h>

diff --git a/lib/list.c b/lib/list.c
index c35ef10bba49347b4dfe056911457ea2123da837..8eaf9fe94d3d5dac8204eab8ca7c66c3eac9702a 100644 (file)
--- a/lib/list.c
+++ b/lib/list.c
@@ -30,6 +30,7 @@
  * advertising or publicity pertaining to the Software or any
  * derivatives without specific, written prior permission.
  */
+#include <config.h>
 #include "list.h"
 #include <assert.h>
 

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
index 5311ccf64b006de113f3bb3f8e6aec5318966397..29a66f1b9ca7de33bf4be3458fe8ff54f4b159b5 100644 (file)
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "mac-learning.h"
 
 #include <assert.h>

diff --git a/lib/netdev.c b/lib/netdev.c
index 34c7747ddd803ca59a2b08bb5456fd04f01099fd..0bcef6712ffdac5499c705ad5abb401c4ce9cc48 100644 (file)
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "netdev.h"
 
 #include <assert.h>

diff --git a/lib/netlink.c b/lib/netlink.c
index 2d63ceba68cb7ceda907a04ef1ef7d85715a98b6..d9dd435c0211959f4f80812a6e4b71a882d1ae9a 100644 (file)
--- a/lib/netlink.c
+++ b/lib/netlink.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "netlink.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 6ba3694eb3319fc1c44b9eb38b4328df5ac83206..2af4553f491885c0d7bb17f916fb67d7d16a0b23 100644 (file)
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "ofp-print.h"
 #include "xtoxll.h"
 

diff --git a/lib/poll-loop.c b/lib/poll-loop.c
index 556521ab91882c2b69266919c56d9ede1b699ceb..71f1e6f24de2662d4fc86f36092e9ab5041bae3c 100644 (file)
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "poll-loop.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/lib/queue.c b/lib/queue.c
index 586ae52a00e95b09f7db6f3c6fb0ec48f1a05c64..635e14426192df7bc3fc52cf2d6685fbd3aa6125 100644 (file)
--- a/lib/queue.c
+++ b/lib/queue.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "queue.h"
 #include <assert.h>
 #include "buffer.h"

diff --git a/lib/random.c b/lib/random.c
index d5d8b957fb39876e4ce9115726440cd3c07a12cd..c7a3edf7468edd9fd17a759cd59ee50edfba9ff5 100644 (file)
--- a/lib/random.c
+++ b/lib/random.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "random.h"
 
 #include <errno.h>

diff --git a/lib/rconn.c b/lib/rconn.c
index a145e4e3181f1454b7e11d7c3828edc1695f0f8e..5bd352b0fab332148566e4a50d121864432b7490 100644 (file)
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "rconn.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/lib/socket-util.c b/lib/socket-util.c
index 20e0f2073bacb704c43cf63fbd832e3d0c2f1808..91cdc1d6829c1b663e52ead3b71b9d86f1038475 100644 (file)
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "socket-util.h"
 #include <arpa/inet.h>
 #include <errno.h>

diff --git a/lib/util.c b/lib/util.c
index 230a2470425db0917d823b6a2ac468a594f1163e..59c7806e61e3dc6cf46fa3974904a6c20dd2dfe1 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "util.h"
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/lib/vconn-netlink.c b/lib/vconn-netlink.c
index 84d7d3548196ae1fc87f62e58da939ae64bc9c80..403f3fc18cdd94b3c525c5cdcd8dad54a7343a2f 100644 (file)
--- a/lib/vconn-netlink.c
+++ b/lib/vconn-netlink.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "vconn.h"
 #include <arpa/inet.h>
 #include <assert.h>

diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c
index a7060d74bb9a91e4f1bd7c80829437a9b4132a1a..d109cfdb0d394b4118c38c2eff458a55dc79499f 100644 (file)
--- a/lib/vconn-ssl.c
+++ b/lib/vconn-ssl.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "vconn-ssl.h"
 #include "dhparams.h"
 #include <assert.h>

diff --git a/lib/vconn-tcp.c b/lib/vconn-tcp.c
index 80c8f56c5b6c558846d3c8686042a592edf763cf..7fbec081ea9f80734742f9c22cb2bf8b81cff454 100644 (file)
--- a/lib/vconn-tcp.c
+++ b/lib/vconn-tcp.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "vconn.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/lib/vconn.c b/lib/vconn.c
index 103c9df58b20713c7008bd00eb2d92ca73c67acd..69fe7f8ec6de1d5f6a155ec7450b552bfce73a35 100644 (file)
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "vconn.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/lib/vlog-socket.c b/lib/vlog-socket.c
index 05b91864ccbc182c07e8632baf9c98f0b40d0ca9..7caaf12e180e9014a9555045b29a88388533c4a2 100644 (file)
--- a/lib/vlog-socket.c
+++ b/lib/vlog-socket.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "vlog-socket.h"
 #include <errno.h>
 #include <sys/un.h>

diff --git a/lib/vlog.c b/lib/vlog.c
index 6b3d871f5197f402425863b3156780e298383a1a..6494de9322bdc33e213389083c8699808d3d0bc3 100644 (file)
--- a/lib/vlog.c
+++ b/lib/vlog.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "vlog.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/secchan/secchan.c b/secchan/secchan.c
index 7fb50c97b13b021755f6bfa2257ded0cbd1e9d7c..cc9e3bc4f8d61652cb3ddeee9d6b3f11f92eab71 100644 (file)
--- a/secchan/secchan.c
+++ b/secchan/secchan.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>

diff --git a/switch/chain.c b/switch/chain.c
index a85a650121579a528d8d764dbea807bc11a9a4c8..1e45a44b65e4914a9949e44f93ad38ba2c946a9d 100644 (file)
--- a/switch/chain.c
+++ b/switch/chain.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "chain.h"
 #include <assert.h>
 #include <errno.h>

diff --git a/switch/crc32.c b/switch/crc32.c
index 97c09611e12046e7725d3ded93c713b57eb74f7d..f6c2c0b3774d452f27cd8b4d295cae2350ec1d2d 100644 (file)
--- a/switch/crc32.c
+++ b/switch/crc32.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "crc32.h"
 
 void

diff --git a/switch/switch-flow.c b/switch/switch-flow.c
index 2af71d668aaad4f5c325d8021243ca6539d8c28c..732cea540d239b0682deab2a90f1211c317f1f0e 100644 (file)
--- a/switch/switch-flow.c
+++ b/switch/switch-flow.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "switch-flow.h"
 #include <arpa/inet.h>
 #include <assert.h>

diff --git a/switch/switch.c b/switch/switch.c
index 6cc6ae4e79e9803e3b87336e10c9a96ff93374f6..ee61fd6dbdbda7efecd56bd46b424832678233bf 100644 (file)
--- a/switch/switch.c
+++ b/switch/switch.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include <errno.h>
 #include <getopt.h>
 #include <limits.h>

diff --git a/switch/table-hash.c b/switch/table-hash.c
index aaec5039daad8a56585e1ec7fca3d8a66437fe34..461a4636f12a42f64eb83adf9d3545453435100e 100644 (file)
--- a/switch/table-hash.c
+++ b/switch/table-hash.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "table.h"
 #include <assert.h>
 #include <stdlib.h>

diff --git a/switch/table-linear.c b/switch/table-linear.c
index 6371bc25c795d929514d67a1b5f7bbfdb677275e..ff9d60b69cd9fcf1ca9fefbf5f5b33e54bb5f17f 100644 (file)
--- a/switch/table-linear.c
+++ b/switch/table-linear.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "table.h"
 #include <stdlib.h>
 #include "flow.h"

diff --git a/tests/test-dhcp-client.c b/tests/test-dhcp-client.c
index 528d1b19430aca4f8c7769c283ae3e97ddcf1fe3..3ed6eb6b62c654eb724fd7b4bd6750aec77cf938 100644 (file)
--- a/tests/test-dhcp-client.c
+++ b/tests/test-dhcp-client.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "dhcp-client.h"
 #include <arpa/inet.h>
 #include <getopt.h>

diff --git a/tests/test-list.c b/tests/test-list.c
index b9599dbfee71f87d89acdc9b547ab48b4d32d530..62857be9489b4859df71c5cc53c7755c5efac4a5 100644 (file)
--- a/tests/test-list.c
+++ b/tests/test-list.c
@@ -1,6 +1,7 @@
 /* A non-exhaustive test for some of the functions and macros declared in
  * list.h. */
 
+#include <config.h>
 #include "list.h"
 #include <string.h>
 

diff --git a/tests/test-type-props.c b/tests/test-type-props.c
index 5dff4d41a7bef3f597ab418701c1d120e676b4d4..67dabae8672b64da40b078293aa9b088d2d95f94 100644 (file)
--- a/tests/test-type-props.c
+++ b/tests/test-type-props.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "type-props.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/utilities/dpctl.c b/utilities/dpctl.c
index f5b2adece075686ba8ed3abc0718f8467a63be0f..7a3a020ee1a620f71f599d6fb9531013f7eb01e6 100644 (file)
--- a/utilities/dpctl.c
+++ b/utilities/dpctl.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>

diff --git a/utilities/vlogconf.c b/utilities/vlogconf.c
index f42740d89c959be4f42f471e85000f3e4140fd3d..838597d436c7786c70247ce438b59d6ff40e788a 100644 (file)
--- a/utilities/vlogconf.c
+++ b/utilities/vlogconf.c
@@ -30,6 +30,7 @@
  * advertising or publicity pertaining to the Software or any
  * derivatives without specific, written prior permission.
  */
+#include <config.h>
 #include "vlog.h"
 
 #include <dirent.h>