diff --git a/README.md b/README.md index 10f3624..b8ccf5e 100644 --- a/README.md +++ b/README.md @@ -182,8 +182,9 @@ The version of PHP to install from source (a git branch, tag, or commit hash). php_source_clone_depth: 1 php_source_install_path: "/opt/php" php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h" + php_source_mysql_config: "/usr/bin/mysql_config" -Location where source will be cloned and installed, and the location of the GMP header file (which can be platform/distribution specific). +Location where source will be cloned and installed, and the location of the GMP header file (which can be platform/distribution specific), and `mysql_config` binary (this may be `mariadb_config` in newer operating system versions). php_source_make_command: "make" diff --git a/defaults/main.yml b/defaults/main.yml index 3e2c686..e716d59 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -98,6 +98,7 @@ php_source_clone_dir: "~/php-src" php_source_clone_depth: 1 php_source_install_path: "/opt/php" php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h" +php_source_mysql_config: "/usr/bin/mysql_config" # For faster compile time: "make --jobs=X" where X is # of cores present. php_source_make_command: "make" php_source_configure_command: > @@ -136,4 +137,4 @@ php_source_configure_command: > --with-zlib=/usr --with-bz2=/usr --with-recode=/usr - --with-mysqli=/usr/bin/mysql_config + --with-mysqli={{ php_source_mysql_config }} diff --git a/tasks/install-from-source.yml b/tasks/install-from-source.yml index cde8e5c..73a08c3 100644 --- a/tasks/install-from-source.yml +++ b/tasks/install-from-source.yml @@ -43,8 +43,8 @@ - bison - pkg-config - re2c - - sqlite-dev - - libonig2 + - libsqlite3-dev + - libonig-dev - libxml2-dev - libcurl4-openssl-dev - libbz2-dev @@ -54,7 +54,7 @@ - libfreetype6-dev - libgmp3-dev - libmcrypt-dev - - libmysqlclient-dev + - libmariadbclient-dev - libpspell-dev - librecode-dev - libssl-dev