Changeset 417002e

Timestamp:

2011-03-18T00:57:14Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c14959d

Parents:

f68fd5f

Message:

systemd stuff (bug #738)

Files:

• Makefile (modified) (3 diffs)
• configure (modified) (4 diffs)

Makefile

@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE) $(OTR_PI)
+all: $(OUTFILE) $(OTR_PI) systemd
         $(MAKE) -C doc
 
@@ -33 +33 @@
         @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
 
-install: install-bin install-doc install-plugins
+install: install-bin install-doc install-plugins install-systemd
         @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
         @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
         @echo
 
-.PHONY:   install   install-bin   install-etc   install-doc install-plugins \
+.PHONY:   install   install-bin   install-etc   install-doc install-plugins install-systemd \
         uninstall uninstall-bin uninstall-etc uninstall-doc \
         all clean distclean tar $(subdirs)
@@ -110 +110 @@
 endif
 
+systemd:
+ifdef SYSTEMDSYSTEMUNITDIR
+        sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
+        sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
+endif
+
+install-systemd:
+ifdef SYSTEMDSYSTEMUNITDIR
+ifeq ($(USER),root)
+        mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        install -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+else
+        @echo Not root, so not installing systemd files.
+endif
+endif
+
 tar:
         fakeroot debian/rules clean || make distclean

configure

@@ -16 +16 @@
 plugindir='$prefix/lib/bitlbee/'
 includedir='$prefix/include/bitlbee/'
+systemdsystemunitdir=''
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
@@ -62 +63 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
+--systemdsystemunitdir=...                              $systemdsystemunitdir
 --pidfile=...                                           $pidfile
 --config=...                                            $config
@@ -487 +489 @@
 fi
 
+if [ -z "$systemdsystemunitdir" ]; then
+        if $PKG_CONFIG --exists systemd; then
+                systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd`
+        fi
+fi
+if [ -n "$systemdsystemunitdir" ]; then
+        if [ "$systemdsystemunitdir" != "no" ]; then
+                echo "SYSTEMDSYSTEMUNITDIR=$systemdsystemunitdir" >> Makefile.settings
+        fi
+fi
+
 if [ "$gcov" = "1" ]; then
         echo "CFLAGS+=--coverage" >> Makefile.settings
@@ -727 +740 @@
 fi
 
+if [ -n "$systemdsystemunitdir" ]; then
+        echo '  systemd enabled.'
+else
+        echo '  systemd disabled.'
+fi
+
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl