Changeset 12040

Timestamp:

Feb 25, 2011, 1:44:32 AM (12 years ago)

Author:

jordan

Message:

(trunk) #2338 "Add uTP support" -- have the autoconf system default to build uTP support iff a C++ compiler can be found by AC_PROG_CXX

File:

• trunk/configure.ac (modified) (1 diff)

trunk/configure.ac

@@ -220 +220 @@
 dnl  utp
 
+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]),
-              [build_utp=${enableval}],
-              [build_utp=no])
-if test "x$build_utp" = "xyes" ; then
-    LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
-    LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a -lrt"
-    AC_DEFINE([WITH_UTP],[1])
-fi
+              [want_utp=${enableval}],
+              [want_utp=${have_utp}])
+if test "x$want_utp" = "xyes" ; then
+    if test "x$have_utp" = "xyes"; then 
+        LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
+        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a -lrt"
+        AC_DEFINE([WITH_UTP],[1])
+        build_utp="yes"
+    else 
+      AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") 
+    fi 
+fi 
 AC_SUBST(LIBUTP_CFLAGS)
 AC_SUBST(LIBUTP_LIBS)
 AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"])
+AC_MSG_RESULT([$build_utp])