Revision d71f59e9 snf-image-host/configure.ac

b/snf-image-host/configure.ac
7 7
AM_INIT_AUTOMAKE([1.9 foreign tar-ustar -Wall -Wno-portability])
8 8
AM_INIT_AUTOMAKE([subdir-objects])
9 9

  
10
AC_ARG_ENABLE([pithos_backend],
11
   AS_HELP_STRING([--enable-pithos-backend],
12
    [enable support for pithos-hosted images])
13
)
14
AS_IF([test "x$enable_pithos_backend" = "xyes"],,
15
    [AC_MSG_NOTICE(pithos backend support not enabled)])
16
AM_CONDITIONAL(PITHOSIMGSUPPORT, [test "x$enable_pithos_backend" = "xyes"])
17

  
18
AC_ARG_ENABLE([network_backend],
19
   AS_HELP_STRING([--enable-network-backend],
20
    [enable support for network-hosted images
21
    (this depends on cURL)])
22
)
23
AS_IF([test "x$enable_network_backend" = "xyes"],,
24
    [AC_MSG_NOTICE(network backend support not enabled)])
25
AM_CONDITIONAL(NETWORKIMGSUPPORT, [test "x$enable_network_backend" = "xyes"])
26

  
10 27
# --with-progress-monitor
11 28
AC_ARG_WITH([progress-monitor],
12 29
  [AS_HELP_STRING([--with-progress-monitor=PRGRM_PATH],
13 30
    [path to progress-monitor program]
14 31
    [[snf-progress-monitor]])],
15 32
    [if test "$withval" = "yes" ; then
16
    AC_PATH_PROG(PROGRESS_MONITOR, [snf-progress-monitor], [], [$PATH:/usr/sbin:/sbin])
17
    if test -z "$PROGRESS_MONITOR" ; then
18
        AC_MSG_FAILURE([Could not find snf-progress-monitor.])
19
    fi
20
   else
21
       PROGRESS_MONITOR="$withval"
22
   fi],
33
         AC_PATH_PROG(PROGRESS_MONITOR, [snf-progress-monitor], [], [$PATH:/usr/sbin:/sbin])
34
         if test -z "$PROGRESS_MONITOR" ; then
35
             AC_MSG_FAILURE([Could not find snf-progress-monitor.])
36
         fi
37
     else
38
         PROGRESS_MONITOR="$withval"
39
    fi],
23 40
   [AC_MSG_NOTICE(progress-monitor support not enabled)]
24 41
)
25 42

  
......
117 134
  AC_MSG_ERROR([timelimit not found in $PATH:/usr/sbin:/sbin])
118 135
fi
119 136

  
120
AC_PATH_PROG(CURL, [curl], [], [$PATH:/usr/sbin:/sbin])
121
if test -z "$CURL" ; then
122
  AC_MSG_ERROR([curl not found in $PATH:/usr/sbin:/sbin])
137
if test "x$enable_network_backend" = "xyes" ; then
138
  AC_PATH_PROG(CURL, [curl], [], [$PATH:/usr/sbin:/sbin])
139
    if test -z "$CURL" ; then
140
      AC_MSG_ERROR([curl is needed for network backend support but was not \
141
      found in $PATH:/usr/sbin:/sbin]
142
      [To disable network backend support ommit --enable-network-backend])
143
    fi
123 144
fi
124 145

  
125 146
AC_CONFIG_FILES([

Also available in: Unified diff