--- /dev/null
+Return-Path: <ethan.glasser.camp@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id D44FE431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Jun 2012 13:42:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.061\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.061 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_BL_SPAMCOP_NET=1.246,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_SORBS_WEB=0.614] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id VhjAPrpK3bT3 for <notmuch@notmuchmail.org>;\r
+ Mon, 25 Jun 2012 13:42:44 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+ [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id D7D04431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Jun 2012 13:42:43 -0700 (PDT)\r
+Received: by werj55 with SMTP id j55so3641437wer.26\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Jun 2012 13:42:42 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=X6hLOJsWOhhBvyxEGXCGI+3zWvDOb1uiOQcr8AYYYcw=;\r
+ b=Nj9Rs9twK1+5mm7lmCFT7FIl4swU6WN7iSg7i+iL9kxIlRULl2ZWkPTkO/KtyVc0qe\r
+ 9H4M2xVgK9owhi9Og58d458bCUgKwaIkd9cKdTVKcKY5MtiUeqdtn3RJj6fMrYjbJM+3\r
+ Oe+Z9aMoO3f+S/Hc5axnUb8Lhy6nU+n7K0jCbwo+QBBbw9yqxfoyKGVQLfgjI29KEsyv\r
+ 4qRJlHEk9pfJ+dpAgndQpxrxOqZbfw9xJqs22iQcA6d6n9RAkQUxzXVw45BAc2nTxZFM\r
+ iZo4seu2sMxwVQPKOkdHjPXaaOx6HbL2iawftNNNlUF1XAY+vCkkL4UHfmJr4li/axC8\r
+ zXzQ==\r
+Received: by 10.216.144.199 with SMTP id n49mr6604139wej.25.1340656962506;\r
+ Mon, 25 Jun 2012 13:42:42 -0700 (PDT)\r
+Received: from localhost ([195.24.209.21])\r
+ by mx.google.com with ESMTPS id db7sm18744596wib.6.2012.06.25.13.42.33\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 25 Jun 2012 13:42:41 -0700 (PDT)\r
+From: Ethan Glasser-Camp <ethan.glasser.camp@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH 02/14] Introduce uriparser\r
+Date: Mon, 25 Jun 2012 16:41:27 -0400\r
+Message-Id: <1340656899-5644-3-git-send-email-ethan@betacantrips.com>\r
+X-Mailer: git-send-email 1.7.9.5\r
+In-Reply-To: <1340656899-5644-1-git-send-email-ethan@betacantrips.com>\r
+References: <1340656899-5644-1-git-send-email-ethan@betacantrips.com>\r
+X-Mailman-Approved-At: Tue, 26 Jun 2012 03:51:54 -0700\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 25 Jun 2012 20:42:45 -0000\r
+\r
+Seeing as there is no glib-standard way to parse URIs, an external\r
+library is needed. This commit introduces another program in compat/\r
+and a stanza in ./configure to test if uriparser is there.\r
+\r
+Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>\r
+---\r
+ Makefile.local | 2 +-\r
+ compat/have_uriparser.c | 17 +++++++++++++++++\r
+ configure | 23 ++++++++++++++++++++---\r
+ 3 files changed, 38 insertions(+), 4 deletions(-)\r
+ create mode 100644 compat/have_uriparser.c\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index a890df2..084f44e 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -41,7 +41,7 @@ PV_FILE=bindings/python/notmuch/version.py\r
+ # Smash together user's values with our extra values\r
+ FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)\r
+ FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)\r
+-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)\r
++FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(URIPARSER_LDFLAGS)\r
+ FINAL_NOTMUCH_LINKER = CC\r
+ ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)\r
+ FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)\r
+diff --git a/compat/have_uriparser.c b/compat/have_uriparser.c\r
+new file mode 100644\r
+index 0000000..d79e51d\r
+--- /dev/null\r
++++ b/compat/have_uriparser.c\r
+@@ -0,0 +1,17 @@\r
++#include <uriparser/Uri.h>\r
++\r
++int\r
++main (int argc, char *argv[])\r
++{\r
++ UriParserStateA state;\r
++ UriUriA uri;\r
++ char *uriS = NULL;\r
++\r
++ state.uri = &uri;\r
++ if (uriParseUriA (&state, uriS) != URI_SUCCESS) {\r
++ /* Failure */\r
++ uriFreeUriMembersA (&uri);\r
++ }\r
++\r
++ return 0;\r
++}\r
+diff --git a/configure b/configure\r
+index 3fad424..80aa13c 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -313,6 +313,19 @@ else\r
+ errors=$((errors + 1))\r
+ fi\r
+ \r
++printf "Checking for uriparser... "\r
++if ${CC} -o compat/have_uriparser "$srcdir"/compat/have_uriparser.c -luriparser > /dev/null 2>&1\r
++then\r
++ printf "Yes.\n"\r
++ uriparser_ldflags="-luriparser"\r
++ have_uriparser=1\r
++else\r
++ printf "No.\n"\r
++ have_uriparser=0\r
++ errors=$((errors + 1))\r
++fi\r
++rm -f compat/have_uriparser\r
++\r
+ printf "Checking for valgrind development files... "\r
+ if pkg-config --exists valgrind; then\r
+ printf "Yes.\n"\r
+@@ -431,11 +444,11 @@ case a simple command will install everything you need. For example:\r
+ \r
+ On Debian and similar systems:\r
+ \r
+- sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev\r
++ sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev liburiparser-dev\r
+ \r
+ Or on Fedora and similar systems:\r
+ \r
+- sudo yum install xapian-core-devel gmime-devel libtalloc-devel\r
++ sudo yum install xapian-core-devel gmime-devel libtalloc-devel uriparser-devel\r
+ \r
+ On other systems, similar commands can be used, but the details of the\r
+ package names may be different.\r
+@@ -669,6 +682,9 @@ GMIME_LDFLAGS = ${gmime_ldflags}\r
+ TALLOC_CFLAGS = ${talloc_cflags}\r
+ TALLOC_LDFLAGS = ${talloc_ldflags}\r
+ \r
++# Flags needed to link against uriparser\r
++URIPARSER_LDFLAGS = ${uriparser_ldflags}\r
++\r
+ # Flags needed to have linker set rpath attribute\r
+ RPATH_LDFLAGS = ${rpath_ldflags}\r
+ \r
+@@ -698,5 +714,6 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
+ \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\\r
+ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)\r
+-CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)\r
++CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) \\\r
++ \$(URIPARSER_LDFLAGS)\r
+ EOF\r
+-- \r
+1.7.9.5\r
+\r
projects / notmuch-archives.git / commitdiff