gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/76921b5e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0186bc1c (commit)
	from  https://github.com/Gnucash/gnucash/commit/7c57ad18 (commit)



commit 76921b5e2843023512c324535fa667efe0b5a98f
Author: christopherlam <christopher.lck at gmail.com>
Date:   Tue Dec 19 15:39:57 2017 -0800

    Fix -DWITH_SQL=OFF Build.

diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c
index 248c494..3142c71 100644
--- a/gnucash/gnome/gnc-plugin-basic-commands.c
+++ b/gnucash/gnome/gnc-plugin-basic-commands.c
@@ -528,7 +528,7 @@ gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowAction
 #ifdef HAVE_DBI_DBI_H
     gnc_ui_file_access_for_export (GTK_WINDOW (data->window));
 #else
-    gnc_file_export ();
+    gnc_file_export (GTK_WINDOW (data->window));
 #endif
     gnc_window_set_progressbar_window (NULL);
 }

commit 0186bc1c0c32db749485dc1d48402715f69337dc
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Fri Dec 8 14:45:02 2017 +0000

    Change the relative path to a full one for rpath

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38515d6..964bb9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -526,7 +526,7 @@ IF (APPLE AND WITH_GNUCASH)
 ENDIF (APPLE AND WITH_GNUCASH)
 
 IF (UNIX)
-  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}:${PKGLIBDIR}")
+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}:${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 ENDIF()
 
 SET(BUILD_SHARED_LIBS ON)



Summary of changes:
 CMakeLists.txt                            | 2 +-
 gnucash/gnome/gnc-plugin-basic-commands.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)