From 5681d7fb8be37771c152d21ea6e95597d664e3f1 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 13 Jan 2014 21:03:28 +0100
Subject: [PATCH] libsystemd-dns: merge into libsystemd

Also rename sd-dns -> sd-resolv.
---
 .gitignore                                   |  2 +-
 Makefile.am                                  | 52 ++++++++------------
 src/libsystemd/{dns-util.h => resolv-util.h} |  0
 src/libsystemd/{sd-dns.c => sd-resolv.c}     |  2 +-
 src/libsystemd/{test-dns.c => test-resolv.c} |  4 +-
 src/systemd/{sd-dns.h => sd-resolv.h}        |  4 +-
 6 files changed, 26 insertions(+), 38 deletions(-)
 rename src/libsystemd/{dns-util.h => resolv-util.h} (100%)
 rename src/libsystemd/{sd-dns.c => sd-resolv.c} (99%)
 rename src/libsystemd/{test-dns.c => test-resolv.c} (99%)
 rename src/systemd/{sd-dns.h => sd-resolv.h} (99%)

diff --git a/.gitignore b/.gitignore
index 36483f134..fb0509462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,7 +134,7 @@
 /test-device-nodes
 /test-dhcp-client
 /test-dhcp-option
-/test-dns
+/test-resolv
 /test-ellipsize
 /test-engine
 /test-env-replace
diff --git a/Makefile.am b/Makefile.am
index a73a66d4a..96695412a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -639,35 +639,6 @@ EXTRA_DIST += \
 	make-directive-index.py \
 	xml_helper.py
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-	libsystemd-dns.la
-
-libsystemd_dns_la_SOURCES = \
-	src/systemd/sd-dns.h \
-	src/libsystemd/sd-dns.c \
-	src/libsystemd/dns-util.h
-
-libsystemd_dns_la_LIBADD = \
-	libsystemd-shared.la
-
-libsystemd_dns_la_CFLAGS = \
-	-pthread
-
-test_dns_SOURCES = \
-	src/libsystemd/test-dns.c \
-	src/systemd/sd-dns.h
-
-test_dns_LDADD = \
-	libsystemd-dns.la
-
-test_dns_LDFLAGS = \
-	-lresolv \
-	-pthread
-
-tests += \
-	 test-dns
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-shared.la
@@ -2011,6 +1982,7 @@ libsystemd_la_SOURCES = \
 	src/systemd/sd-event.h \
 	src/systemd/sd-dhcp-client.h \
 	src/systemd/sd-rtnl.h \
+	src/systemd/sd-resolv.h \
 	src/libsystemd/sd-bus.c \
 	src/libsystemd/bus-control.c \
 	src/libsystemd/bus-control.h \
@@ -2060,7 +2032,9 @@ libsystemd_la_SOURCES = \
 	src/libsystemd/rtnl-internal.h \
 	src/libsystemd/rtnl-message.c \
 	src/libsystemd/rtnl-util.h \
-	src/libsystemd/rtnl-util.c
+	src/libsystemd/rtnl-util.c \
+	src/libsystemd/sd-resolv.c \
+	src/libsystemd/resolv-util.h
 
 nodist_libsystemd_la_SOURCES = \
 	src/libsystemd/bus-error-mapping.c
@@ -2072,7 +2046,8 @@ libsystemd_la_LIBADD = \
 
 libsystemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	-pthread
+	-pthread \
+	-lresolv
 
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -2136,7 +2111,8 @@ tests += \
 	test-event \
 	test-dhcp-option \
 	test-dhcp-client \
-	test-rtnl
+	test-rtnl \
+	test-resolv
 
 bin_PROGRAMS += \
 	busctl
@@ -2361,6 +2337,18 @@ test_rtnl_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la
 
+test_resolv_SOURCES = \
+	src/systemd/sd-resolv.h \
+	src/libsystemd/test-resolv.c
+
+test_resolv_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_resolv_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
 busctl_SOURCES = \
 	src/libsystemd/busctl.c
 
diff --git a/src/libsystemd/dns-util.h b/src/libsystemd/resolv-util.h
similarity index 100%
rename from src/libsystemd/dns-util.h
rename to src/libsystemd/resolv-util.h
diff --git a/src/libsystemd/sd-dns.c b/src/libsystemd/sd-resolv.c
similarity index 99%
rename from src/libsystemd/sd-dns.c
rename to src/libsystemd/sd-resolv.c
index 0f90d020a..2db66eb2f 100644
--- a/src/libsystemd/sd-dns.c
+++ b/src/libsystemd/sd-resolv.c
@@ -41,7 +41,7 @@
 #include <pthread.h>
 #include <sys/prctl.h>
 
-#include "sd-dns.h"
+#include "sd-resolv.h"
 #include "util.h"
 
 #define MAX_WORKERS 16
diff --git a/src/libsystemd/test-dns.c b/src/libsystemd/test-resolv.c
similarity index 99%
rename from src/libsystemd/test-dns.c
rename to src/libsystemd/test-resolv.c
index b4f064f2f..9365dd8e7 100644
--- a/src/libsystemd/test-dns.c
+++ b/src/libsystemd/test-resolv.c
@@ -31,8 +31,8 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "sd-dns.h"
-#include "dns-util.h"
+#include "sd-resolv.h"
+#include "resolv-util.h"
 #include "macro.h"
 
 int main(int argc, char *argv[]) {
diff --git a/src/systemd/sd-dns.h b/src/systemd/sd-resolv.h
similarity index 99%
rename from src/systemd/sd-dns.h
rename to src/systemd/sd-resolv.h
index 38972db5e..47608ce38 100644
--- a/src/systemd/sd-dns.h
+++ b/src/systemd/sd-resolv.h
@@ -1,7 +1,7 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foosddnshfoo
-#define foosddnshfoo
+#ifndef foosdresolvhfoo
+#define foosdresolvhfoo
 
 /***
   This file is part of systemd.
-- 
2.30.2