Merge lp:~ken-vandine/account-plugins/hardcoded_path into lp:~mardy/account-plugins/qml

[Ken VanDine]

  Added a hard-coded path for qmlpluginsdir if pkgconfig failed to get it, this
  way we don't have to build depend on ubuntu-system-settings-online-accounts, which
  isn't in main yet.

  Added a hard-coded path for qmlpluginsdir if pkgconfig failed to get it, this
  way we don't have to build depend on ubuntu-system-settings-online-accounts, which
  isn't in main yet.

[Alberto Mardegan (mardy)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-06-07 07:35:08 +0000
+++ configure.ac	2013-06-11 20:00:37 +0000
@@ -75,6 +75,11 @@
 # QML plugins installation path
 AC_SUBST([qmlpluginsdir],
 	 [`$PKG_CONFIG --variable plugin_qml_dir --define-variable=prefix=$real_prefix OnlineAccountsPlugin`])
+AC_MSG_CHECKING(for qmlplugins directory)
+if test "x$qmlpluginsdir" = "x" ; then
+        # fallback if the previous failed
+        qmlpluginsdir="$real_prefix/share/accounts/qml-plugins"
+fi
 
 # libaccounts providers and service files
 AC_SUBST([providersdir],
 
=== modified file 'debian/control'
--- debian/control	2013-06-07 11:56:25 +0000
+++ debian/control	2013-06-11 20:00:37 +0000
@@ -12,7 +12,6 @@
                libaccount-plugin-1.0-dev (>= 0.1.3),
                valac-0.16,
                gnome-common,
-               ubuntu-system-settings-online-accounts,
                dh-autoreconf,
                libxml2-utils,
 Standards-Version: 3.9.4