blob: 75e6594962c4c94e05b5d5e5f266b4cd8d18262e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From fc34254a20735efaeb903365e0960d4a009463b3 Mon Sep 17 00:00:00 2001
From: Peter Volkov <pva@gentoo.org>
Date: Thu, 16 Jun 2011 12:46:48 +0400
Subject: [PATCH 1/3] configure.ac: Drop redudant code/indentation.
---
configure.ac | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7dcbcf0..421946f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,26 +214,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)
--
1.7.3.4
|
GitWeb
