[gentoo-commits] gentoo-x86 commit in eclass: systemd.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      11/06/16 16:39:18

  Modified:             systemd.eclass
  Log:
  Support passing an optional configure option name to systemd_with_unitdir.

Revision  Changes    Path
1.4                  eclass/systemd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/systemd.eclass?r1=1.3&r2=1.4

Index: systemd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- systemd.eclass	11 Jun 2011 06:06:43 -0000	1.3
+++ systemd.eclass	16 Jun 2011 16:39:18 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.3 2011/06/11 06:06:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.4 2011/06/16 16:39:18 mgorny Exp $
 
 # @ECLASS: systemd.eclass
 # @MAINTAINER:
@@ -88,15 +88,22 @@
 }
 
 # @FUNCTION: systemd_with_unitdir
+# @USAGE: [configure option]
 # @DESCRIPTION:
 # Output '--with-systemdsystemunitdir' as expected by systemd-aware configure
 # scripts. This function always succeeds. Its output may be quoted in order
 # to preserve whitespace in paths. systemd_to_myeconfargs() is preferred over
 # this function.
+#
+# If upstream does use invalid configure option to handle installing systemd
+# units (e.g. `--with-systemdunitdir'), you can pass the 'suffix' as an optional
+# argument to this function (`$(systemd_with_unitdir systemdunitdir)'). Please
+# remember to report a bug upstream as well.
 systemd_with_unitdir() {
 	debug-print-function ${FUNCNAME} "${@}"
+	local optname=${1:-systemdsystemunitdir}
 
-	echo -n --with-systemdsystemunitdir="$(systemd_get_unitdir)"
+	echo -n --with-${optname}="$(systemd_get_unitdir)"
 }
 
 # @FUNCTION: systemd_to_myeconfargs