diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index c07067c..63322b4 100644 --- a/configure.ac +++ b/configure.ac @@ -12,9 +12,8 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[2.6.1],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.3.0],[protobuf@googlegroups.com],[protobuf]) -AM_MAINTAINER_MODE([enable]) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) AC_CONFIG_HEADERS([config.h]) @@ -29,7 +28,7 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([subdir-objects]) +AM_INIT_AUTOMAKE AC_ARG_WITH([zlib], [AS_HELP_STRING([--with-zlib], @@ -90,12 +89,12 @@ AS_IF([test "$with_zlib" != no], [ # First check the zlib header version. AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ + AC_LANG_PROGRAM([[ #include <zlib.h> #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1204) # error zlib version too old #endif - ]], [])], [ + ]], []), [ AC_MSG_RESULT([ok (1.2.0.4 or later)]) # Also need to add -lz to the linker flags and make sure this succeeds. @@ -119,7 +118,7 @@ AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1]) AS_IF([test "$with_protoc" != "no"], [ PROTOC=$with_protoc - AS_IF([test "$with_protoc" = "yes"], [ + AS_IF([test "$with_protoc" == "yes"], [ # No argument given. Use system protoc. PROTOC=protoc ]) @@ -139,15 +138,6 @@ AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"]) ACX_PTHREAD AC_CXX_STL_HASH -case "$target_os" in - mingw* | cygwin* | win*) - ;; - *) - # Need to link against rt on Solaris - AC_SEARCH_LIBS([sched_yield], [rt], [], [AC_MSG_FAILURE([sched_yield was not found on your system])]) - ;; -esac - # HACK: Make gtest's configure script pick up our copy of CFLAGS and CXXFLAGS, # since the flags added by ACX_CHECK_SUNCC must be used when compiling gtest # too. |