1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
| | From 6e69d6784caa1fdeba1ba4b7ed3dc58fcd631275 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sat, 2 Oct 2021 20:08:52 +0200
Subject: [PATCH] Remove distro detection
diff --git a/configure.ac b/configure.ac
index ee067d9..12a1214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,33 +24,6 @@ AC_CONFIG_SRCDIR([service/realm-daemon.c])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable])
-# -----------------------------------------------------------------------------
-# Distro Detection
-
-AC_ARG_WITH([distro],
- [AS_HELP_STRING([--with-distro],
- [Configure for a specific distribution (eg: redhat)]
- )],
- [DISTRO=$withval],
- [DISTRO=])
-
-if test -z $DISTRO; then
- AC_CHECK_FILE(/etc/redhat-release, [DISTRO="redhat"])
- AC_CHECK_FILE(/etc/debian_version, [DISTRO="debian"])
- AC_CHECK_FILE(/etc/SuSE-release, [DISTRO="suse"])
-
- # Not customized for these yet
- dnl AC_CHECK_FILE(/etc/gentoo-release, [DISTRO="gentoo"])
- dnl AC_CHECK_FILE(/etc/slackware-version, [DISTRO="slackware"])
-
-fi
-
-if test -z $DISTRO; then
- AC_MSG_ERROR([Couldn't detect the distro to configure for. Specify one with --with-distro])
-fi
-
-AC_SUBST(DISTRO)
-
# -----------------------------------------------------------------------------
# Basic tools
diff --git a/doc/internals/Makefile.am b/doc/internals/Makefile.am
index 2acbfd8..4eba507 100644
--- a/doc/internals/Makefile.am
+++ b/doc/internals/Makefile.am
@@ -28,10 +28,8 @@ CLEANFILES += \
internals/realmd-internals.html: $(INTERNAL_DOCBOOK) $(INTERNAL_INCLUDES) $(INTERNAL_STATIC)
$(AM_V_GEN) mkdir -p internals && cp $(srcdir)/doc/internals/static/* internals/ && \
- $(XMLTO) html-nochunks -m $(srcdir)/$(INTERNAL_PARAMS) -o internals \
- --searchpath $(abs_builddir):$(abs_srcdir) $(srcdir)/$(INTERNAL_DOCBOOK)
+ #$(XMLTO) html-nochunks -m $(srcdir)/$(INTERNAL_PARAMS) -o internals \
+ # --searchpath $(abs_builddir):$(abs_srcdir) $(srcdir)/$(INTERNAL_DOCBOOK)
render-images:
- for i in $(SVG_IMAGES:.svg=); do \
- inkscape --export-png=static/$$i.png $$i.svg; \
- done
+ true
diff --git a/service/Makefile.am b/service/Makefile.am
index c17bf3b..0988bf6 100644
--- a/service/Makefile.am
+++ b/service/Makefile.am
@@ -137,7 +137,6 @@ install-service:
$(INSTALL_PROGRAM) -d $(DESTDIR)$(privatedir)
$(INSTALL_PROGRAM) -d $(DESTDIR)$(localstatedir)/lib/realmd
$(INSTALL_PROGRAM) -d $(DESTDIR)$(cachedir)
- $(INSTALL_DATA) $(srcdir)/service/realmd-$(DISTRO).conf $(DESTDIR)$(privatedir)/realmd-distro.conf
uninstall-service:
rm -f $(DESTDIR)$(privatedir)/realmd-distro.conf
--
2.32.0
|