Use an automake variable for server building

Since automake knows all possible values of this variable
up front, it can determine what goes into DIST_SUBDIRS
automagically.

diff --git a/Makefile.am b/Makefile.am
index fb6e2637883376e4703534398a04a0d07e2980ac..1d25c4c5b016c9348341d1e4039290e6d2faf81b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
-SUBDIRS=modules codedocs @programdescend@
-DIST_SUBDIRS=modules codedocs pdns
-EXTRA_DIST=README INSTALL NOTICE debian pdns.spec \
+SUBDIRS = modules codedocs
+
+if WITH_PDNS_SERVER
+  SUBDIRS += pdns
+endif
+
+EXTRA_DIST=README INSTALL NOTICE debian pdns.spec  \
 codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
 contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \
 bootstrap build-scripts/semistaticg++ pdns/docs/dnstcpbench.1 \

diff --git a/configure.ac b/configure.ac
index 8240225e5486b09a17c37e431fce081af55011ab..eddc99a49a97349b1dde9813730b1162ff11c88a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -236,12 +236,7 @@ AC_ARG_ENABLE([pdns-server],
   [enable_pdns_server=yes]
 )
 AC_MSG_RESULT([$enable_pdns_server])
-
-AS_IF([test "x$enable_pdns_server" = "xyes"],
-  [programdescend=pdns]
-)
-
-AC_SUBST(programdescend)
+AM_CONDITIONAL([WITH_PDNS_SERVER],[test "x$enable_pdns_server" != "xno"])
 
 AC_ARG_ENABLE([gcc-skip-locking],
   [AS_HELP_STRING([--enable-gcc-skip-locking],[if we should forcefully skip gcc locking @<:@default=no@:>@])],