* config/amanda/libs.m4: Do not link with libcurl if no se device or

  no server
* config/amanda/s3-device.m4: Re-order


git-svn-id: https://svn.code.sf.net/p/amanda/code/amanda/trunk@6890 a8d146d6-cc15-0410-8900-af154a0219e0

Author: Jean-Louis Martineau

ChangeLog

@@ -1,3 +1,8 @@
+2016-10-19  Jean-Louis Martineau <JMartineau@carbonite.com>
+	* config/amanda/libs.m4: Do not link with libcurl if no se device or
+	  no server
+	* config/amanda/s3-device.m4: Re-order
+
 2016-10-19  Jean-Louis Martineau <JMartineau@carbonite.com>
 	* perl/Makefile.am: Amanda::FetchDump::*, Amanda::Recovery::* and
 	  Amanda::Amservice are for client or server

config/amanda/libs.m4

@@ -235,7 +235,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
 	[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
      [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
 
-  if test "$_libcurl_with" != "no" ; then
+  if test "$_libcurl_with" != "no" -a x"$WANT_S3_DEVICE" != x"no" -a x"$WANT_SERVER" = x"true"; then
 
      AC_PROG_AWK
 

config/amanda/s3-device.m4

@@ -7,7 +7,15 @@
 #   Perform the necessary checks for the S3 Device.  If the S3 device should be built,
 #   WANT_S3_DEVICE is DEFINEd and set up as an AM_CONDITIONAL.
 #
+AC_DEFUN([AMANDA_S3_DEVICE_OPTION], [
+    AC_ARG_ENABLE([s3-device],
+	AS_HELP_STRING([--disable-s3-device],
+		       [disable the S3 device]),
+	[ WANT_S3_DEVICE=$enableval ], [ WANT_S3_DEVICE=maybe ])
+])
+
 AC_DEFUN([AMANDA_S3_DEVICE], [
+    AC_REQUIRE([AMANDA_S3_DEVICE_OPTION])
     AC_REQUIRE([AMANDA_CHECK_LIBCURL])
     AC_REQUIRE([AMANDA_CHECK_HMAC])