Add support for specifying USE_UTMPX in mconfig.

diff --git a/src/Makefile b/src/Makefile
index 224212809f192ae350e59135f646a2467c007a82..f45eb984a80fd59999af038db77d4b5805277215 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,8 @@ all: dinit dinitctl $(SHUTDOWN)
        fi
 
 includes/mconfig.h: mconfig-gen
-       ./mconfig-gen SBINDIR=$(SBINDIR) SYSCONTROLSOCKET=$(SYSCONTROLSOCKET) > includes/mconfig.h
+       ./mconfig-gen SBINDIR=$(SBINDIR) SYSCONTROLSOCKET=$(SYSCONTROLSOCKET) \
+               $(if $(USE_UTMPX),USE_UTMPX=$(USE_UTMPX),) > includes/mconfig.h
 
 mconfig-gen: mconfig-gen.cc ../mconfig
        $(CXX) $(CXXOPTS) -o mconfig-gen mconfig-gen.cc $(LDFLAGS)

diff --git a/src/mconfig-gen.cc b/src/mconfig-gen.cc
index 1472e2ecc5bc947fa75b65797d19043dd55b85a6..5864bdd5dae44623669521370ce55631abf6b92e 100644 (file)
--- a/src/mconfig-gen.cc
+++ b/src/mconfig-gen.cc
@@ -60,7 +60,12 @@ int main(int argc, char **argv)
 
     using namespace std;
     cout << "// This file is auto-generated by mconfig-gen.cc." << endl;
-    cout << "constexpr static char SYSCONTROLSOCKET[] = " << stringify(vars["SYSCONTROLSOCKET"]) << ";" << endl;
-    cout << "constexpr static char SBINDIR[] = " << stringify(vars["SBINDIR"]) << ";" << endl;
+    cout << "\n// Defines\n";
+    if (vars.find("USE_UTMPX") != vars.end()) {
+        cout << "#define USE_UTMPX " << vars["USE_UTMPX"] << "\n";
+    }
+    cout << "\n// Constants\n";
+    cout << "constexpr static char SYSCONTROLSOCKET[] = " << stringify(vars["SYSCONTROLSOCKET"]) << ";\n";
+    cout << "constexpr static char SBINDIR[] = " << stringify(vars["SBINDIR"]) << ";\n";
     return 0;
 }