Move Autoconf's macro definitions into config.h.

This makes "make" output slightly more readable.

diff --git a/configure.ac b/configure.ac
index 22f263d..eb5f9fd 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 c43926c..8e2c7b5 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 1abe240..2014248 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 5ad98d7..7ab08a4 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 6e9b06b..81b3dc1 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 e3c2b13..2a835be 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 98f9b44..c172447 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 851c563..1e8918f 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 5d9c33c..202a182 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 f08e8cb..d12739b 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 43b27a3..33bc594 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 0967f7d..7623570 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 449a286..7340e7d 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 b65a49d..8e87216 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 3b432d3..b477e70 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 c35ef10..8eaf9fe 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 5311ccf..29a66f1 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 34c7747..0bcef67 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 2d63ceb..d9dd435 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 6ba3694..2af4553 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 556521a..71f1e6f 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 586ae52..635e144 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 d5d8b95..c7a3edf 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 a145e4e..5bd352b 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 20e0f20..91cdc1d 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 230a247..59c7806 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 84d7d35..403f3fc 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 a7060d7..d109cfd 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 80c8f56..7fbec08 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 103c9df..69fe7f8 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 05b9186..7caaf12 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 6b3d871..6494de9 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 7fb50c9..cc9e3bc 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 a85a650..1e45a44 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 97c0961..f6c2c0b 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 2af71d6..732cea5 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 6cc6ae4..ee61fd6 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 aaec503..461a463 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 6371bc2..ff9d60b 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 528d1b1..3ed6eb6 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 b9599db..62857be 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 5dff4d4..67dabae 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 f5b2ade..7a3a020 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 f42740d..838597d 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>