Revision e3bdb1c2

b/Makefile.am
414 414
	  echo "KVM_PATH = '$(KVM_PATH)'"; \
415 415
	  echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
416 416
	  echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
417
	  echo "SOCAT_ESCAPE = '$(SOCAT_ESCAPE)'"; \
418 417
	  echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
419 418
	  echo "TOOLSDIR = '$(toolsdir)'"; \
420 419
	  echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
b/configure.ac
122 122
AC_ARG_WITH([socat-path],
123 123
  [AS_HELP_STRING([--with-socat-path=PATH],
124 124
    [absolute path to the socat binary]
125
    [ (default is to let configure search for it)]
125
    [ (default is /usr/bin/socat)]
126 126
  )],
127
  [SOCAT="$withval"],
128
  [])
129

  
130
AC_ARG_WITH([socat-escape],
131
  [AS_HELP_STRING([--with-socat-escape],
132
    [enable escape functionality found in newer socat])],
133
  [],
134
  [check_socat_escape=yes])
127
  [socat_path="$withval"],
128
  [socat_path="/usr/bin/socat"])
129
AC_SUBST(SOCAT_PATH, $socat_path)
135 130

  
136 131
# ---with-lvm-stripecount=...
137 132
AC_ARG_WITH([lvm-stripecount],
......
178 173
  AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
179 174
fi
180 175

  
181
if test -z "$SOCAT" -a -n "$check_socat_escape"
182
then
183
AC_CACHE_CHECK([for socat with the escape feature], [ac_cv_path_SOCAT],
184
  [AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
185
            [[$ac_path_SOCAT -hh | grep -q escape \
186
              && ac_cv_path_SOCAT=$ac_path_SOCAT \
187
                 SOCAT=$ac_cv_path_SOCAT \
188
                 with_socat_escape=yes ac_path_SOCAT_found=:]],
189
            [AC_MSG_WARN([no escape feature found])])])
190
fi
191

  
192
if test -z "$SOCAT"
193
then
194
AC_CACHE_CHECK([for socat], [ac_cv_path_SOCAT],
195
  [AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
196
            [[ac_cv_path_SOCAT=$ac_path_SOCAT \
197
              SOCAT=$ac_cv_path_SOCAT ac_path_SOCAT_found=:]],
198
            [AC_MSG_ERROR([socat not found])])])
199
fi
200

  
201
AC_SUBST([SOCAT_PATH], [$SOCAT])
202
if test "x$with_socat_escape" = xyes
203
then
204
  AC_SUBST([SOCAT_ESCAPE], [1])
205
fi
206

  
207 176
# Check for Python
208 177
AM_PATH_PYTHON(2.4)
209 178

  

Also available in: Unified diff