diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-11-25 16:24:27 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-11-25 16:24:27 +0100 |
| commit | cd1c879a67f169b8e1570db9ab88b535186390da (patch) | |
| tree | 7c36a098d3ce2788bdd38e02508db42ddfa421fc /src/sync | |
| parent | 50c482495e33314141bca76bbc1c31c69e00b739 (diff) | |
| download | sync-cd1c879a67f169b8e1570db9ab88b535186390da.tar.gz sync-cd1c879a67f169b8e1570db9ab88b535186390da.tar.bz2 sync-cd1c879a67f169b8e1570db9ab88b535186390da.zip | |
fix os installation sequence
Diffstat (limited to 'src/sync')
| -rw-r--r-- | src/sync/Makefile.am | 1 | ||||
| -rw-r--r-- | src/sync/sync-httpd.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/sync/Makefile.am b/src/sync/Makefile.am index c1ceb62..c90567e 100644 --- a/src/sync/Makefile.am +++ b/src/sync/Makefile.am @@ -16,6 +16,7 @@ sync_httpd_SOURCES = \ sync-httpd_mhd.c sync-httpd_mhd.h \ sync-httpd_terms.c sync-httpd_terms.h sync_httpd_LDADD = \ + $(top_builddir)/src/util/libsyncutil.la \ $(top_builddir)/src/syncdb/libsyncdb.la \ -lmicrohttpd \ -ljansson \ diff --git a/src/sync/sync-httpd.c b/src/sync/sync-httpd.c index 982a317..975db92 100644 --- a/src/sync/sync-httpd.c +++ b/src/sync/sync-httpd.c @@ -21,6 +21,7 @@ #include "platform.h" #include <microhttpd.h> #include <gnunet/gnunet_util_lib.h> +#include "sync_util.h" #include "sync-httpd.h" #include "sync-httpd_mhd.h" #include "sync_database_lib.h" @@ -616,6 +617,11 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; + /* FIRST get the libtalerutil initialization out + of the way. Then throw that one away, and force + the SYNC defaults to be used! */ + (void) TALER_project_data_default (); + GNUNET_OS_init (SYNC_project_data_default ()); if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, "sync-httpd", |