t/test-full.proto: revert 'option allow_alias = true;'

this option is only supported by the upstream protobuf compiler starting
with version 2.5.0. this version is not yet widely available in the
debian/ubuntu repositories, and we would like to avoid breaking the
build on those platforms with the distribution version of protobuf
installed, so revert the following commits:

 - 5ee9c03478ea13bba03e7d7edacf723f324200c2
 - 84e41e7329f1f0fc09b41ee96e17b28a792cefcf
This commit is contained in:
Robert Edmonds 2013-11-18 13:00:44 -05:00
parent 2dfe54f2ed
commit 3128296851
3 changed files with 1 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
*~
.*swp
*.la
*.lo

View File

@ -45,7 +45,7 @@ AC_ARG_ENABLE(
AS_IF(
[test "x$enable_protoc" != "xno"],
[
PKG_CHECK_MODULES([protobuf], [protobuf >= 2.5.0])
PKG_CHECK_MODULES([protobuf], [protobuf])
AC_LANG_PUSH([C++])
]
)

View File

@ -33,7 +33,6 @@ enum TestEnumDupValues {
VALUE_F = 1000;
VALUE_AA = 1000;
VALUE_BB = 1001;
option allow_alias = true;
}
message TestFieldNo15 { // should use 1 byte header