anastasis

commit 6b93512800816173d705e52310d67457de1d9055
parent 83ef4664b13a5146e2bf13f9c3ce13794523ed94
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 20 Nov 2024 19:38:31 +0100

more todos

Diffstat:
M
src/util/Makefile.am
 | 
22
++++++++--------------
M
src/util/anastasis-config.c
 | 
8
++++++--

2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
@@ -7,30 +7,24 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
+  anastasis-config \
   anastasis-crypto-tvg
 
+anastasis_config_SOURCES = \
+  anastasis-config.c
+anastasis_config_LDADD = \
+  libanastasisutil.la \
+ -lgnunetutil \
+  $(XLIB)
+
 pkgcfgdir = $(prefix)/share/anastasis/config.d/
 
 pkgcfg_DATA = \
   paths.conf
 
 EXTRA_DIST = \
-  anastasis-config.in \
   $(pkgcfg_DATA)
 
-edit_script = $(SED) -e 's,%libdir%,$(libdir),'g $(NULL)
-
-anastasis-config: anastasis-config.in
-	rm -f $@ $@.tmp && \
-	$(edit_script) $< >$@.tmp && \
-	chmod a-w+x $@.tmp && \
-	mv $@.tmp $@
-
-CLEANFILES = \
-  anastasis-config
-
-bin_SCRIPTS = \
-  anastasis-config
 
 lib_LTLIBRARIES = \
   libanastasisutil.la
diff --git a/src/util/anastasis-config.c b/src/util/anastasis-config.c
@@ -43,12 +43,16 @@ main (int argc,
     .global_ret = EXIT_SUCCESS
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_help (ANASTASIS_project_data (),
+                               "anastasis-config [OPTIONS]"),
+    GNUNET_GETOPT_option_version (ANASTASIS_project_data ()->version),
+    GNUNET_CONFIGURATION_CONFIG_OPTIONS (&cs),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
 
-  ANASTASIS_OS_init ();
-  ret = GNUNET_PROGRAM_run (argc,
+  ret = GNUNET_PROGRAM_run (ANASTASIS_project_data (),
+                            argc,
                             argv,
                             "anastasis-config [OPTIONS]",
                             gettext_noop (