From 321adcf014df49dcfef85f9eefb30df37105df9f Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 28 Feb 2022 18:36:37 +0100 Subject: [PATCH] Add kubernetes Makefile to ./configure --- bacula/autoconf/configure.in | 18 ++++++++- bacula/src/plugins/fd/Makefile | 72 ---------------------------------- 2 files changed, 17 insertions(+), 73 deletions(-) delete mode 100644 bacula/src/plugins/fd/Makefile diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 48276f4b9..25e354fa8 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -3352,6 +3352,22 @@ if test x$support_docker = xyes -o x$support_docker = xauto; then fi fi +dnl kubernetes Plugin +support_k8s=auto +AC_ARG_ENABLE(kubernetes-plugin, + AC_HELP_STRING([--disable-kubernetes-plugin], [disable Kubernetes plugin support @<:@default=auto@:>@]), + [ + if test x$enableval = xyes; then + support_kubernetes=yes + elif test x$enableval = xno; then + support_kubernetes=disabled + fi + ] +) +if test x$support_kubernetes = xyes -o x$support_kubernetes = xauto; then + FD_PLUGIN_DIR="${FD_PLUGIN_DIR} src/plugins/fd/kubernetes-backend" +fi + AC_SUBST(FD_PLUGIN_DIR) dnl @@ -3868,7 +3884,6 @@ AC_CONFIG_FILES([ src/findlib/Makefile \ src/tools/Makefile \ src/plugins/fd/Makefile.inc \ - src/plugins/fd/Makefile \ src/plugins/sd/Makefile \ src/plugins/dir/Makefile.inc \ po/Makefile.in \ @@ -4079,6 +4094,7 @@ Configuration on `date`: Plugins: - Docker: ${support_docker} + - Kubernetes: ${support_kubernetes} - LDAP BPAM: ${support_ldap_bpam} " > config.out diff --git a/bacula/src/plugins/fd/Makefile b/bacula/src/plugins/fd/Makefile deleted file mode 100644 index 4458e7107..000000000 --- a/bacula/src/plugins/fd/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -# Simple Makefile for building test FD plugins for Bacula -# -# Copyright (C) 2000-2015 by Kern Sibbald -# License: BSD 2-Clause; see file LICENSE-FOSS -# -# - -include Makefile.inc - -.c.lo: - $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $< - -all: bpipe-fd.la test-plugin-fd.la test-deltaseq-fd.la - -example-plugin-fd.lo: example-plugin-fd.c ${FDDIR}/fd_plugins.h - $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c example-plugin-fd.c - -example-plugin-fd.la: Makefile example-plugin-fd$(DEFAULT_OBJECT_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared example-plugin-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version - -bpipe-fd.lo: bpipe-fd.c ${FDDIR}/fd_plugins.h - $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c bpipe-fd.c - -bpipe-fd.la: Makefile bpipe-fd$(DEFAULT_OBJECT_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared bpipe-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version - -test-deltaseq-fd.lo: test-deltaseq-fd.c ${FDDIR}/fd_plugins.h fd_common.h - $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c test-deltaseq-fd.c - -test-deltaseq-fd.la: Makefile test-deltaseq-fd$(DEFAULT_OBJECT_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared test-deltaseq-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version - -test-plugin-fd.lo: test-plugin-fd.c ${FDDIR}/fd_plugins.h - $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c test-plugin-fd.c - -test-plugin-fd.la: Makefile test-plugin-fd$(DEFAULT_OBJECT_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared test-plugin-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version - -install: all - $(MKDIR) $(DESTDIR)$(plugindir) - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) - $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la - -install-test-plugin: all - $(MKDIR) $(DESTDIR)$(plugindir) - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) test-plugin-fd.la $(DESTDIR)$(plugindir) - $(RMF) $(DESTDIR)$(plugindir)/test-plugin-fd.la - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) test-deltaseq-fd.la $(DESTDIR)$(plugindir) - $(RMF) $(DESTDIR)$(plugindir)/test-deltaseq-fd.la - -install-docker: - $(MAKE) -C docker install - -$(LIBTOOL_CLEAN_TARGET): - @find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF) - @$(RMF) *.la - @$(RMF) -r .libs _libs - -clean: $(LIBTOOL_CLEAN_TARGET) - @rm -f main *.so *.o 1 2 3 - -distclean: clean - @rm -f Makefile *.la *.lo - @rm -rf .libs - -$(LIBTOOL_UNINSTALL_TARGET): - $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.so - -uninstall: $(LIBTOOL_UNINSTALL_TARGET) - -depend: -- 2.47.3