autools: prevent dlog build on stable branch

configure.ac

@@ -690,19 +690,6 @@ AC_ARG_ENABLE([thread-safety],
 	[], [enable_thread_safety=yes])
 AM_CONDITIONAL([ENFORCE_THREAD_SAFETY], [test "x$enable_thread_safety" = "xyes"])
 
-AC_ARG_ENABLE([dlog],
-	[AC_HELP_STRING([--enable-dlog], [enable dlog support [default=no]])],
-	[], [enable_dlog=no])
-AM_CONDITIONAL([ENABLE_DLOG], [test "x$enable_dlog" = "xyes"])
-
-AM_COND_IF([ENABLE_DLOG],
-	[PKG_CHECK_MODULES([DLOG],[dlog],[],[
-		AC_CHECK_HEADER([dlog.h],[],[AC_MSG_ERROR([You must install the dlog development package in order to compile lxc])])
-		AC_CHECK_LIB([dlog], [dlog_print],[],[AC_MSG_ERROR([You must install the dlog development package in order to compile lxc])])
-		AC_SUBST([DLOG_LIBS], [-ldlog])
-		])
-	])
-
 # Files requiring some variable expansion
 AC_CONFIG_FILES([
 	Makefile
@@ -951,6 +938,4 @@ Paths:
 Thread-safety:
  - enforce: $enable_thread_safety
 
-Dlog:
- - enable: $enable_dlog
 EOF

src/lxc/Makefile.am

@@ -204,11 +204,6 @@ if ENABLE_SELINUX
 AM_CFLAGS += -DHAVE_SELINUX
 endif
 
-if ENABLE_DLOG
-AM_CFLAGS += -DHAVE_DLOG \
-	      $(DLOG_CFLAGS)
-endif
-
 if USE_CONFIGPATH_LOGS
 AM_CFLAGS += -DUSE_CONFIGPATH_LOGS
 endif
@@ -227,8 +222,7 @@ liblxc_la_LDFLAGS = -pthread \
 liblxc_la_LIBADD = $(CAP_LIBS) \
 		   $(GNUTLS_LIBS) \
 		   $(SELINUX_LIBS) \
-		   $(SECCOMP_LIBS) \
-		   $(DLOG_LIBS)
+		   $(SECCOMP_LIBS)
 
 bin_SCRIPTS=
 
@@ -280,8 +274,7 @@ LDADD = liblxc.la \
 	@CAP_LIBS@ \
 	@GNUTLS_LIBS@ \
 	@SECCOMP_LIBS@ \
-	@SELINUX_LIBS@ \
-	@DLOG_LIBS@
+	@SELINUX_LIBS@
 
 if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c \
@@ -418,7 +411,6 @@ pam_cgfs_la_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
 
 pam_cgfs_la_LIBADD = $(AM_LIBS) \
 		     $(PAM_LIBS) \
-		     $(DLOG_LIBS) \
 		     -L$(top_srcdir)
 
 pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \