Skip to content

Fix bugs introduced by merge conflicts #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from Jul 16, 2013
+2,369 −611
Merged

Fix bugs introduced by merge conflicts #850

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a518aee
Fix merge bugs
sjinks Jul 16, 2013
9fef9ce
Fix merge bugs (2)
sjinks Jul 16, 2013
3829518
Fix merge bugs (3)
sjinks Jul 16, 2013
1915c13
Updated gen-build.php
sjinks Jul 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 80 additions & 3 deletions build/32bits/config.m4
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,84 @@
PHP_ARG_ENABLE(phalcon, whether to enable phalcon framework, [ --enable-phalcon Enable phalcon framework])

if test "$PHP_PHALCON" = "yes"; then
AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework])
PHP_NEW_EXTENSION(phalcon, phalcon.c, $ext_shared)
fi
AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework])
PHP_NEW_EXTENSION(phalcon, phalcon.c, $ext_shared)

PHP_ADD_EXTENSION_DEP([phalcon], [spl])

old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $INCLUDES"

AC_CHECK_HEADERS(
[ext/filter/php_filter.h],
[
PHP_ADD_EXTENSION_DEP([phalcon], [filter])
AC_DEFINE([PHALCON_USE_PHP_FILTER], [1], [Whether PHP filter extension is present at compile time])
],
,
[[#include "main/php.h"]]
)

AC_CHECK_HEADERS(
[ext/igbinary/igbinary.h],
[
PHP_ADD_EXTENSION_DEP([phalcon], [igbinary])
AC_DEFINE([PHALCON_USE_PHP_IGBINARY], [1], [Whether PHP igbinary extension is present at compile time])
],
,
[[#include "main/php.h"]]
)

AC_CHECK_DECL(
[HAVE_BUNDLED_PCRE],
[
AC_CHECK_HEADERS(
[ext/pcre/php_pcre.h],
[
PHP_ADD_EXTENSION_DEP([phalcon], [pcre])
AC_DEFINE([PHALCON_USE_PHP_PCRE], [1], [Whether PHP pcre extension is present at compile time])
],
,
[[#include "main/php.h"]]
)
],
,
[[#include "php_config.h"]]
)

AC_CHECK_DECL(
[HAVE_JSON],
[
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"]]
)
],
,
[[#include "php_config.h"]]
)

AC_CHECK_DECL(
[HAVE_PHP_SESSION],
[
AC_CHECK_HEADERS(
[ext/session/php_session.h],
[
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"]]
)

CPPFLAGS=$old_CPPFLAGS
fi
Loading