third_party/protobuf/configure.ac - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 6 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

« no previous file with comments | « third_party/protobuf/cmake/tests.cmake ('k') | third_party/protobuf/conformance/ConformanceJava.java » ('j') | no next file with comments »

OLD	NEW
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 # * java/pom.xml

8 # * python/setup.py	8 # * python/setup.py

9 # * src/google/protobuf/stubs/common.h	9 # * src/google/protobuf/stubs/common.h

10 # * src/Makefile.am (Update -version-info for LDFLAGS if needed)	10 # * src/Makefile.am (Update -version-info for LDFLAGS if needed)

11 #	11 #

12 # 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

13 # 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

14 # 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.)

15 AC_INIT([Protocol Buffers],[3.0.0-beta-2],[protobuf@googlegroups.com],[protobuf] )	15 AC_INIT([Protocol Buffers],[3.0.0-beta-3],[protobuf@googlegroups.com],[protobuf] )

16	16

17 AM_MAINTAINER_MODE([enable])	17 AM_MAINTAINER_MODE([enable])

18	18

19 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)	19 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)

20 # 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

21 # 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

22 # passed down in CXXFLAGS manually in src/Makefile.am	22 # passed down in CXXFLAGS manually in src/Makefile.am

23 AC_CONFIG_HEADERS([config.h])	23 AC_CONFIG_HEADERS([config.h])

24 AC_CONFIG_MACRO_DIR([m4])	24 AC_CONFIG_MACRO_DIR([m4])

25	25

(...skipping 147 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
173 esac	173 esac

174 AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])	174 AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])

175	175

176 # 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,

177 # 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

178 # too.	178 # too.

179 export CFLAGS	179 export CFLAGS

180 export CXXFLAGS	180 export CXXFLAGS

181 AC_CONFIG_SUBDIRS([gmock])	181 AC_CONFIG_SUBDIRS([gmock])

182	182

183 AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf -lite.pc])	183 AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])

184 AC_OUTPUT	184 AC_OUTPUT

OLD	NEW