summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-12-18 16:45:48 +0100
committerThomas Bruederli <bruederli@kolabsys.com>2014-12-18 16:45:48 +0100
commit4081940908d67055ab9a88e6e0f49d9d560f256e (patch)
tree1b1aa08b467ed182b388522a8eb13500e6b5251a
parentb9014db990cf943862e0f5b3f3351649f673a848 (diff)
Add hint about the optional LDAP modules listed in "suggest" (#1490183)
-rw-r--r--INSTALL3
-rw-r--r--composer.json-dist2
2 files changed, 4 insertions, 1 deletions
diff --git a/INSTALL b/INSTALL
index 817d98c1e..67c0c05c2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,6 +49,9 @@ INSTALLATION
2. Install dependencies using composer:
- get composer from https://getcomposer.org/download/
- rename the composer.json-dist file into composer.json
+ - if you want to use LDAP address books, enable the LDAP libraries in your
+ composer.json file by moving the items from "suggest" to the "require"
+ section (remove the explanation texts after the version!).
- run `php composer.phar install --no-dev`
3. Make sure that the following directories (and the files within)
are writable by the webserver
diff --git a/composer.json-dist b/composer.json-dist
index 144027771..2f522d494 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -44,7 +44,7 @@
"phpunit/phpunit": "*"
},
"suggest": {
- "pear-pear.php.net/net_ldap2": "Version >=2.0.12 required for connecting to LDAP address books",
+ "pear-pear.php.net/net_ldap2": ">=2.0.12 required for connecting to LDAP address books",
"kolab/Net_LDAP3": "dev-master required for connecting to LDAP address books"
},
"minimum-stability": "dev"