[PATCH proxymngr] More LBX proxy avoidance.

[Matěj Cepl]

From: Adam Jackson <ajax at redhat.com>


Signed-off-by: Matěj Cepl <mcepl at redhat.com>
---
 Makefile.am  |    2 +-
 configure.ac |    5 -----
 pmconfig.cpp |    2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 80f149d..c258d5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ configdir = $(CONFIG_DIR)
 config_DATA = pmconfig
 
 pmconfig: pmconfig.cpp
-	$(AM_V_GEN)$(SED) -e s/LBXPROXY/`echo @LBXPROXY@ | sed -e s/\\\\//\\\\\\\\\\\\//g`/ < $(srcdir)/pmconfig.cpp > $@
+	cp $(srcdir)/pmconfig.cpp $@
 
 EXTRA_DIST = pmconfig.cpp
 CLEANFILES = pmconfig
diff --git a/configure.ac b/configure.ac
index 20dbac2..7a37f3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,11 +43,6 @@ XORG_DEFAULT_OPTIONS
 # Checks for programs
 AC_PROG_CPP
 
-AC_PATH_PROG(LBXPROXY, lbxproxy)
-if [[ -z $LBXPROXY ]] ; then
-   AC_MSG_ERROR([lbxproxy is needed])
-fi
-
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(PROXYMNGR, ice xt xproto xproxymngproto)
 
diff --git a/pmconfig.cpp b/pmconfig.cpp
index 52cfa42..d4ae63b 100644
--- a/pmconfig.cpp
+++ b/pmconfig.cpp
@@ -5,7 +5,7 @@
 !        or
 !    <serviceName> unmanaged <proxyAddress>
 !
-lbx managed LBXPROXY
+!lbx managed LBXPROXY
 !
 ! substitute site-specific info
 !xfwp unmanaged firewall:4444
-- 
1.7.6