Partially revert "dhcp: gracefully recover from failed DHCP BOUND state transitions...
authorDan Williams <dcbw@redhat.com>
Tue, 26 May 2015 23:21:31 +0000 (18:21 -0500)
committerDan Williams <dcbw@redhat.com>
Tue, 26 May 2015 23:23:26 +0000 (18:23 -0500)
This reverts commit 7daf63461de4195b1626ca15f835fc7cbc56e847.

Turns out the removal of the second set of [] in configure.ac causes the command
to be wrong in 'configure' and the test to be incorrect.

configure.ac

index ba22057..d9a90c1 100644 (file)
@@ -668,10 +668,10 @@ fi
 if test "$with_dhcpcd" = "yes"; then
        AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
        if test "$with_dhcpcd" != "no"; then
-               if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then
+               if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then
                        AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required])
                        with_dhcpcd=no
-               elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then
+               elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[6789]]\."; then
                        AC_DEFINE(DHCPCD_SUPPORTS_IPV6, 1, [Define if dhcpcd supports IPv6 (6.x+)])
                fi
        fi