From 3128296851814e7a9708cde7bc8b491d65884f03 Mon Sep 17 00:00:00 2001
From: Robert Edmonds <edmonds@fsi.io>
Date: Mon, 18 Nov 2013 13:00:44 -0500
Subject: [PATCH] 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
---
 .gitignore        | 1 -
 configure.ac      | 2 +-
 t/test-full.proto | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1369f8..6ba85b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-*~
 .*swp
 *.la
 *.lo
diff --git a/configure.ac b/configure.ac
index fd43350..8286b39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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++])
     ]
 )
diff --git a/t/test-full.proto b/t/test-full.proto
index c0e202b..86384f7 100644
--- a/t/test-full.proto
+++ b/t/test-full.proto
@@ -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