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/syncdb | |
| parent | 50c482495e33314141bca76bbc1c31c69e00b739 (diff) | |
| download | sync-cd1c879a67f169b8e1570db9ab88b535186390da.tar.gz sync-cd1c879a67f169b8e1570db9ab88b535186390da.tar.bz2 sync-cd1c879a67f169b8e1570db9ab88b535186390da.zip | |
fix os installation sequence
Diffstat (limited to 'src/syncdb')
| -rw-r--r-- | src/syncdb/Makefile.am | 2 | ||||
| -rw-r--r-- | src/syncdb/sync-dbinit.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/syncdb/Makefile.am b/src/syncdb/Makefile.am index d9b9999..b9eddb9 100644 --- a/src/syncdb/Makefile.am +++ b/src/syncdb/Makefile.am @@ -24,6 +24,7 @@ sync_dbinit_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libsyncutil.la \ -lsyncdb \ + -ltalerutil \ -lgnunetutil lib_LTLIBRARIES = \ @@ -45,7 +46,6 @@ libsync_plugin_db_postgres_la_SOURCES = \ libsync_plugin_db_postgres_la_LIBADD = \ $(LTLIBINTL) libsync_plugin_db_postgres_la_LDFLAGS = \ - $(top_builddir)/src/util/libsyncutil.la \ $(TALER_PLUGIN_LDFLAGS) \ -lgnunetpq \ -lpq \ diff --git a/src/syncdb/sync-dbinit.c b/src/syncdb/sync-dbinit.c index 9377088..be78eb8 100644 --- a/src/syncdb/sync-dbinit.c +++ b/src/syncdb/sync-dbinit.c @@ -88,10 +88,11 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; - /* force linker to link against libtalerutil; if we do - not do this, the linker may "optimize" libtalerutil - away and skip #SYNC_OS_init(), which we do need */ - (void) SYNC_project_data_default (); + /* 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 ()); GNUNET_assert (GNUNET_OK == GNUNET_log_setup ("sync-dbinit", "INFO", |