Commit e3bdb1c2 authored by Iustin Pop's avatar Iustin Pop
Browse files

Revert "configure: check for socat and its escape feature"

This reverts commit 37fc2cf5

, since it
introduces configure.ac changes that depend on very very new autoconf
macros that are not present in current stable distros (and it was not
advertised as such).
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 1b48f7af
...@@ -414,7 +414,6 @@ lib/_autoconf.py: Makefile stamp-directories ...@@ -414,7 +414,6 @@ lib/_autoconf.py: Makefile stamp-directories
echo "KVM_PATH = '$(KVM_PATH)'"; \ echo "KVM_PATH = '$(KVM_PATH)'"; \
echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \ echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \ echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
echo "SOCAT_ESCAPE = '$(SOCAT_ESCAPE)'"; \
echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \ echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
echo "TOOLSDIR = '$(toolsdir)'"; \ echo "TOOLSDIR = '$(toolsdir)'"; \
echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \ echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
......
...@@ -122,16 +122,11 @@ AC_SUBST(KVM_MIGRATION_PORT, $kvm_migration_port) ...@@ -122,16 +122,11 @@ AC_SUBST(KVM_MIGRATION_PORT, $kvm_migration_port)
AC_ARG_WITH([socat-path], AC_ARG_WITH([socat-path],
[AS_HELP_STRING([--with-socat-path=PATH], [AS_HELP_STRING([--with-socat-path=PATH],
[absolute path to the socat binary] [absolute path to the socat binary]
[ (default is to let configure search for it)] [ (default is /usr/bin/socat)]
)], )],
[SOCAT="$withval"], [socat_path="$withval"],
[]) [socat_path="/usr/bin/socat"])
AC_SUBST(SOCAT_PATH, $socat_path)
AC_ARG_WITH([socat-escape],
[AS_HELP_STRING([--with-socat-escape],
[enable escape functionality found in newer socat])],
[],
[check_socat_escape=yes])
# ---with-lvm-stripecount=... # ---with-lvm-stripecount=...
AC_ARG_WITH([lvm-stripecount], AC_ARG_WITH([lvm-stripecount],
...@@ -178,32 +173,6 @@ then ...@@ -178,32 +173,6 @@ then
AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible]) AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
fi fi
if test -z "$SOCAT" -a -n "$check_socat_escape"
then
AC_CACHE_CHECK([for socat with the escape feature], [ac_cv_path_SOCAT],
[AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
[[$ac_path_SOCAT -hh | grep -q escape \
&& ac_cv_path_SOCAT=$ac_path_SOCAT \
SOCAT=$ac_cv_path_SOCAT \
with_socat_escape=yes ac_path_SOCAT_found=:]],
[AC_MSG_WARN([no escape feature found])])])
fi
if test -z "$SOCAT"
then
AC_CACHE_CHECK([for socat], [ac_cv_path_SOCAT],
[AC_PATH_PROGS_FEATURE_CHECK(SOCAT, [socat],
[[ac_cv_path_SOCAT=$ac_path_SOCAT \
SOCAT=$ac_cv_path_SOCAT ac_path_SOCAT_found=:]],
[AC_MSG_ERROR([socat not found])])])
fi
AC_SUBST([SOCAT_PATH], [$SOCAT])
if test "x$with_socat_escape" = xyes
then
AC_SUBST([SOCAT_ESCAPE], [1])
fi
# Check for Python # Check for Python
AM_PATH_PYTHON(2.4) AM_PATH_PYTHON(2.4)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment