From efec71da33194151baa4827f0ba2deec7179e830 Mon Sep 17 00:00:00 2001
From: godog <godog@autistici.org>
Date: Sat, 18 May 2019 16:24:42 +0200
Subject: [PATCH] Move to versionless php
---
configure | 2 +-
configure.ac | 4 ++--
debian/control | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 06b8373..c947f43 100755
--- a/configure
+++ b/configure
@@ -1690,7 +1690,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "${with_php+set}" = set; then :
withval=$with_php; php_bin="$withval"
else
- for ac_prog in php5-cli php5 php
+ for ac_prog in php php-cli
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
diff --git a/configure.ac b/configure.ac
index 2449577..f640217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_ARG_WITH(php,
AC_HELP_STRING([[--with-php=BINARY]],
[Path to the PHP interpreter]),
[php_bin="$withval"],
- [AC_PATH_PROGS(php_bin, [php5-cli php5 php], [no], [])]
+ [AC_PATH_PROGS(php_bin, [php php-cli], [no], [])]
)
if test "$php_bin" = "no" ; then
AC_MSG_ERROR(No PHP interpreter could be found)
@@ -43,7 +43,7 @@ inst_prefix="$prefix"
if test "$prefix" = "NONE" ; then
inst_prefix="$ac_default_prefix"
fi
-
+
NOBLOGS_LIB_DIR="$inst_prefix/lib/noblogs-cli"
AC_SUBST(NOBLOGS_LIB_DIR)
NOBLOGS_BIN_DIR="$inst_prefix/bin"
diff --git a/debian/control b/debian/control
index 17d5725..8c50a9d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.5
Package: noblogs-cli
Architecture: all
-Depends: php5-cli, ${shlibs:Depends}, ${misc:Depends}
+Depends: php-cli, ${shlibs:Depends}, ${misc:Depends}
Description: Command-line tool to manage noblogs.
CLI tool to perform various maintenance tasks on a noblogs installation.
--
GitLab