Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Side by Side Diff: third_party/protobuf/configure.ac

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 ## Process this file with autoconf to produce configure. 1 ## Process this file with autoconf to produce configure.
2 ## In general, the safest way to proceed is to run ./autogen.sh 2 ## In general, the safest way to proceed is to run ./autogen.sh
3 3
4 AC_PREREQ(2.59) 4 AC_PREREQ(2.59)
5 5
6 # Note: If you change the version, you must also update it in: 6 # Note: If you change the version, you must also update it in:
7 # * Protobuf.podspec 7 # * java/pom.xml
8 # * csharp/Google.Protobuf.Tools.nuspec 8 # * python/setup.py
9 # * csharp/src/*/AssemblyInfo.cs
10 # * csharp/src/Google.Protobuf/Google.Protobuf.nuspec
11 # * java/*/pom.xml
12 # * python/google/protobuf/__init__.py
13 # * protoc-artifacts/pom.xml
14 # * src/google/protobuf/stubs/common.h 9 # * src/google/protobuf/stubs/common.h
15 # * src/Makefile.am (Update -version-info for LDFLAGS if needed) 10 # * src/Makefile.am (Update -version-info for LDFLAGS if needed)
16 # 11 #
17 # In the SVN trunk, the version should always be the next anticipated release 12 # In the SVN trunk, the version should always be the next anticipated release
18 # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed 13 # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
19 # the size of one file name in the dist tarfile over the 99-char limit.) 14 # the size of one file name in the dist tarfile over the 99-char limit.)
20 AC_INIT([Protocol Buffers],[3.1.0],[protobuf@googlegroups.com],[protobuf]) 15 AC_INIT([Protocol Buffers],[3.0.0-beta-3],[protobuf@googlegroups.com],[protobuf] )
21 16
22 AM_MAINTAINER_MODE([enable]) 17 AM_MAINTAINER_MODE([enable])
23 18
24 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) 19 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
25 # The config file is generated but not used by the source code, since we only 20 # The config file is generated but not used by the source code, since we only
26 # need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are 21 # need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are
27 # passed down in CXXFLAGS manually in src/Makefile.am 22 # passed down in CXXFLAGS manually in src/Makefile.am
28 AC_CONFIG_HEADERS([config.h]) 23 AC_CONFIG_HEADERS([config.h])
29 AC_CONFIG_MACRO_DIR([m4]) 24 AC_CONFIG_MACRO_DIR([m4])
30 25
31 AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., ma ke dist)]) 26 AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., ma ke dist)])
32 case "$DIST_LANG" in 27 case "$DIST_LANG" in
33 "") DIST_LANG=all ;; 28 "") DIST_LANG=all ;;
34 all | cpp | csharp | java | python | javanano | objectivec | ruby | js | php) ;; 29 all | cpp | csharp | java | python | javanano | objectivec | ruby | js) ;;
35 *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;; 30 *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;;
36 esac 31 esac
37 AC_SUBST(DIST_LANG) 32 AC_SUBST(DIST_LANG)
38 33
39 # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily 34 # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily
40 # the best choice for libprotobuf. 35 # the best choice for libprotobuf.
41 AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"], 36 AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
42 [CFLAGS=""]) 37 [CFLAGS=""])
43 AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], 38 AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
44 [CXXFLAGS=""]) 39 [CXXFLAGS=""])
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 166
172 # Enable ObjC support for conformance directory on OS X. 167 # Enable ObjC support for conformance directory on OS X.
173 OBJC_CONFORMANCE_TEST=0 168 OBJC_CONFORMANCE_TEST=0
174 case "$target_os" in 169 case "$target_os" in
175 darwin*) 170 darwin*)
176 OBJC_CONFORMANCE_TEST=1 171 OBJC_CONFORMANCE_TEST=1
177 ;; 172 ;;
178 esac 173 esac
179 AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) 174 AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
180 175
181 AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
182
183 # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, 176 # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
184 # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock 177 # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
185 # too. 178 # too.
186 export CFLAGS 179 export CFLAGS
187 export CXXFLAGS 180 export CXXFLAGS
188 AC_CONFIG_SUBDIRS([gmock]) 181 AC_CONFIG_SUBDIRS([gmock])
189 182
190 AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) 183 AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
191 AC_OUTPUT 184 AC_OUTPUT
OLDNEW
« no previous file with comments | « third_party/protobuf/composer.json ('k') | third_party/protobuf/conformance/ConformanceJava.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698