Imported Upstream version 3.2.0

[debian/amanda] / config / amanda / net.m4

diff --git a/config/amanda/net.m4 b/config/amanda/net.m4
index f2c1805a716b1c3635313415a5faf31bdfe6d967..a20cb5c373d3c9dc13770ee78ec86c8b9a5bf093 100644 (file)
--- a/config/amanda/net.m4
+++ b/config/amanda/net.m4
@@ -59,13 +59,13 @@ AC_DEFUN([AMANDA_WITH_REUSEPORTS], [
 # OVERVIEW
 #
 #   Implement --with-low-tcpportrange, --with-tcpportrange, and --with-udpportrange.
-#   Results are DEFINED in LOW_TCPPORTRANGE, TCPPORTRANGE, and UDPPORTRANGE, 
-#   respectively.
+#   Results are DEFINED and substituted in LOW_TCPPORTRANGE, TCPPORTRANGE, and 
+#   UDPPORTRANGE, respectively.
 #
 AC_DEFUN([AMANDA_WITH_PORTRANGES], [
     AC_ARG_WITH(low-tcpportrange,
-       AS_HELP_STRING([--with-low-tcpportrange=low/high],
-           [bind reserved TCP server sockets to ports within this range (default: unlimited)]),
+[  --with-low-tcpportrange=low,high
+                          bind reserved TCP server sockets to ports within],
        [ LOW_TCPPORTRANGE="$withval" ],
        [ LOW_TCPPORTRANGE=unlimited ])
      
@@ -89,9 +89,10 @@ AC_DEFUN([AMANDA_WITH_PORTRANGES], [
  * reserved TCP port numbers sockets should be bound to. (mainly for amrecover) ])
     fi
 
+    dnl note that AS_HELP_STRING cannot handle commas in its argument..
     AC_ARG_WITH(tcpportrange,
-       AS_HELP_STRING([--with-tcpportrange=low/high],
-           [bind unreserved TCP server sockets to ports within this range (default: unlimited)]),
+[  --with-tcpportrange=low,high
+                          bind unreserved TCP server sockets to ports within],
        [ TCPPORTRANGE="$withval" ],
        [ TCPPORTRANGE="unlimited" ])
 
@@ -116,8 +117,8 @@ AC_DEFUN([AMANDA_WITH_PORTRANGES], [
     fi
 
     AC_ARG_WITH(udpportrange,
-       AS_HELP_STRING([--with-udpportrange=low/high],
-           [bind reserved UDP server sockets to ports within this range (default: unlimited)]),
+[  --with-udpportrange=low,high
+                          bind reserved UDP server sockets to ports within],
        [ UDPPORTRANGE="$withval" ],
        [ UDPPORTRANGE="unlimited" ])
     if test x"$UDPPORTRANGE" != x"unlimited"; then
@@ -139,6 +140,9 @@ AC_DEFUN([AMANDA_WITH_PORTRANGES], [
   [A comma-separated list of two integers, determining the minimum and
  * maximum reserved UDP port numbers sockets should be bound to. ])
     fi
+    AC_SUBST(UDPPORTRANGE)
+    AC_SUBST(TCPPORTRANGE)
+    AC_SUBST(LOW_TCPPORTRANGE)
 ])
 
 # SYNOPSIS