aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-09-10 12:27:21 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-09-10 16:09:59 +0200
commit6fe1c2220ad8a6d7d61af487b43adb11a21b79cb (patch)
tree007127cf1098d55673b86a10b1958ed7b4c1e318
parent0da9f2f19cce314b3878ed35859c007e435316c7 (diff)
Install systemd services with autotools
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac18
-rw-r--r--contrib/Makefile.am1
-rw-r--r--contrib/systemd/Makefile.am5
-rw-r--r--debian/osmo-hlr.install1
l---------debian/osmo-hlr.service1
-rwxr-xr-xdebian/rules3
7 files changed, 32 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 8e18167..210e499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = \
src \
include \
sql \
+ contrib \
tests \
$(NULL)
@@ -12,6 +13,9 @@ EXTRA_DIST = \
.version \
$(NULL)
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libosmo-gsup-client.pc
diff --git a/configure.ac b/configure.ac
index 16c8b51..368f1cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,22 @@ AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
AC_MSG_RESULT([$enable_ext_tests])
AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+ [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+ [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
+ with_systemdsystemunitdir=no],
+ [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+ [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
@@ -103,6 +119,8 @@ AC_OUTPUT(
include/Makefile
libosmo-gsup-client.pc
sql/Makefile
+ contrib/Makefile
+ contrib/systemd/Makefile
tests/Makefile
tests/auc/Makefile
tests/auc/gen_ts_55_205_test_sets/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 0000000..520e720
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-hlr.service
+systemdsystemunit_DATA = \
+ osmo-hlr.service
+endif
diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install
index 7991522..5a7c37b 100644
--- a/debian/osmo-hlr.install
+++ b/debian/osmo-hlr.install
@@ -1,3 +1,4 @@
+/lib/systemd/system/osmo-hlr.service
/usr/bin/osmo-hlr
/usr/bin/osmo-hlr-db-tool
/usr/share/doc/osmo-hlr/sql/hlr.sql
diff --git a/debian/osmo-hlr.service b/debian/osmo-hlr.service
deleted file mode 120000
index 184f5aa..0000000
--- a/debian/osmo-hlr.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-hlr.service \ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 1d8d8ab..9e97c6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,6 @@ override_dh_strip:
# Print test results in case of a failure
override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
+
+override_dh_auto_configure:
+ dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system