prefer includes local to builddir

src/const-info.c

@@ -1,8 +1,8 @@
 /* WARNING! This file is generated by the mk-const-info.c.sh program.
  * Do not edit manually!
  */
-#include <getdns/getdns.h>
 #include <stdlib.h>
+#include "getdns/getdns.h"
 #include "const-info.h"
 
 static struct const_info consts_info[] = {

src/context.c

@@ -34,7 +34,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include <arpa/inet.h>
 #include <ldns/ldns.h>
 #include <string.h>
@@ -45,6 +44,7 @@
 #include <unbound.h>
 #include <assert.h>
 
+#include "config.h"
 #include "context.h"
 #include "types-internal.h"
 #include "util-internal.h"

src/context.h

@@ -37,8 +37,8 @@
 #ifndef _GETDNS_CONTEXT_H_
 #define _GETDNS_CONTEXT_H_
 
-#include <getdns/getdns.h>
-#include <getdns/getdns_extra.h>
+#include "getdns/getdns.h"
+#include "getdns/getdns_extra.h"
 #include "types-internal.h"
 
 struct getdns_dns_req;

src/convert.c

@@ -32,14 +32,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getdns/getdns.h>
 #include <stdio.h>
 #include <arpa/inet.h>
-#include <util-internal.h>
 #include <locale.h>
 #include <stringprep.h>
 #include <idna.h>
 #include <ldns/ldns.h>
+#include "getdns/getdns.h"
+#include "util-internal.h"
 #include "getdns_error.h"
 
 /* stuff to make it compile pedantically */

src/dict.h

@@ -35,8 +35,8 @@
 #ifndef _GETDNS_DICT_H_
 #define _GETDNS_DICT_H_
 
-#include <getdns/getdns.h>
 #include <ldns/rbtree.h>
+#include "getdns/getdns.h"
 #include "types-internal.h"
 
 union getdns_item

src/dnssec.c

@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <unbound.h>
 #include <ldns/ldns.h>
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "config.h"
 #include "context.h"
 #include "util-internal.h"

src/extension/libev.c

@@ -33,10 +33,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getdns/getdns_ext_libev.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <ev.h>
+#include "getdns/getdns_ext_libev.h"
 
 #define RETURN_IF_NULL(ptr, code) if(ptr == NULL) return code;
 

src/extension/libevent.c

@@ -33,9 +33,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getdns/getdns_ext_libevent.h>
-#include "config.h"
 #include <sys/time.h>
+#include "getdns/getdns_ext_libevent.h"
+#include "config.h"
 
 #ifdef HAVE_EVENT2_EVENT_H
 #  include <event2/event.h>

src/extension/libuv.c

@@ -33,10 +33,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getdns/getdns_ext_libuv.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <uv.h>
+#include "getdns/getdns_ext_libuv.h"
 
 #define RETURN_IF_NULL(ptr, code) if(ptr == NULL) return code;
 

src/general.c

@@ -35,15 +35,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <stdio.h>
 #include <string.h>
 #include <unbound.h>
 #include <ldns/ldns.h>
+#include "config.h"
 #include "context.h"
 #include "types-internal.h"
 #include "util-internal.h"
 #include "dnssec.h"
-#include <stdio.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))

src/general.h

@@ -36,7 +36,7 @@
 #ifndef _GETDNS_GENERAL_H_
 #define _GETDNS_GENERAL_H_
 
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "types-internal.h"
 
 /* private inner helper used by sync and async */

src/getdns_error.c

@@ -31,7 +31,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "const-info.h"
 
 /*---------------------------------------- getdns_get_errorstr_by_id() */

src/getdns_error.h

@@ -35,7 +35,7 @@
 #ifndef GETDNS_ERROR_H
 #define GETDNS_ERROR_H
 
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 
 const char *getdns_get_errorstr_by_id(uint16_t err);
 

src/hostname.c

@@ -35,12 +35,12 @@
  */
 
 
-#include <getdns/getdns.h>
+#include <string.h>
+#include "getdns/getdns.h"
 #include "context.h"
 #include "general.h"
 #include "util-internal.h"
 #include "types-internal.h"
-#include <string.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))

src/list.h

@@ -37,7 +37,7 @@
 #ifndef _GETDNS_LIST_H_
 #define _GETDNS_LIST_H_
 
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "types-internal.h"
 
 #define GETDNS_LIST_BLOCKSZ 10

src/mk-const-info.c.sh

@@ -4,14 +4,14 @@ cat > const-info.c << END_OF_HEAD
 /* WARNING! This file is generated by the mk-const-info.c.sh program.
  * Do not edit manually!
  */
-#include <getdns/getdns.h>
 #include <stdlib.h>
+#include "getdns/getdns.h"
 #include "const-info.h"
 
 static struct const_info consts_info[] = {
 	{ -1, NULL, "/* <unknown getdns value> */" },
 END_OF_HEAD
-awk '/^[ 	]+GETDNS_[A-Z_]+[ 	]+=[ 	]+[0-9]+/{ print "\t{ "$3", \""$1"\", "$1"_TEXT }," }/^#define GETDNS_[A-Z_]+[ 	]+[0-9]+/ && !/^#define GETDNS_RRTYPE/ && !/_TEXT/{ print "\t{ "$3", \""$2"\", "$2"_TEXT },"}' getdns/getdns.h | sed 's/,,/,/g' >> const-info.c
+awk '/^[ 	]+GETDNS_[A-Z_]+[ 	]+=[ 	]+[0-9]+/{ print "\t{ "$3", \""$1"\", "$1"_TEXT }," }/^#define GETDNS_[A-Z_]+[ 	]+[0-9]+/ && !/^#define GETDNS_RRTYPE/ && !/^#define GETDNS_RRCLASS/ && !/^#define GETDNS_OPCODE/  && !/^#define GETDNS_RCODE/ && !/_TEXT/{ print "\t{ "$3", \""$2"\", "$2"_TEXT },"}' getdns/getdns.h.in | sed 's/,,/,/g' >> const-info.c
 cat >> const-info.c << END_OF_TAIL
 };
 

src/rr-dict.h

@@ -32,8 +32,8 @@
 #ifndef RR_DICT_H_
 #define RR_DICT_H_
 
-#include <getdns/getdns.h>
 #include <ldns/ldns.h>
+#include "getdns/getdns.h"
 
 getdns_return_t priv_getdns_create_dict_from_rr(
     struct getdns_context *context, ldns_rr *rr, struct getdns_dict** rr_dict);

src/service.c

@@ -34,7 +34,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "general.h"
 #include "util-internal.h"
 

src/sync.c

@@ -33,14 +33,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-#include <getdns/getdns.h>
+#include <string.h>
 #include <unbound.h>
+#include "getdns/getdns.h"
+#include "config.h"
 #include "context.h"
 #include "general.h"
 #include "types-internal.h"
 #include "util-internal.h"
-#include <string.h>
 #include "dnssec.h"
 
 /* stuff to make it compile pedantically */

src/test/check_getdns.c

@@ -31,7 +31,7 @@
 #include <inttypes.h>
 #include <unistd.h>
 #include <check.h>
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "check_getdns_common.h"
 #include "check_getdns_general.h"
 #include "check_getdns_general_sync.h"

src/test/check_getdns_common.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <check.h>
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 #include "config.h"
 #include "check_getdns_common.h"
 #include "check_getdns_eventloop.h"

src/test/check_getdns_common.h

@@ -27,7 +27,7 @@
 #ifndef _check_getdns_common_h_
 #define _check_getdns_common_h_
 
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 
      #define TRUE 1
      #define FALSE 0

src/test/check_getdns_libev.c

@@ -35,7 +35,7 @@
 
 #include "check_getdns_eventloop.h"
 
-#include <getdns/getdns_ext_libev.h>
+#include "getdns/getdns_ext_libev.h"
 #include <ev.h>
 #include <check.h>
 #include "check_getdns_common.h"

src/test/check_getdns_libevent.c

@@ -35,7 +35,7 @@
 
 #include "check_getdns_eventloop.h"
 
-#include <getdns/getdns_ext_libevent.h>
+#include "getdns/getdns_ext_libevent.h"
 #include "check_getdns_libevent.h"
 #include <check.h>
 #include "check_getdns_common.h"

src/test/check_getdns_libuv.c

@@ -35,7 +35,7 @@
 
 #include "check_getdns_eventloop.h"
 
-#include <getdns/getdns_ext_libuv.h>
+#include "getdns/getdns_ext_libuv.h"
 #include <uv.h>
 #include <check.h>
 #include "check_getdns_common.h"

src/test/check_getdns_selectloop.c

@@ -34,7 +34,7 @@
  */
 
 #include "check_getdns_eventloop.h"
-#include <getdns/getdns_extra.h>
+#include "getdns/getdns_extra.h"
 
 void run_event_loop_impl(struct getdns_context* context, void* eventloop) {
     struct timeval tv;

src/test/tests_dict.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 
 #define TSTMSGBUF 80
 

src/test/tests_dnssec.c

@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include <getdns/getdns.h>
-#include <getdns/getdns_extra.h>
+#include "getdns/getdns.h"
+#include "getdns/getdns_extra.h"
 
 /* Set up the callback function, which will also do the processing of the results */
 void

src/test/tests_list.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 
 #define TSTMSGBUF 80
 #define GETDNS_LIST_BLOCKSZ 10

src/test/tests_stub_async.c

@@ -37,8 +37,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include <getdns/getdns.h>
-#include <getdns/getdns_extra.h>
+#include "getdns/getdns.h"
+#include "getdns/getdns_extra.h"
 #include <sys/time.h>
 
 /* Set up the callback function, which will also do the processing of the results */

src/test/tests_stub_sync.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include <getdns/getdns.h>
+#include "getdns/getdns.h"
 
 static void
 print_response(struct getdns_dict * response)

src/types-internal.h

@@ -36,9 +36,9 @@
 #ifndef TYPES_INTERNAL_H_
 #define TYPES_INTERNAL_H_
 
-#include <getdns/getdns.h>
 #include <netinet/in.h>
 #include <ldns/ldns.h>
+#include "getdns/getdns.h"
 struct getdns_context;
 
 /**

src/util-internal.c

@@ -35,13 +35,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "getdns/getdns.h"
+#include <stdint.h>
+#include <stdlib.h>
 #include <ldns/rbtree.h>
+#include <unbound.h>
+#include "getdns/getdns.h"
 #include "dict.h"
 #include "list.h"
 #include "util-internal.h"
 #include "types-internal.h"
-#include <unbound.h>
 #include "rr-dict.h"
 
 /**