diff --git a/configure b/configure index 06b83730bbb273c1ab4b75dc366251b009375f07..c947f4390165ac7dd419ef9271fead7a6bf2ac19 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 24495779a0ffcd6f4335ccee0e0acb9d3cabc6e4..f640217096dada3a8b3357c854e11b56549faba2 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 17d57251f37756cbe56aba23f23a9ab2ef2f8fe7..8c50a9d317d4e5702f2a8a68066f13ec6856b2f3 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.