r18999 - gnucash/trunk - Fix MacOSX keyring test in configure to work and make gnc-keyring.c compile if it does.

[Mike Alexander]

Author: mta
Date: 2010-04-05 22:19:25 -0400 (Mon, 05 Apr 2010)
New Revision: 18999
Trac: http://svn.gnucash.org/trac/changeset/18999

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/src/gnome-utils/gnc-keyring.c
Log:
Fix MacOSX keyring test in configure to work and make gnc-keyring.c compile if it does.

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2010-04-06 02:17:21 UTC (rev 18998)
+++ gnucash/trunk/configure.in	2010-04-06 02:19:25 UTC (rev 18999)
@@ -1081,15 +1081,16 @@
 
     ###-----------------------------------------------------------------------
     ## Find a suitable password store
-    
-    if test x$host_os = xdarwin
-    then
+
+case $host_os in
+    darwin*)
         AC_DEFINE(HAVE_OSX_KEYCHAIN,1,[System has an OS X Key chain])
-    else
+        ;;
+    *)
         PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= "0.6",
             [AC_DEFINE(HAVE_GNOME_KEYRING,1,[System has gnome-keyring 0.6 or better])],
             [AC_DEFINE(HAVE_NO_KEYRING,1,[System has no suitable keyring service])])
-    fi
+esac
     ### ----------------------------------------------------------------------
     
     AC_ARG_ENABLE( efence,

Modified: gnucash/trunk/src/gnome-utils/gnc-keyring.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-keyring.c	2010-04-06 02:17:21 UTC (rev 18998)
+++ gnucash/trunk/src/gnome-utils/gnc-keyring.c	2010-04-06 02:19:25 UTC (rev 18999)
@@ -30,7 +30,10 @@
 #include <gnome-keyring.h>
 #endif
 #ifdef HAVE_OSX_KEYCHAIN
+#  if 0
+    /* FIXME The OSX part hasn't been tested yet */
 #include <SecKeychain.h>
+#  endif /* 0 */
 #endif
 
 /* This static indicates the debugging module that this .o belongs to. */
@@ -60,7 +63,7 @@
     }
 #endif /* HAVE_GNOME_KEYRING */
 #ifdef HAVE_OSX_KEYCHAIN
-#  ifdef 0
+#  if 0
     /* FIXME The OSX part hasn't been tested yet */
     OSStatus status;
     SecKeychainItemRef *itemRef = NULL;
@@ -113,7 +116,7 @@
     GnomeKeyringNetworkPasswordData *found;
 #endif
 #ifdef HAVE_OSX_KEYCHAIN
-#  ifdef 0
+#  if 0
     /* FIXME The OSX part hasn't been tested yet */
     void *password_data;
     UInt32 password_length;
@@ -146,7 +149,7 @@
     gnome_keyring_network_password_list_free(found_list);
 #endif /* HAVE_GNOME_KEYRING */
 #ifdef HAVE_OSX_KEYCHAIN
-#  ifdef 0
+#  if 0
     /* FIXME The OSX part hasn't been tested yet */
     void *password_data;
     UInt32 password_length;