@@ -, +, @@ 
---
 configure.ac |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)
--- a/configure.ac	
+++ a/configure.ac	
@@ -205,26 +205,18 @@ AC_CHECK_LIB([rt],
 
 AC_MSG_CHECKING([µTP])
 build_utp="no"
-if test "x$CXX" = "x" ; then
-    have_utp="no"
-else
-    have_utp="yes"
-fi
 AC_ARG_ENABLE([utp],
               AS_HELP_STRING([--enable-utp],[build µTP support]),
               [want_utp=${enableval}],
-              [want_utp=${have_utp}])
+              [want_utp="yes"])
 if test "x$want_utp" = "xyes" ; then
-    if test "x$have_utp" = "xyes"; then 
+    if test "x$CXX" != "x" ; then
         LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
-        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
-	if test "x$libutp_extra_libs" != "x" ; then
-	   LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs"
-	fi
+        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs"
         AC_DEFINE([WITH_UTP],[1])
         build_utp="yes"
     else 
-      AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") 
+        AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found; consider --disable-utp") 
     fi 
 fi 
 AC_SUBST(LIBUTP_CFLAGS)
--