From 7e47bf1e65086d6bb69bd9e9c79ccb179c5302b4 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 13 Nov 2015 14:27:59 +0800
Subject: Revert "Remove assumption that extensions are in ext/ext-name"

This reverts commit 82b73fd1e3c53228bb31b75a446114b5fd0cd240.

Conflicts:

	build/genif.sh
	build/order_by_dep.awk
---
 configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 0d62c488b1..c3388a4bbe 100644
--- a/configure.in
+++ b/configure.in
@@ -131,9 +131,9 @@ PHP_SUBST(PHP_RELEASE_VERSION)
 PHP_SUBST(PHP_EXTRA_VERSION)
 
 dnl Define where extension directories are located in the configure context
-AC_DEFUN([PHP_EXT_BUILDDIR],[$config_m4_dir])dnl
-AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl
-AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/$config_m4_dir])dnl
+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
 AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
 dnl Setting up the PHP version based on the information above.
-- 
cgit v1.2.1