[ZNC-commits] SF.net SVN: znc:[1983] trunk

[<ps...@us...>]

Revision: 1983
          http://znc.svn.sourceforge.net/znc/?rev=1983&view=rev
Author:   psychon
Date:     2010-05-13 18:44:25 +0000 (Thu, 13 May 2010)

Log Message:
-----------
Better error message if pkg-config is not found

Modified Paths:
--------------
    trunk/configure
    trunk/configure.in

Modified: trunk/configure
===================================================================
--- trunk/configure	2010-05-13 16:51:17 UTC (rev 1982)
+++ trunk/configure	2010-05-13 18:44:25 UTC (rev 1983)
@@ -3079,8 +3079,19 @@
 	if test -z "$PKG_CONFIG"
 	then
 		ARES=no
+
+	# This looks better in the summary at the end
+	ARES="not found"
+	if test "x$old_ARES" != "xauto" ; then
+		as_fn_error "pkg-config not found. Try --disable-c-ares.
+Disabling c-ares may result in a slight performance decrease but will not have any other side-effects" "$LINENO" 5
 	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pkg-config was not found and thus c-ares was disabled" >&5
+$as_echo "$as_me: WARNING: pkg-config was not found and thus c-ares was disabled" >&2;}
+	fi
 
+	else
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c_ares" >&5
 $as_echo_n "checking for c_ares... " >&6; }
@@ -3151,9 +3162,8 @@
 $as_echo "yes" >&6; }
 	:
 fi
-	fi
 
-	if test "x$ARES" = "xno" ; then
+		if test "x$ARES" = "xno" ; then
 
 	# This looks better in the summary at the end
 	ARES="not found"
@@ -3165,10 +3175,11 @@
 $as_echo "$as_me: WARNING: c-ares was not found and thus disabled" >&2;}
 	fi
 
-	else
-		appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
-		appendLib $c_ares_LIBS
-		ARES=yes
+		else
+			appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
+			appendLib $c_ares_LIBS
+			ARES=yes
+		fi
 	fi
 fi
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2010-05-13 16:51:17 UTC (rev 1982)
+++ trunk/configure.in	2010-05-13 18:44:25 UTC (rev 1983)
@@ -161,19 +161,23 @@
 	if test -z "$PKG_CONFIG"
 	then
 		ARES=no
+		ZNC_AUTO_FAIL([ARES],
+			[pkg-config not found. Try --disable-c-ares.
+Disabling c-ares may result in a slight performance decrease but will not have any other side-effects],
+			[pkg-config was not found and thus c-ares was disabled])
 	else
 		PKG_CHECK_MODULES([c_ares], [libcares],, ARES=no)
-	fi
 
-	if test "x$ARES" = "xno" ; then
-		ZNC_AUTO_FAIL([ARES],
-			[c-ares not found. Try --disable-c-ares.
+		if test "x$ARES" = "xno" ; then
+			ZNC_AUTO_FAIL([ARES],
+				[c-ares not found. Try --disable-c-ares.
 Disabling c-ares may result in a slight performance decrease but will not have any other side-effects],
-			[c-ares was not found and thus disabled])
-	else
-		appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
-		appendLib $c_ares_LIBS
-		ARES=yes
+				[c-ares was not found and thus disabled])
+		else
+			appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
+			appendLib $c_ares_LIBS
+			ARES=yes
+		fi
 	fi
 fi
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.