Revision fe5b0c42 configure.ac

b/configure.ac
108 108
  [kvm_path="/usr/bin/kvm"])
109 109
AC_SUBST(KVM_PATH, $kvm_path)
110 110

  
111
# --with-socat-path=...
112
AC_ARG_WITH([socat-path],
113
  [AS_HELP_STRING([--with-socat-path=PATH],
114
    [absolute path to the socat binary]
115
    [ (default is to let configure search for it)]
116
  )],
117
  [SOCAT="$withval"],
118
  [])
119

  
120
AC_ARG_WITH([socat-escape],
121
  [AS_HELP_STRING([--with-socat-escape],
122
    [enable escape functionality found in newer socat])],
123
  [],
124
  [check_socat_escape=yes])
125

  
126 111
# ---with-lvm-stripecount=...
127 112
AC_ARG_WITH([lvm-stripecount],
128 113
  [AS_HELP_STRING([--with-lvm-stripecount=NUM],
......
168 153
  AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
169 154
fi
170 155

  
171
if test -z "$SOCAT" -a -n "$check_socat_escape"
172
then
173
AC_CACHE_CHECK([for socat with the escape feature], [ac_cv_path_SOCAT],
174
  [AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
175
            [[$ac_path_SOCAT -hh | grep -q escape \
176
              && ac_cv_path_SOCAT=$ac_path_SOCAT \
177
                 SOCAT=$ac_cv_path_SOCAT \
178
                 with_socat_escape=yes ac_path_SOCAT_found=:]],
179
            [AC_MSG_WARN([no escape feature found])])])
180
fi
181

  
156
# Check for socat
157
AC_ARG_VAR(SOCAT, [socat path])
158
AC_PATH_PROG(SOCAT, [socat], [])
182 159
if test -z "$SOCAT"
183 160
then
184
AC_CACHE_CHECK([for socat], [ac_cv_path_SOCAT],
185
  [AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
186
            [[ac_cv_path_SOCAT=$ac_path_SOCAT \
187
              SOCAT=$ac_cv_path_SOCAT ac_path_SOCAT_found=:]],
188
            [AC_MSG_ERROR([socat not found])])])
161
  AC_MSG_ERROR([socat not found])
189 162
fi
190 163

  
191
AC_SUBST([SOCAT_PATH], [$SOCAT])
192
if test "x$with_socat_escape" = xyes
164
SOCAT_USE_ESCAPE=
165
AC_ARG_ENABLE([socat-escape],
166
  [AS_HELP_STRING([--enable-socat-escape],
167
    [use escape functionality available in socat >= 1.7 (default: detect
168
     automatically)])],
169
  [[if test "$enableval" = yes; then
170
      SOCAT_USE_ESCAPE=True
171
    else
172
      SOCAT_USE_ESCAPE=False
173
    fi
174
  ]])
175

  
176
if test -z "$SOCAT_USE_ESCAPE"
193 177
then
194
  AC_SUBST([SOCAT_ESCAPE], [1])
178
  if $SOCAT -hh | grep -w -q escape; then
179
    SOCAT_USE_ESCAPE=True
180
  else
181
    SOCAT_USE_ESCAPE=False
182
  fi
195 183
fi
196 184

  
185
AC_SUBST(SOCAT_USE_ESCAPE)
186

  
197 187
# Check for Python
198 188
AM_PATH_PYTHON(2.4)
199 189

  

Also available in: Unified diff