Merge branch 'pull-request/975' into PHP-5.5

* pull-request/975:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly

diff --cc NEWS
index afbc492d7970730eafa450f02fab9570338c72a6,af21bb474f6f274176fe438f8fd1e33dae268652..4879a9e221a3801947be414fd09fb7fa6a24e741
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -13,6 -13,6 +13,8 @@@ PH
    . Fixed bug #68297 (Application Popup provides too few information). (Anatol)
    . Fixed bug #65769 (localeconv() broken in TS builds). (Anatol)
    . Fixed bug #65230 (setting locale randomly broken). (Anatol)
++  . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR / PHP_DATADIR
++    correctly). (Ferenc)
    . Fixed bug #68583 (Crash in timeout thread). (Anatol)
    . Fixed bug #68594 (Use after free vulnerability in unserialize()).
      (CVE-2014-8142) (Stefan Esser)