From 3dd9595b6c3f1e7746b01bc02e625e85bdccbd2a Mon Sep 17 00:00:00 2001
From: Karel Slany <karel.slany@nic.cz>
Date: Thu, 21 Apr 2016 15:05:15 +0200
Subject: [PATCH 1/3] Fixed compilation with libedit in non-standard location.
Compilation failed on missing header files when configured with
--with-libedit=/is/somewhere/else .
---
src/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index f83bfa00e8..4f5aa0162b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -376,6 +376,7 @@ libknotd_la_LIBADD = libknot.la libknot-yparser.la zscanner/libzscanner.la $(lib
knotd_CPPFLAGS = $(AM_CPPFLAGS) $(liburcu_CFLAGS)
knotd_LDADD = libknotd.la $(liburcu_LIBS)
+knotc_CPPFLAGS = $(AM_CPPFLAGS) $(libedit_CFLAGS)
knotc_LDADD = libknotd.la libknotus.la $(libedit_LIBS)
knot1to2_LDADD = libcontrib.la
@@ -459,7 +460,7 @@ libknotus_la_SOURCES = \
utils/common/token.c \
utils/common/token.h
-libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(libidn_CFLAGS)
+libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(libidn_CFLAGS) $(libedit_CFLAGS)
libknotus_la_LDFLAGS = $(AM_LDFLAGS) $(libidn_LIBS)
libknotus_la_LIBADD = libcontrib.la libknot.la
--
GitLab
From f47096bd4644650a6c7f54671ac7558e9680d87d Mon Sep 17 00:00:00 2001
From: Karel Slany <karel.slany@nic.cz>
Date: Thu, 21 Apr 2016 16:02:17 +0200
Subject: [PATCH 2/3] Fixed compilation of knotc.
When configured with daemon enabled and utils disabled then the sources
were compiled but the executable has not been built.
---
configure.ac | 4 ++--
src/Makefile.am | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index cfa8fda021..39ebedf284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,7 +425,7 @@ AS_IF([test "$enable_rosedb" = yes], [AC_DEFINE([HAVE_ROSEDB], [1], [Define to 1
AM_CONDITIONAL([HAVE_ROSEDB], [test "$enable_rosedb" = yes])
# libedit
-AS_IF([test "$enable_daemon" = "yes"],[
+AS_IF([test "$enable_utilities" = "yes"],[
# daemon enabled
PKG_CHECK_MODULES([libedit], [libedit], [with_libedit=yes], [
with_libedit=no
@@ -447,7 +447,7 @@ AS_IF([test "$enable_daemon" = "yes"],[
AC_MSG_ERROR([libedit not found])
])
],[
- # daemon disabled
+ # utilities disabled
with_libedit=no
libedit_CFLAGS=
libedit_LIBS=
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f5aa0162b..6f31d41a6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,7 +200,10 @@ endif
if HAVE_DAEMON
-sbin_PROGRAMS = knotc knotd
+sbin_PROGRAMS = knotd
+if HAVE_UTILS
+sbin_PROGRAMS += knotc
+endif #HAVE_UTILS
libexec_PROGRAMS = knot1to2
noinst_LTLIBRARIES += libknotd.la
--
GitLab
From 242aee01c9515c9e6cb8173fbcdd08ea8221458b Mon Sep 17 00:00:00 2001
From: Karel Slany <karel.slany@nic.cz>
Date: Thu, 21 Apr 2016 21:09:54 +0200
Subject: [PATCH 3/3] Fixed conditional building of knotc.
Application knotc should be built together with the daemon. Static
utilities library is built together with daemon and/or the utilities.
---
configure.ac | 6 ++---
src/Makefile.am | 59 +++++++++++++++++++++++--------------------------
2 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/configure.ac b/configure.ac
index 39ebedf284..6964d6b4c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,8 +425,7 @@ AS_IF([test "$enable_rosedb" = yes], [AC_DEFINE([HAVE_ROSEDB], [1], [Define to 1
AM_CONDITIONAL([HAVE_ROSEDB], [test "$enable_rosedb" = yes])
# libedit
-AS_IF([test "$enable_utilities" = "yes"],[
- # daemon enabled
+AS_IF([test "$enable_daemon" = "yes" -o "$enable_utilities" = "yes"], [
PKG_CHECK_MODULES([libedit], [libedit], [with_libedit=yes], [
with_libedit=no
AC_CHECK_HEADER([histedit.h], [
@@ -446,8 +445,7 @@ AS_IF([test "$enable_utilities" = "yes"],[
AS_IF([test "$with_libedit" != "yes"], [
AC_MSG_ERROR([libedit not found])
])
-],[
- # utilities disabled
+], [
with_libedit=no
libedit_CFLAGS=
libedit_LIBS=
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f31d41a6b..5aeca1166c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -194,18 +194,41 @@ libknot_la_CPPFLAGS += \
-I$(srcdir)/contrib/lmdb/
endif
+# static: utilities shared
+libknotus_la_SOURCES = \
+ utils/common/exec.c \
+ utils/common/exec.h \
+ utils/common/hex.c \
+ utils/common/hex.h \
+ utils/common/lookup.c \
+ utils/common/lookup.h \
+ utils/common/msg.c \
+ utils/common/msg.h \
+ utils/common/netio.c \
+ utils/common/netio.h \
+ utils/common/params.c \
+ utils/common/params.h \
+ utils/common/resolv.c \
+ utils/common/resolv.h \
+ utils/common/sign.c \
+ utils/common/sign.h \
+ utils/common/strtonum.h \
+ utils/common/token.c \
+ utils/common/token.h
+
+libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(libidn_CFLAGS) $(libedit_CFLAGS)
+libknotus_la_LDFLAGS = $(AM_LDFLAGS) $(libidn_LIBS)
+libknotus_la_LIBADD = libcontrib.la libknot.la
+
###################
# Knot DNS Daemon #
###################
if HAVE_DAEMON
-sbin_PROGRAMS = knotd
-if HAVE_UTILS
-sbin_PROGRAMS += knotc
-endif #HAVE_UTILS
+sbin_PROGRAMS = knotc knotd
libexec_PROGRAMS = knot1to2
-noinst_LTLIBRARIES += libknotd.la
+noinst_LTLIBRARIES += libknotd.la libknotus.la
EXTRA_DIST += \
utils/knot1to2/cf-lex.l \
@@ -441,32 +464,6 @@ knsupdate_SOURCES = \
utils/knsupdate/knsupdate_params.c \
utils/knsupdate/knsupdate_params.h
-# static: utilities shared
-libknotus_la_SOURCES = \
- utils/common/exec.c \
- utils/common/exec.h \
- utils/common/hex.c \
- utils/common/hex.h \
- utils/common/lookup.c \
- utils/common/lookup.h \
- utils/common/msg.c \
- utils/common/msg.h \
- utils/common/netio.c \
- utils/common/netio.h \
- utils/common/params.c \
- utils/common/params.h \
- utils/common/resolv.c \
- utils/common/resolv.h \
- utils/common/sign.c \
- utils/common/sign.h \
- utils/common/strtonum.h \
- utils/common/token.c \
- utils/common/token.h
-
-libknotus_la_CPPFLAGS = $(AM_CPPFLAGS) $(libidn_CFLAGS) $(libedit_CFLAGS)
-libknotus_la_LDFLAGS = $(AM_LDFLAGS) $(libidn_LIBS)
-libknotus_la_LIBADD = libcontrib.la libknot.la
-
# bin programs
kdig_LDADD = $(libidn_LIBS) libknotus.la
khost_LDADD = $(libidn_LIBS) libknotus.la
--
GitLab