Changeset 50d0a72

Timestamp:

2023-03-07T21:21:34Z (14 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

bea6db0

Parents:

82149f4

git-author:

Petr Vaněk <arkamar@…> (07-03-23 21:21:34)

git-committer:

GitHub <noreply@…> (07-03-23 21:21:34)

Message:

Improve control over automatic properties of Systemd configuration (#174)

• configure: fix indentation

• configure: improve description of --systemd option

• configure: unify --sysusersdir usage style

• configure: allow to set systemd dirs without autodetection dependencies

File:

• configure (modified) (4 diffs)

configure

@@ -131 +131 @@
 --plugindir=...                                         $plugindir
 --systemdsystemunitdir=...                              $systemdsystemunitdir
---sysusersdir                       $sysusersdir
+--sysusersdir=...                                       $sysusersdir
 --pidfile=...                                           $pidfile
 --config=...                                            $config
@@ -160 +160 @@
                                                         $ssl
 --external_json_parser=0/1/auto Use External JSON parser $external_json_parser
---systemd=0/1  Enable/disable systemd support $systemd
+--systemd=0/1   Enable/disable automatic detection
+                of systemd directories                  $systemd
 
 
@@ -773 +774 @@
                 systemdsystemunitdir=$(pkgconf_systemd_var systemdsystemunitdir systemd_system_unit_dir)
         fi
-    if [ -z "$sysusersdir" ] ; then
-        sysusersdir=$(pkgconf_systemd_var sysusersdir sysusers_dir)
-    fi
-
+        if [ -z "$sysusersdir" ] ; then
+                sysusersdir=$(pkgconf_systemd_var sysusersdir sysusers_dir)
+        fi
+fi
+
+if [ -n "$systemdsystemunitdir" ]; then
         echo "SYSTEMDSYSTEMUNITDIR=$systemdsystemunitdir" >> Makefile.settings
-    echo "SYSUSERSDIR=$sysusersdir" >> Makefile.settings
+fi
+if [ -n "$sysusersdir" ]; then
+        echo "SYSUSERSDIR=$sysusersdir" >> Makefile.settings
 fi
 
@@ -1032 +1037 @@
 
 if [ "$systemd" = "1" ]; then
-        echo '  systemd enabled.'
-else
-        echo '  systemd disabled.'
+        echo '  systemd autodetection enabled.'
+else
+        echo '  systemd autodetection disabled.'
 fi