From 96d97bcb5d142aefe999cba67886f231ef17192b Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Wed, 23 Feb 2005 12:38:04 +0000
Subject: [PATCH] sockets, clx and asdf were always compiled in

---
 src/configure    | 9 ++++++---
 src/configure.in | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/configure b/src/configure
index c553b7bc2..5cb169c56 100755
--- a/src/configure
+++ b/src/configure
@@ -1505,6 +1505,8 @@ fi;
 # Check whether --with-clx or --without-clx was given.
 if test "${with_clx+set}" = set; then
   withval="$with_clx"
+  clx="${withval}"
+else
   clx=yes
 fi;
 
@@ -4640,6 +4642,7 @@ else
 fi
 
 if test ${clx} ; then
+  tcp = "yes"
   if test ${shared} = "yes" ; then
     LSP_LIBRARIES="${LSP_LIBRARIES} clx.fas"
   else
@@ -4653,7 +4656,7 @@ _ACEOF
 else
   CLX_INFO=""
 fi
-if test "${tcp}" -o "${clx}"; then
+if test "${tcp}" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define TCP 1
 _ACEOF
@@ -4679,7 +4682,7 @@ if test "${cmuformat}" = "yes"; then
 _ACEOF
 
 fi
-if test "${closstreams}"; then
+if test "${closstreams}" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define ECL_CLOS_STREAMS 1
 _ACEOF
@@ -4729,7 +4732,7 @@ if test ! ${opcode8} = "no" ; then
 _ACEOF
 
 fi
-if test "${asdf}"; then
+if test "${asdf}" = "yes"; then
   ECL_MODULES="${ECL_MODULES} asdf";
 fi
 if test "${GCC}" = "yes"; then
diff --git a/src/configure.in b/src/configure.in
index 1ebd23757..1ed3fe21c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -104,7 +104,7 @@ AC_ARG_WITH(clos-streams,
 AC_ARG_WITH(clx,
 	AS_HELP_STRING([--with-clx],
 		       [include CLX library (default is NO)]),
-	[clx=yes])
+	[clx="${withval}"],[clx=yes])
 AC_ARG_WITH(cxx,
 	AS_HELP_STRING([--with-cxx],
 		       [build ECL using C++ compiler (default is NO)]),
@@ -249,6 +249,7 @@ dnl   AC_DEFINE(TK)
 dnl fi
 AC_SUBST(CLX_INFO)
 if test ${clx} ; then
+  tcp = "yes"
   if test ${shared} = "yes" ; then
     LSP_LIBRARIES="${LSP_LIBRARIES} clx.fas"
   else
@@ -259,7 +260,7 @@ if test ${clx} ; then
 else
   CLX_INFO=""
 fi
-if test "${tcp}" -o "${clx}"; then
+if test "${tcp}" = "yes"; then
   AC_DEFINE(TCP)
   EXTRA_OBJS="${EXTRA_OBJS} tcp.${OBJEXT}"
   if test ${shared} = "yes" ; then
@@ -276,7 +277,7 @@ if test "${cmuformat}" = "yes"; then
   closstreams="yes"
   AC_DEFINE(ECL_CMU_FORMAT)
 fi
-if test "${closstreams}"; then
+if test "${closstreams}" = "yes"; then
   AC_DEFINE(ECL_CLOS_STREAMS)
 fi
 if test "${locative}" ; then
@@ -310,7 +311,7 @@ fi
 if test ! ${opcode8} = "no" ; then
   AC_DEFINE(ECL_SMALL_BYTECODES)
 fi
-if test "${asdf}"; then
+if test "${asdf}" = "yes"; then
   ECL_MODULES="${ECL_MODULES} asdf";
 fi
 dnl ---------------------------------------------------------------------