Regenerating build [ci skip]

Author: andresgutierrez

Diff for: build/32bits/Makefile.frag

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 PHP_ARG_ENABLE(phalcon, whether to enable phalcon, [ --enable-phalcon   Enable Phalcon])
 
 if test "$PHP_PHALCON" = "yes"; then
@@ -12,25 +11,6 @@ if test "$PHP_PHALCON" = "yes"; then
 	AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon])
 	PHP_NEW_EXTENSION(phalcon, phalcon.zep.c, $ext_shared)
 	PHP_SUBST(PHALCON_SHARED_LIBADD)
-=======
-PHP_ARG_ENABLE(phalcon, whether to enable phalcon framework, [ --enable-phalcon   Enable phalcon framework])
-PHP_ARG_WITH(non-free, wheter to enable non-free css and js minifier, [ --without-non-free Disable non-free minifiers], yes, no)
-
-AC_MSG_CHECKING([Include non-free minifiers])
-if test "$PHP_NON_FREE" = "yes"; then
-	AC_DEFINE([PHALCON_NON_FREE], [1], [Whether non-free minifiers are available])
-	AC_MSG_RESULT([yes, css and js])
-else
-	AC_MSG_RESULT([no])
-fi
-
-if test "$PHP_PHALCON" = "yes"; then
-	AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework])
-	PHP_NEW_EXTENSION(phalcon, phalcon.c, $ext_shared)
-	PHP_ADD_EXTENSION_DEP([phalcon], [spl])
->>>>>>> master
-
-	PHP_C_BIGENDIAN
 
 	old_CPPFLAGS=$CPPFLAGS
 	CPPFLAGS="$CPPFLAGS $INCLUDES"
@@ -52,47 +32,14 @@ if test "$PHP_PHALCON" = "yes"; then
 		[[#include "php_config.h"]]
 	)
 
-	AC_CHECK_HEADERS(
-		[ext/json/php_json.h],
-		[
-			PHP_ADD_EXTENSION_DEP([phalcon], [json])
-			AC_DEFINE([PHALCON_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
-		],
-		,
-		[[#include "main/php.h"]]
-	)
-
-
 	AC_CHECK_DECL(
-		[HAVE_PHP_SESSION],
+		[HAVE_JSON],
 		[
 			AC_CHECK_HEADERS(
-				[ext/session/php_session.h],
+				[ext/json/php_json.h],
 				[
-<<<<<<< HEAD
 					PHP_ADD_EXTENSION_DEP([phalcon], [json])
 					AC_DEFINE([ZEPHIR_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
-=======
-					PHP_ADD_EXTENSION_DEP([phalcon], [session])
-					AC_DEFINE([PHALCON_USE_PHP_SESSION], [1], [Whether PHP session extension is present at compile time])
-				],
-				,
-				[[#include "main/php.h"]]
-			)
-		],
-		,
-		[[#include "php_config.h"]]
-	)
-
-	AC_CHECK_DECL(
-		[HAVE_HASH_EXT],
-		[
-			AC_CHECK_HEADERS(
-				[ext/hash/php_hash.h],
-				[
-					PHP_ADD_EXTENSION_DEP([phalcon], [hash])
-					AC_DEFINE([PHALCON_USE_PHP_HASH], [1], [Whether PHP hash extension is present at compile time])
->>>>>>> master
 				],
 				,
 				[[#include "main/php.h"]]
@@ -104,77 +51,6 @@ if test "$PHP_PHALCON" = "yes"; then
 
 	CPPFLAGS=$old_CPPFLAGS
 
-<<<<<<< HEAD
 	PHP_INSTALL_HEADERS([ext/phalcon], [php_PHALCON.h])
 
-=======
-	PHP_ADD_MAKEFILE_FRAGMENT([Makefile.frag])
-fi
-
-PHP_ARG_ENABLE(coverage,  whether to include code coverage symbols,
-[  --enable-coverage         Enable code coverage symbols, maintainers only!], no, no)
-
-if test "$PHP_COVERAGE" = "yes"; then
-	if test "$GCC" != "yes"; then
-		AC_MSG_ERROR([GCC is required for --enable-coverage])
-	fi
-
-	case `$php_shtool path $CC` in
-		*ccache*[)] gcc_ccache=yes;;
-		*[)] gcc_ccache=no;;
-	esac
-
-	if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-		AC_MSG_ERROR([ccache must be disabled when --enable-coverage option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
-	fi
-
-	lcov_version_list="1.5 1.6 1.7 1.9 1.10"
-
-	AC_CHECK_PROG(LCOV, lcov, lcov)
-	AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-	PHP_SUBST(LCOV)
-	PHP_SUBST(GENHTML)
-
-	if test "$LCOV"; then
-		AC_CACHE_CHECK([for lcov version], php_cv_lcov_version, [
-			php_cv_lcov_version=invalid
-			lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` #'
-			for lcov_check_version in $lcov_version_list; do
-				if test "$lcov_version" = "$lcov_check_version"; then
-					php_cv_lcov_version="$lcov_check_version (ok)"
-				fi
-			done
-		])
-	else
-		lcov_msg="To enable code coverage reporting you must have one of the following LCOV versions installed: $lcov_version_list"
-		AC_MSG_ERROR([$lcov_msg])
-	fi
-
-	case $php_cv_lcov_version in
-		""|invalid[)]
-			lcov_msg="You must have one of the following versions of LCOV: $lcov_version_list (found: $lcov_version)."
-			AC_MSG_ERROR([$lcov_msg])
-			LCOV="exit 0;"
-		;;
-	esac
-
-	if test -z "$GENHTML"; then
-		AC_MSG_ERROR([Could not find genhtml from the LCOV package])
-	fi
-
-	changequote({,})
-	CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
-	CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
-	changequote([,])
-
-	CFLAGS="$CFLAGS -O0 --coverage"
-	CXXFLAGS="$CXXFLAGS -O0 --coverage"
-	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -precious-files-regex \.gcno\\\$$"
-
-	PHP_ADD_MAKEFILE_FRAGMENT([Makefile.frag.coverage])
-fi
-
-if test "$GCC" = "yes"; then
-	PHP_ADD_MAKEFILE_FRAGMENT([Makefile.frag.deps])
->>>>>>> master
 fi