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

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

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component Created 4 years 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 # * java/pom.xml 7 # * Protobuf.podspec
8 # * python/setup.py 8 # * csharp/Google.Protobuf.Tools.nuspec
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
9 # * src/google/protobuf/stubs/common.h 14 # * src/google/protobuf/stubs/common.h
10 # * src/Makefile.am (Update -version-info for LDFLAGS if needed) 15 # * src/Makefile.am (Update -version-info for LDFLAGS if needed)
11 # 16 #
12 # In the SVN trunk, the version should always be the next anticipated release 17 # In the SVN trunk, the version should always be the next anticipated release
13 # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed 18 # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
14 # the size of one file name in the dist tarfile over the 99-char limit.) 19 # the size of one file name in the dist tarfile over the 99-char limit.)
15 AC_INIT([Protocol Buffers],[3.0.0-beta-3],[protobuf@googlegroups.com],[protobuf] ) 20 AC_INIT([Protocol Buffers],[3.1.0],[protobuf@googlegroups.com],[protobuf])
16 21
17 AM_MAINTAINER_MODE([enable]) 22 AM_MAINTAINER_MODE([enable])
18 23
19 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) 24 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
20 # The config file is generated but not used by the source code, since we only 25 # The config file is generated but not used by the source code, since we only
21 # need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are 26 # need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are
22 # passed down in CXXFLAGS manually in src/Makefile.am 27 # passed down in CXXFLAGS manually in src/Makefile.am
23 AC_CONFIG_HEADERS([config.h]) 28 AC_CONFIG_HEADERS([config.h])
24 AC_CONFIG_MACRO_DIR([m4]) 29 AC_CONFIG_MACRO_DIR([m4])
25 30
26 AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., ma ke dist)]) 31 AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., ma ke dist)])
27 case "$DIST_LANG" in 32 case "$DIST_LANG" in
28 "") DIST_LANG=all ;; 33 "") DIST_LANG=all ;;
29 all | cpp | csharp | java | python | javanano | objectivec | ruby | js) ;; 34 all | cpp | csharp | java | python | javanano | objectivec | ruby | js | php) ;;
30 *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;; 35 *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;;
31 esac 36 esac
32 AC_SUBST(DIST_LANG) 37 AC_SUBST(DIST_LANG)
33 38
34 # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily 39 # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily
35 # the best choice for libprotobuf. 40 # the best choice for libprotobuf.
36 AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"], 41 AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
37 [CFLAGS=""]) 42 [CFLAGS=""])
38 AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], 43 AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
39 [CXXFLAGS=""]) 44 [CXXFLAGS=""])
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 171
167 # Enable ObjC support for conformance directory on OS X. 172 # Enable ObjC support for conformance directory on OS X.
168 OBJC_CONFORMANCE_TEST=0 173 OBJC_CONFORMANCE_TEST=0
169 case "$target_os" in 174 case "$target_os" in
170 darwin*) 175 darwin*)
171 OBJC_CONFORMANCE_TEST=1 176 OBJC_CONFORMANCE_TEST=1
172 ;; 177 ;;
173 esac 178 esac
174 AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) 179 AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
175 180
181 AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
182
176 # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, 183 # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
177 # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock 184 # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
178 # too. 185 # too.
179 export CFLAGS 186 export CFLAGS
180 export CXXFLAGS 187 export CXXFLAGS
181 AC_CONFIG_SUBDIRS([gmock]) 188 AC_CONFIG_SUBDIRS([gmock])
182 189
183 AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) 190 AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
184 AC_OUTPUT 191 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