commit: 014afaaab8d4343d2da0869392c1a262023b8712
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:39:58 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> 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])
