cloud: update Makefiles

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index a8d40187af0d0cf0f7f659087a4a40ce79d90701..371ec2278af964139d037b37b4f7ca519360d3b3 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -392,6 +392,7 @@ support_readline=yes
 support_lzo=yes
 support_zstd=yes
 support_s3=yes
+support_aws=yes
 support_conio=yes
 support_bat=no
 support_tls=no
@@ -2257,6 +2258,27 @@ fi
 AC_SUBST(S3_INC)
 AC_SUBST(S3_LIBS)
 
+have_aws=no
+
+if test x$support_aws = xyes; then
+   AC_ARG_WITH(aws,
+      AC_HELP_STRING([--with-aws], [specify Google Storage Cloud]),
+      [
+         case "$with_aws" in
+         no)
+            :
+            ;;
+         yes|*)
+   
+       AC_DEFINE(HAVE_GENERIC_CLOUD, 1, [Define to 1 if you have generic cloud])
+        have_aws="yes"
+        CLOUD_DRIVERS="${CLOUD_DRIVERS} generic-driver"
+        CLOUD_INSTALL_TARGETS="${CLOUD_INSTALL_TARGETS} install-aws-cloud"
+            ;;
+         esac
+   ])
+fi
+
 AC_LANG_PUSH(C++)
 AC_CHECK_FUNCS(backtrace)
 AC_LANG_POP(C++)
@@ -4093,6 +4115,7 @@ AC_CONFIG_FILES([
    scripts/bat.desktop.xsu \
    scripts/bat.desktop.consolehelper \
    scripts/bat.console_apps \
+   scripts/aws_cloud_driver \
    scripts/bacula-tray-monitor.desktop \
    scripts/kubernetes-bacula-backup/Dockerfile \
    src/Makefile \
@@ -4371,6 +4394,7 @@ Configuration on `date`:
    - TOTP BPAM:               ${support_totp_bpam}
    - CDP:                     ${support_cdp}
    - Antivirus:               ${support_antivirus}
+   - aws:                     ${have_aws}
   " > config.out
 
 # create a small shell script useful for support with

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 7237354124b7e1371b9de20da632a9b900c6dfd3..3ebf71c20090edd84b2df35974c68e25b6717de4 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -203,6 +203,8 @@ drivers: bacula-sd-cloud-driver.la ${CLOUD_DRIVERS}
 
 s3-driver: bacula-sd-cloud-s3-driver.la
 
+aws-driver: bacula-sd-cloud-aws-driver.la
+
 generic-driver: bacula-sd-cloud-generic-driver.la
 
 oci-driver: bacula-sd-cloud-oci-driver.la
@@ -217,6 +219,9 @@ bacula-sd-cloud-driver.la: Makefile $(CLOUD_ALL_LOBJS)
 bacula-sd-cloud-was-driver.la: Makefile $(CLOUD_GENERIC_LOBJS)
         $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared $(CLOUD_GENERIC_LOBJS) -o $@ -R $(libdir) -rpath $(libdir) -module -export-dynamic -release $(LIBBACSD_LT_RELEASE)
 
+bacula-sd-cloud-aws-driver.la: Makefile $(CLOUD_GENERIC_LOBJS)
+        $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared $(CLOUD_GENERIC_LOBJS) -o $@ -R $(libdir) -rpath $(libdir) -module -export-dynamic -release $(LIBBACSD_LT_RELEASE)
+
 bacula-sd-cloud-s3-driver.la: Makefile $(CLOUD_S3_LOBJS)
         $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared $(CLOUD_S3_LOBJS) -o $@ $(S3_LIBS) -R $(libdir) -rpath $(libdir) -module -export-dynamic -release $(LIBBACSD_LT_RELEASE)
 
@@ -434,6 +439,11 @@ install-s3-glacier-cloud: install-cloud bacula-sd-cloud-glacier-s3-driver.la
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-sd-cloud-glacier-s3-driver$(DEFAULT_SHARED_OBJECT_TYPE) $(DESTDIR)$(plugindir)
        $(RMF) $(DESTDIR)$(plugindir)/bacula-sd-cloud-glacier-s3-driver.la
 
+install-aws-cloud: install-cloud bacula-sd-cloud-aws-driver.la
+       $(MKDIR) $(DESTDIR)$(plugindir)
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-sd-cloud-aws-driver$(DEFAULT_SHARED_OBJECT_TYPE) $(DESTDIR)$(plugindir)
+       $(RMF) $(DESTDIR)$(plugindir)/bacula-sd-cloud-aws-driver.la
+
 install-generic-cloud: install-cloud bacula-sd-cloud-generic-driver.la
        $(MKDIR) $(DESTDIR)$(plugindir)
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-sd-cloud-generic-driver$(DEFAULT_SHARED_OBJECT_TYPE) $(DESTDIR)$(plugindir)