From 11caab49cdc644bbb5f5cc52e948dcd39950f463 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 25 Apr 2009 18:46:25 -0400
Subject: [PATCH] Disable libpth by default.

---
 assuan/configure.ac | 2 +-
 configure.ac        | 2 +-
 debian/rules        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assuan/configure.ac b/assuan/configure.ac
index d8be8baa..c9412ec7 100644
--- a/assuan/configure.ac
+++ b/assuan/configure.ac
@@ -139,7 +139,7 @@ dnl AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 # See whether we can build a Pth enabled version
 #
 GNUPG_PATH_PTH
-AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes" && test "$with_pth" != "no")
+AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes" && test "$with_pth" = "yes")
 
 
 # Check for network libraries.  They are needed for tests.
diff --git a/configure.ac b/configure.ac
index e605200c..e9e8bef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_TYPE_SSIZE_T
 AC_TYPE_PID_T
 
 AM_PATH_GPG_ERROR(,, AC_MSG_ERROR([Missing or incomplete libgpg-error installation.]))
-AC_CHECK_PTH(, yes, yes, no, have_libpth=yes, have_libpth=no)
+AC_CHECK_PTH(, no, yes, no, have_libpth=yes, have_libpth=no)
 AM_CONDITIONAL([WITH_LIBPTH], [test "x$have_libpth" = "xyes"])
 
 AC_ARG_ENABLE(ssh, AC_HELP_STRING([--disable-ssh], [Disable SSH support.]),
diff --git a/debian/rules b/debian/rules
index 116bf9a7..f22314cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure --without-pth --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
 build: build-stamp
-- 
2.11.4.GIT