From e3bdb1c2c46c2a6292d09e10996fb7d5cdb38be7 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 3 Nov 2009 14:42:43 +0100
Subject: [PATCH] Revert "configure: check for socat and its escape feature"
This reverts commit 37fc2cf5ba8919cef407199ee540aad4b1a9a2b6, 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: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
Makefile.am | 1 -
configure.ac | 39 ++++-----------------------------------
2 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 20c750412..6f0e70566 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -414,7 +414,6 @@ lib/_autoconf.py: Makefile stamp-directories
echo "KVM_PATH = '$(KVM_PATH)'"; \
echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
- echo "SOCAT_ESCAPE = '$(SOCAT_ESCAPE)'"; \
echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
echo "TOOLSDIR = '$(toolsdir)'"; \
echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
diff --git a/configure.ac b/configure.ac
index c681e034b..3ba28cd9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,16 +122,11 @@ AC_SUBST(KVM_MIGRATION_PORT, $kvm_migration_port)
AC_ARG_WITH([socat-path],
[AS_HELP_STRING([--with-socat-path=PATH],
[absolute path to the socat binary]
- [ (default is to let configure search for it)]
+ [ (default is /usr/bin/socat)]
)],
- [SOCAT="$withval"],
- [])
-
-AC_ARG_WITH([socat-escape],
- [AS_HELP_STRING([--with-socat-escape],
- [enable escape functionality found in newer socat])],
- [],
- [check_socat_escape=yes])
+ [socat_path="$withval"],
+ [socat_path="/usr/bin/socat"])
+AC_SUBST(SOCAT_PATH, $socat_path)
# ---with-lvm-stripecount=...
AC_ARG_WITH([lvm-stripecount],
@@ -178,32 +173,6 @@ then
AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
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
AM_PATH_PYTHON(2.4)
--
GitLab