gnucash master: Multiple changes pushed

Geert Janssens geert.gnucash at kobaltwit.be
Sat Aug 19 12:05:13 EDT 2017


On zaterdag 19 augustus 2017 17:33:03 CEST John Ralls wrote:
> commit 6a359f86a07b2adcf6233cafc7531656e02cc6df
> Author: John Ralls <jralls at ceridwen.us>
> Date:   Wed Aug 16 23:16:42 2017 +0200
> 
>     Fix mac looking in wrong directory for libgncmod-backend-dbi.dylib.
> 
> diff --git a/libgnucash/backend/dbi/test/test-backend-dbi.cpp
> b/libgnucash/backend/dbi/test/test-backend-dbi.cpp index 4936ed0..ff51ab0
> 100644
> --- a/libgnucash/backend/dbi/test/test-backend-dbi.cpp
> +++ b/libgnucash/backend/dbi/test/test-backend-dbi.cpp
> @@ -30,9 +30,9 @@ extern "C"
>  extern void test_suite_gnc_backend_dbi ();
> 
>  #define GNC_LIB_NAME_1 "gncmod-backend-dbi"
> -#define GNC_LIB_REL_PATH_1 "dbi"
> +#define GNC_LIB_REL_PATH_1 "gnucash"
>  #define GNC_LIB_NAME_2 "gncmod-backend-xml"
> -#define GNC_LIB_REL_PATH_2 "xml"
> +#define GNC_LIB_REL_PATH_2 "gnucash"
> 
>  int
>  main (int   argc,
> diff --git a/libgnucash/engine/gnc-engine.c b/libgnucash/engine/gnc-engine.c
> index a61dfd8..34d1348 100644
> --- a/libgnucash/engine/gnc-engine.c
> +++ b/libgnucash/engine/gnc-engine.c
> @@ -74,10 +74,10 @@ gnc_engine_init_part2()
>      } libs[] =
>      {
>  #if defined( HAVE_DBI_DBI_H )
> -        { "dbi", "gncmod-backend-dbi", TRUE },
> +        { "gnucash", "gncmod-backend-dbi", TRUE },
>  #endif
> -        { "xml", "gncmod-backend-xml", TRUE },
> -        { NULL, NULL, FALSE }
> +        { "gnucash", "gncmod-backend-xml", TRUE },
> +        { NULL, FALSE }
>      }, *lib;
> 
>      for (lib = libs; lib->lib ; lib++)
> 

John,

This essentially undoes my commit
https://github.com/Gnucash/gnucash/commit/0946b0315fcc2509390
I created that commit because I believed that should fix the problem in 
another way.

I mentioned this on Wednesday around the time you had to leave, but I haven't 
seen feedback from you on it.

Did my alternative still not work ? If so we have to look further, because the 
above commit breaks autotools builds on all platforms.

Geert


More information about the gnucash-devel mailing list