From 90b8fce59fe02a0e0ccac05a2baaadf7317e07a0 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 6 Sep 2020 13:15:51 -0700
Subject: [PATCH] Fix build after merge.

---
 bindings/guile/gnc-guile-bindings.c             |  1 -
 libgnucash/app-utils/test/CMakeLists.txt        | 16 ++++++----------
 libgnucash/app-utils/test/test-gnc-optiondb.scm |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/bindings/guile/gnc-guile-bindings.c b/bindings/guile/gnc-guile-bindings.c
index 4d40df5cdf..77dbf384be 100644
--- a/bindings/guile/gnc-guile-bindings.c
+++ b/bindings/guile/gnc-guile-bindings.c
@@ -44,6 +44,5 @@ gnc_guile_bindings_init(void)
         scm_init_sw_core_utils_module();
         scm_init_sw_engine_module();
 
-        is_initialized = 1;
     }
 }
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 7b2568e5bf..f5358e7334 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -80,18 +80,14 @@ gnc_add_scheme_tests("${test_app_utils_scheme_SOURCES}")
 
 if (HAVE_SRFI64)
   gnc_add_scheme_test_targets(scm-test-app-utils-srfi64
-    "${test_app_utils_scheme_SRFI64_SOURCES}"
-    "tests"
-    "${GUILE_DEPENDS};scm-srfi64-extras"
-    FALSE
-    )
+    SOURCES "${test_app_utils_scheme_SRFI64_SOURCES}"
+    OUTPUT_DIR "tests"
+    DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
 
   gnc_add_scheme_test_targets(scm-test-gnc-optiondb
-    "test-gnc-optiondb.scm"
-    "tests"
-    "swig-apputils-guile-cpp;scm-srfi64-extras"
-    FALSE
-    )
+    SOURCES "test-gnc-optiondb.scm"
+    OUTPUT_DIR "tests"
+    DEPENDS "swig-apputils-guile-cpp;scm-srfi64-extras")
   gnc_add_scheme_tests("test-gnc-optiondb.scm")
   gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
 endif()
diff --git a/libgnucash/app-utils/test/test-gnc-optiondb.scm b/libgnucash/app-utils/test/test-gnc-optiondb.scm
index 7df17cac07..56f3e9b160 100644
--- a/libgnucash/app-utils/test/test-gnc-optiondb.scm
+++ b/libgnucash/app-utils/test/test-gnc-optiondb.scm
@@ -26,7 +26,7 @@
 (use-modules (gnucash gnc-module))
 (eval-when
  (compile load eval expand)
- (load-extension "_sw_app_utils" "scm_init_sw_app_utils_module"))
+ (load-extension "libgnc-app-utils" "scm_init_sw_app_utils_module"))
 
 (use-modules (gnucash engine))
 (use-modules (sw_app_utils))