Fix building out of root

Author: bjori

config.m4

@@ -4,14 +4,14 @@ PHP_ARG_ENABLE(phongo, whether to enable phongo support,
 
 
 AC_DEFUN([MONGOC_DEFINE_RESET],[
-  [echo "" > src/libmongoc/src/mongoc/mongoc-config.h]
+  [echo "" > $srcdir/src/libmongoc/src/mongoc/mongoc-config.h]
 ])
 AC_DEFUN([BSON_DEFINE_RESET],[
-  [echo "" > src/libbson/src/bson/bson-config.h]
+  [echo "" > $srcdir/src/libbson/src/bson/bson-config.h]
 ])
 dnl borrowed from PHP acinclude.m4
 AC_DEFUN([BSON_DEFINE],[
-  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" >> src/libbson/src/bson/bson-config.h]
+  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" >> $srcdir/src/libbson/src/bson/bson-config.h]
 ])
 dnl borrowed from PHP acinclude.m4
 AC_DEFUN([PHP_BSON_BIGENDIAN],
@@ -274,35 +274,22 @@ dnl endif
   fi
 
 dnl libmongoc stuff {{{
-  PHP_ADD_INCLUDE(src/libbson/src/)
-  PHP_ADD_INCLUDE(src/libbson/src/yajl/)
-  PHP_ADD_INCLUDE(src/libbson/src/bson/)
-  PHP_ADD_INCLUDE(src/libmongoc/src/mongoc/)
   CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION"
 
-  PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[/src/libbson/src/yajl], $YAJL_SOURCES,    [$EXTRA_CFLAGS $COVERAGE_CFLAGS], shared_objects_phongo, yes)
-  dnl PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/yajl/])
+  PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[src/libbson/src/yajl], $YAJL_SOURCES,    [$EXTRA_CFLAGS $COVERAGE_CFLAGS], shared_objects_phongo, yes)
+  PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[src/libbson/src/bson], $BSON_SOURCES,    [$EXTRA_CFLAGS $COVERAGE_CFLAGS], shared_objects_phongo, yes)
+  PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[src/libmongoc/src/mongoc], $MONGOC_SOURCES,    [$EXTRA_CFLAGS $COVERAGE_CFLAGS], shared_objects_phongo, yes)
 
-  PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[/src/libbson/src/bson], $BSON_SOURCES,    [$EXTRA_CFLAGS $COVERAGE_CFLAGS], shared_objects_phongo, yes)
-  dnl PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
 
-  m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
-  AX_PTHREAD
-  m4_include(src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4)
-  m4_include(src/libbson/build/autotools/m4/ac_create_stdint_h.m4)
-  AC_CREATE_STDINT_H([src/libbson/src/bson/bson-stdint.h])
-
-  PHP_ADD_SOURCES_X(PHP_EXT_DIR(phongo)[/src/libmongoc/src/mongoc], $MONGOC_SOURCES,    [$EXTRA_CFLAGS $COVERAGE_CFLAGS], shared_objects_phongo, yes)
-  dnl PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
 
   AC_DEFINE(HAVE_MONGOC, 1, [Kinda useless extension without it..])
-  ac_configure_args="--enable-debug --enable-tracing --enable-debug-symbols=full --disable-hardening --enable-examples=no --enable-man-pages=no --enable-sasl=no --enable-tests=no --enable-ssl=no --disable-silent-rules --with-libbson=bundled --quiet CFLAGS='$CFLAGS'"
 
 
   dnl PHP_ADD_LIBRARY_WITH_PATH(bson-1.0, src/libbson/.libs, PHONGO_SHARED_LIBADD)
   dnl PHP_ADD_LIBRARY_WITH_PATH(mongoc-priv, src/libmongoc/.libs, PHONGO_SHARED_LIBADD)
   EXTRA_CFLAGS="$PTHREAD_CFLAGS"
   PHP_SUBST(EXTRA_CFLAGS)
+
   PHONGO_SHARED_LIBADD="$PTHREAD_LIBS -lrt"
   PHP_SUBST(PHONGO_SHARED_LIBADD)
 
@@ -311,8 +298,27 @@ dnl }}}
   PHP_NEW_EXTENSION(phongo,    $PHONGO_ROOT, $ext_shared,, [$EXTRA_CFLAGS $COVERAGE_CFLAGS])
   PHP_ADD_EXTENSION_DEP(phongo, spl)
 
-  PHONGO_SHARED_DEPENDENCIES="phongodep"
-  PHP_SUBST(PHONGO_SHARED_DEPENDENCIES)
+  m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
+  AX_PTHREAD
+  m4_include(src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4)
+  m4_include(src/libbson/build/autotools/m4/ac_create_stdint_h.m4)
+  AC_CREATE_STDINT_H([$srcdir/src/libbson/src/bson/bson-stdint.h])
+
+  PHP_ADD_INCLUDE([$ext_srcdir/src/BSON/])
+  PHP_ADD_INCLUDE([$ext_srcdir/src/MongoDB/])
+  PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/])
+  PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/yajl/])
+  PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/bson/])
+  PHP_ADD_INCLUDE([$ext_srcdir/src/libmongoc/src/mongoc/])
+  PHP_ADD_BUILD_DIR([$ext_builddir/src/BSON/])
+  PHP_ADD_BUILD_DIR([$ext_builddir/src/MongoDB/])
+  PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/])
+  PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/yajl/])
+  PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
+  PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
+
+  dnl PHONGO_SHARED_DEPENDENCIES="phongodep"
+  dnl PHP_SUBST(PHONGO_SHARED_DEPENDENCIES)
 
   MONGOC_DEFINE_RESET
   BSON_DEFINE_RESET