Skip to content

Fixes in config.m4 #56

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes in config.m4 #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffbb26a
Fix comment in config.m4
fmela Dec 16, 2015
f1b76d2
Add check for protobuf headers, and add appropriate directory to incl…
fmela Dec 17, 2015
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
12 changes: 9 additions & 3 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
PHP_ARG_ENABLE(protocolbuffers, Whether to enable the "protocolbuffers" extension,
[ --enable-protocolbuffers Enable "protocolbuffers" extension support])
[ --enable-protocolbuffers[=DIR] Enable "protocolbuffers" extension support])

PHP_ARG_ENABLE(protocolbuffers-debug, for protocolbuffers debug support,
[ --enable-protocolbuffers-debug Enable enable protocolbuffers debug support], no, no)

if test $PHP_PROTOCOLBUFFERS != "no"; then
if test -r "$PHP_PROTOCOLBUFFERS/include/google/protobuf/message.h"; then
PROTOBUF_DIR="$PHP_PROTOCOLBUFFERS"
fi
if test -z "$PROTOBUF_DIR"; then
AC_MSG_ERROR(Protobuf headers not found)
fi

if test "$PHP_PROTOCOLBUFFERS_DEBUG" != "no"; then
CFLAGS="$CFLAGS -Wall -g -ggdb -O0 -DPHP_PROTOCOLBUFFERS_DEBUG=1"
AC_DEFINE(PHP_PROTOCOLBUFFERS_DEBUG, 1, [Enable protocolbuffers debug support])
else
//CFLAGS="$CFLAGS -Wall -g -ggdb -O0 -Wunused-variable -Wpointer-sign -Wimplicit-function-declaration -Winline -Wunused-macros -Wredundant-decls -Wstrict-aliasing=2 -Wswitch-enum -Wdeclaration-after-statement"
fi

PHP_PROTOBUF_SRCS="protocolbuffers.c descriptor.c descriptor_builder.c field_descriptor.c message.c message_options.c enum.c enum_descriptor.c enum_value_descriptor.c enum_descriptor_builder.c php_message_options.c unknown_field.c unknown_field_set.c helper.c extension_registry.c core.c serializer.c json_serializer.c"

PHP_ADD_INCLUDE($PROTOBUF_DIR/include)
PHP_SUBST(PROTOCOLBUFFERS_SHARED_LIBADD)
PHP_NEW_EXTENSION(protocolbuffers, $PHP_PROTOBUF_SRCS, $ext_shared)
PHP_ADD_EXTENSION_DEP(protocolbuffers, spl, true)
Expand Down