* Fixes to the configure script that prevented Alpine from completing

     compilation in Mac OSX due to Alpine defining a password file, when
     Alpine uses the KeyChain instead.

1 files changed, 26 insertions, 23 deletions

diff --git a/configure b/configure
index 51632296..e6d7a705 100755
--- a/configure
+++ b/configure
@@ -933,9 +933,9 @@ with_pthread
 with_system_mail_directory
 with_c_client_target
 with_bundled_tools
-with_passfile
 with_local_password_cache
 with_local_password_cache_method
+with_passfile
 with_ipv6
 with_dlopen
 with_ntlm
@@ -1784,14 +1784,14 @@ Optional Packages:
                           IMAP build target (see imap/Makefile)
   --with-bundled-tools    Build additional tools (mtest, imapd, etc.) Default:
                           --with-bundled-tools=no
-  --with-passfile=FILENAME
-                          Password cache file (recommended when S/MIME is
-                          enabled and configured)
   --without-local-password-cache
                           Disable OS-specific password cache, if supported
   --with-local-password-cache-method
                           OS-specific credential cache (OSX=APPLEKEYCHAIN,
                           Windows=WINCRED)
+  --with-passfile=FILENAME
+                          Password cache file (recommended when S/MIME is
+                          enabled and configured)
   --without-ipv6          Disable IPv6, primarily to work around resolver
                           problems
   --without-dlopen        Do not test for dlopen because this system does not
@@ -18752,6 +18752,26 @@ if test "${with_bundled_tools+set}" = set; then :
 fi
 
 
+
+# Check whether --with-local-password-cache was given.
+if test "${with_local_password_cache+set}" = set; then :
+  withval=$with_local_password_cache;
+     alpine_os_credential_cache=$withval
+
+fi
+
+
+
+# Check whether --with-local-password-cache-method was given.
+if test "${with_local_password_cache_method+set}" = set; then :
+  withval=$with_local_password_cache_method;
+     alpine_os_credential_cache_method=$withval
+
+fi
+
+
+alpine_cache_os_method="no"
+
 alpine_PAM="none"
 
 case "$host" in
@@ -18874,6 +18894,7 @@ $as_echo "#define OSX_TARGET 1" >>confdefs.h
 
 $as_echo "#define APPLEKEYCHAIN 1" >>confdefs.h
 
+	alpine_cache_os_method="yes"
 	;;
     esac
     if test -z "$alpine_c_client_bundled" ; then
@@ -19096,25 +19117,7 @@ fi
 
 
 
-
-# Check whether --with-local-password-cache was given.
-if test "${with_local_password_cache+set}" = set; then :
-  withval=$with_local_password_cache;
-     alpine_os_credential_cache=$withval
-
-fi
-
-
-
-# Check whether --with-local-password-cache-method was given.
-if test "${with_local_password_cache_method+set}" = set; then :
-  withval=$with_local_password_cache_method;
-     alpine_os_credential_cache_method=$withval
-
-fi
-
-
-if test -z "$alpine_PASSFILE" ; then
+if test -z "$alpine_PASSFILE" -a "alpine_cache_os_method" = "no" ; then
   if test -z "$alpine_SYSTEM_PASSFILE" ; then
      alpine_PASSFILE=".alpine.pwd"
   else