summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2015-05-26 18:21:31 -0500
committerDan Williams <dcbw@redhat.com>2015-05-26 18:23:26 -0500
commit6baca260d11b4c2f92e8765ff0f66786e507022a (patch)
tree132ccb92c5bf40c427a3894ebbb1e30d2948a502
parentfb623df747f7aeb56b84855364baf4239e436bee (diff)
Partially revert "dhcp: gracefully recover from failed DHCP BOUND state transitions (bgo #743700)"
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.
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index ba220579e1..d9a90c1981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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