From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E6C2658973 for ; Fri, 22 Jan 2016 19:42:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AC9221C007; Fri, 22 Jan 2016 19:42:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D91CF21C007 for ; Fri, 22 Jan 2016 19:42:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4C27340A22 for ; Fri, 22 Jan 2016 19:42:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7888E105C for ; Fri, 22 Jan 2016 19:42:16 +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: <1453491598.014afaaab8d4343d2da0869392c1a262023b8712.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: 014afaaab8d4343d2da0869392c1a262023b8712 X-VCS-Branch: master Date: Fri, 22 Jan 2016 19:42:16 +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: 71cd41cb-b6b5-4493-80be-a42d3a64dfdb X-Archives-Hash: cf204b166b69f69183d2f01f68a5196e commit: 014afaaab8d4343d2da0869392c1a262023b8712 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 19:39:58 2016 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 19:39:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=014afaaa Add --enable-apache2 flag to the configure script. The latest eselect-php ebuild allows users to avoid 70_mod_php.conf by setting USE="-apache2". Now that the conf file is part of eselect-php, we replicate that ability with --enable-apache2=no, or in fact by default. To install the apache conf file, one passes --enable-apache2 to the configure script. Makefile.am | 7 +++++-- configure.ac | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1d1132e..f7ffabe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,11 @@ eselectdir = $(datadir)/eselect/modules nodist_eselect_DATA = $(srcdir)/src/php.eselect -apacheconfdir = $(sysconfdir)/apache2/modules.d -nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf +if APACHE2 + # Without these set, we won't try to install the conf file. + apacheconfdir = $(sysconfdir)/apache2/modules.d + nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf +endif # The next few rules allow us to replace bindir, libdir, and # localstatedir within our script and conf file. The example is taken diff --git a/configure.ac b/configure.ac index c118e0e..f977807 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,20 @@ AC_PROG_SED AC_PATH_PROG(SORT,sort) AC_PATH_PROG(UNIQ,uniq) + +# --enable-apache2 flag, disabled by default, that decides whether or +# not we install the apache2 module configuration file. +AC_ARG_ENABLE( + [apache2], + [ --enable-apache2 install the apache2 conf file [[default=no]]], + [case "${enableval}" in + yes) apache2=true ;; + no) apache2=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-apache2]) ;; + esac],[apache2=false]) + AM_CONDITIONAL([APACHE2], [test x$apache2 = xtrue]) + + # List of output files. AC_CONFIG_FILES([Makefile src/php.eselect.in])