From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F231139694 for ; Wed, 26 Jul 2017 00:21:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92EBDE0E94; Wed, 26 Jul 2017 00:21:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A956E0E94 for ; Wed, 26 Jul 2017 00:21:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42B8B341772 for ; Wed, 26 Jul 2017 00:21:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55A5874B8 for ; Wed, 26 Jul 2017 00:21:19 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1501028273.0b67931ad054c8d109ea89faa8844b1f5a02e8ec.mjo@gentoo> Subject: [gentoo-commits] proj/eselect-php:master commit in: / X-VCS-Repository: proj/eselect-php X-VCS-Files: Makefile.am configure.ac X-VCS-Directories: / X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 0b67931ad054c8d109ea89faa8844b1f5a02e8ec X-VCS-Branch: master Date: Wed, 26 Jul 2017 00:21:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0cccd3fc-b29b-4a94-8e13-295b1865bc95 X-Archives-Hash: 4291d249f4488c05a186f49923e68e49 commit: 0b67931ad054c8d109ea89faa8844b1f5a02e8ec Author: Michael Orlitzky gentoo org> AuthorDate: Wed Jul 26 00:17:53 2017 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Wed Jul 26 00:17:53 2017 +0000 URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=0b67931a Install the php-fpm init scripts conditional on --enable-fpm. Makefile.am | 13 +++++++++---- configure.ac | 12 ++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 15b0ca8..08359dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,5 @@ eselectdir = $(datadir)/eselect/modules nodist_eselect_DATA = $(srcdir)/src/php.eselect -initdir = $(sysconfdir)/init.d -confdir = $(sysconfdir)/conf.d -nodist_init_SCRIPTS = $(srcdir)/openrc/php-fpm -nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf # Without EXTRA_DIST, these files don't wind up in the tarball. EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in openrc/*.* @@ -14,6 +10,15 @@ if APACHE2 nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf endif +if FPM + # Same as the APACHE2 conditional. + initdir = $(sysconfdir)/init.d + nodist_init_SCRIPTS = $(srcdir)/openrc/php-fpm + + confdir = $(sysconfdir)/conf.d + nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf +endif + # The next few rules allow us to replace bindir, libdir, etc. # within our script and conf file. The example is taken # from the autoconf documentation and can be found in the diff --git a/configure.ac b/configure.ac index 5e6ccfc..02aeaf2 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,18 @@ AC_ARG_ENABLE( esac],[apache2=false]) AM_CONDITIONAL([APACHE2], [test x$apache2 = xtrue]) +# --enable-fpm flag, disabled by default, that decides whether or +# not we install the php-fpm init script and config file. +AC_ARG_ENABLE( + [fpm], + [ --enable-fpm install the php-fpm init script [[default=no]]], + [case "${enableval}" in + yes) fpm=true ;; + no) fpm=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-fpm]) ;; + esac],[fpm=false]) + AM_CONDITIONAL([FPM], [test x$fpm = xtrue]) + piddir=${piddir="@LOCALSTATEDIR@"} AC_ARG_WITH(piddir, AC_HELP_STRING([--with-piddir=DIR], [where php-fpm PID files are placed [LOCALSTATEDIR]]),