From: Ethan Glasser-Camp Date: Sun, 1 Jul 2012 16:39:44 +0000 (+2000) Subject: [PATCH v2 2/8] Introduce uriparser X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6539b38a0cd4a4185692b6af174dc8973db09442;p=notmuch-archives.git [PATCH v2 2/8] Introduce uriparser --- diff --git a/e3/678a3fe70d41106dbd0472f655d7c01af60b5a b/e3/678a3fe70d41106dbd0472f655d7c01af60b5a new file mode 100644 index 000000000..39f4f1424 --- /dev/null +++ b/e3/678a3fe70d41106dbd0472f655d7c01af60b5a @@ -0,0 +1,172 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5EC41431FAF + for ; Sun, 1 Jul 2012 09:45:20 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 1.061 +X-Spam-Level: * +X-Spam-Status: No, score=1.061 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_BL_SPAMCOP_NET=1.246, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_SORBS_WEB=0.614] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ILN9iYnONbbA for ; + Sun, 1 Jul 2012 09:45:18 -0700 (PDT) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + D9968431FAE for ; Sun, 1 Jul 2012 09:45:17 -0700 + (PDT) +Received: by wgbdt14 with SMTP id dt14so3720563wgb.2 + for ; Sun, 01 Jul 2012 09:45:16 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=X6hLOJsWOhhBvyxEGXCGI+3zWvDOb1uiOQcr8AYYYcw=; + b=bjXBoHgztwu74+hhpeHnk6xaWiNM26sdCSn9EHKf5VHINfqilpm5lw/D3dWZO0DT88 + IYCYs+I1+aNKnZGzKbic6GRqs5WZcwWackRv0zNMfBV4mk2hXnpdsG54BREk7yeZ7qXS + JwOW1dsxLwgbriHNA63rNyebodHcW2sTZzec+SldthZfFYyuuqSgouo6rRUiGPjSge/p + YPB6/FtG1phja5FKlX7wIXbt7zeET2rNrYnLOLAH03OAwVcuY/RfpsnE2U0qzafFoK3L + rdtWqtHBJ1nkLN7JKRJakZ+ViFF++mgzAb6SvYdvamGhvTgY34lE3vsjl2KoABATXDKc + e8LQ== +Received: by 10.180.93.196 with SMTP id cw4mr17915239wib.11.1341161116602; + Sun, 01 Jul 2012 09:45:16 -0700 (PDT) +Received: from localhost ([195.24.209.21]) + by mx.google.com with ESMTPS id fu8sm19712048wib.5.2012.07.01.09.45.09 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 01 Jul 2012 09:45:15 -0700 (PDT) +From: Ethan Glasser-Camp +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/8] Introduce uriparser +Date: Sun, 1 Jul 2012 12:39:44 -0400 +Message-Id: <1341160790-14525-3-git-send-email-ethan@betacantrips.com> +X-Mailer: git-send-email 1.7.9.5 +In-Reply-To: <1341160790-14525-1-git-send-email-ethan@betacantrips.com> +References: + + <1341160790-14525-1-git-send-email-ethan@betacantrips.com> +Cc: Ethan Glasser-Camp +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 01 Jul 2012 16:45:20 -0000 + +Seeing as there is no glib-standard way to parse URIs, an external +library is needed. This commit introduces another program in compat/ +and a stanza in ./configure to test if uriparser is there. + +Signed-off-by: Ethan Glasser-Camp +--- + Makefile.local | 2 +- + compat/have_uriparser.c | 17 +++++++++++++++++ + configure | 23 ++++++++++++++++++++--- + 3 files changed, 38 insertions(+), 4 deletions(-) + create mode 100644 compat/have_uriparser.c + +diff --git a/Makefile.local b/Makefile.local +index a890df2..084f44e 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -41,7 +41,7 @@ PV_FILE=bindings/python/notmuch/version.py + # Smash together user's values with our extra values + FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) + FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) +-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) ++FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(URIPARSER_LDFLAGS) + FINAL_NOTMUCH_LINKER = CC + ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) + FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS) +diff --git a/compat/have_uriparser.c b/compat/have_uriparser.c +new file mode 100644 +index 0000000..d79e51d +--- /dev/null ++++ b/compat/have_uriparser.c +@@ -0,0 +1,17 @@ ++#include ++ ++int ++main (int argc, char *argv[]) ++{ ++ UriParserStateA state; ++ UriUriA uri; ++ char *uriS = NULL; ++ ++ state.uri = &uri; ++ if (uriParseUriA (&state, uriS) != URI_SUCCESS) { ++ /* Failure */ ++ uriFreeUriMembersA (&uri); ++ } ++ ++ return 0; ++} +diff --git a/configure b/configure +index 3fad424..80aa13c 100755 +--- a/configure ++++ b/configure +@@ -313,6 +313,19 @@ else + errors=$((errors + 1)) + fi + ++printf "Checking for uriparser... " ++if ${CC} -o compat/have_uriparser "$srcdir"/compat/have_uriparser.c -luriparser > /dev/null 2>&1 ++then ++ printf "Yes.\n" ++ uriparser_ldflags="-luriparser" ++ have_uriparser=1 ++else ++ printf "No.\n" ++ have_uriparser=0 ++ errors=$((errors + 1)) ++fi ++rm -f compat/have_uriparser ++ + printf "Checking for valgrind development files... " + if pkg-config --exists valgrind; then + printf "Yes.\n" +@@ -431,11 +444,11 @@ case a simple command will install everything you need. For example: + + On Debian and similar systems: + +- sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev ++ sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev liburiparser-dev + + Or on Fedora and similar systems: + +- sudo yum install xapian-core-devel gmime-devel libtalloc-devel ++ sudo yum install xapian-core-devel gmime-devel libtalloc-devel uriparser-devel + + On other systems, similar commands can be used, but the details of the + package names may be different. +@@ -669,6 +682,9 @@ GMIME_LDFLAGS = ${gmime_ldflags} + TALLOC_CFLAGS = ${talloc_cflags} + TALLOC_LDFLAGS = ${talloc_ldflags} + ++# Flags needed to link against uriparser ++URIPARSER_LDFLAGS = ${uriparser_ldflags} ++ + # Flags needed to have linker set rpath attribute + RPATH_LDFLAGS = ${rpath_ldflags} + +@@ -698,5 +714,6 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) +-CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) ++CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) \\ ++ \$(URIPARSER_LDFLAGS) + EOF +-- +1.7.9.5 +