[folks] Generate the same C code whether the eds backend is enabled or not.

[Travis Reitter <treitter src gnome org>]

commit b15f6e0efb4b0191e8f516609e11369afce08b3c
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Wed Oct 26 17:30:37 2011 -0700

    Generate the same C code whether the eds backend is enabled or not.
    
    Previously, the configure options used would alter the release tarball.
    
    This would cause problems for anyone building from the shipped C files
    (specifically, if they also disabled the eds backend, as the Debian
    packagers did).
    
    Closes: bgo#662274 - Failed to link personas: Can't link personas with
    no primary store.

 NEWS                             |    2 ++
 folks/individual-aggregator.vala |   17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6113612..fa24e5f 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Bugs fixed:
 * Bug 660908 â Add favourites support to EDS backend
 * Bug 662770 â ContactPhotos are ignored when mime type is null
 * Bug 662616 â We should set mime type when setting an EContact's photo
+* Bug 662274 â Failed to link personas: Can't link personas with no primary
+  store.
 
 API changes:
 * Add AbstractFieldDetails.id to identify instances of details
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index d8df003..f1eeaba 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -303,13 +303,16 @@ public class Folks.IndividualAggregator : Object
       else
         {
           debug ("Setting primary store IDs to defaults.");
-#if ENABLE_EDS
-          this._configured_primary_store_type_id = "eds";
-          this._configured_primary_store_id = "system";
-#else
-          this._configured_primary_store_type_id = "key-file";
-          this._configured_primary_store_id = "";
-#endif
+          if (BuildConf.HAVE_EDS)
+            {
+              this._configured_primary_store_type_id = "eds";
+              this._configured_primary_store_id = "system";
+            }
+          else
+            {
+              this._configured_primary_store_type_id = "key-file";
+              this._configured_primary_store_id = "";
+            }
 
           try
             {