aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure232
1 files changed, 170 insertions, 62 deletions
diff --git a/configure b/configure
index 3023faa..5b395ad 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.2.0a.
+# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.3.0.
#
# Report bugs to <protobuf@googlegroups.com>.
#
@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Protocol Buffers'
PACKAGE_TARNAME='protobuf'
-PACKAGE_VERSION='2.2.0a'
-PACKAGE_STRING='Protocol Buffers 2.2.0a'
+PACKAGE_VERSION='2.3.0'
+PACKAGE_STRING='Protocol Buffers 2.3.0'
PACKAGE_BUGREPORT='protobuf@googlegroups.com'
ac_unique_file="src/google/protobuf/message.cc"
@@ -1408,7 +1408,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Protocol Buffers 2.2.0a to adapt to many kinds of systems.
+\`configure' configures Protocol Buffers 2.3.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1479,7 +1479,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Protocol Buffers 2.2.0a:";;
+ short | recursive ) echo "Configuration of Protocol Buffers 2.3.0:";;
esac
cat <<\_ACEOF
@@ -1583,7 +1583,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Protocol Buffers configure 2.2.0a
+Protocol Buffers configure 2.3.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1597,7 +1597,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Protocol Buffers $as_me 2.2.0a, which was
+It was created by Protocol Buffers $as_me 2.3.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2432,7 +2432,7 @@ fi
# Define the identity of the package.
PACKAGE='protobuf'
- VERSION='2.2.0a'
+ VERSION='2.3.0'
cat >>confdefs.h <<_ACEOF
@@ -5191,7 +5191,7 @@ fi
if test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
- CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -compat=5 -library=stlport4 -template=no%extdef ${CXXFLAGS}"
+ CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -compat=5 -library=stlport4 -library=Crun -template=no%extdef ${CXXFLAGS}"
fi
@@ -5256,13 +5256,6 @@ fi
if test "x$ac_enable_64bit" = "xyes"; then
- if test "x${ac_cv_env_LDFLAGS_set}" = "x"; then
-
- LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
-
-fi
-
-
if test "x$libdir" = "x\${exec_prefix}/lib"; then
libdir="${libdir}/${isainfo_k}"
@@ -5270,7 +5263,7 @@ fi
fi
- if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
+ if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
CXXFLAGS="${CXXFLAGS} -m64"
ac_cv_env_CXXFLAGS_set=set
@@ -5279,6 +5272,15 @@ fi
fi
+ if test "x${ac_cv_env_CFLAGS_set}" = "x"; then
+
+ CFLAGS="${CFLAGS} -m64"
+ ac_cv_env_CFLAGS_set=set
+ ac_cv_env_CFLAGS_value='-m64'
+
+fi
+
+
if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ; then
CXXFLAGS="-xmemalign=8s ${CXXFLAGS}"
@@ -5814,13 +5816,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5817: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5819: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5820: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5822: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5823: output\"" >&5)
+ (eval echo "\"\$as_me:5825: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6931,7 +6933,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6934 "configure"' > conftest.$ac_ext
+ echo '#line 6936 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9012,11 +9014,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9015: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9017: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9019: \$? = $ac_status" >&5
+ echo "$as_me:9021: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9336,11 +9338,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9339: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9343: \$? = $ac_status" >&5
+ echo "$as_me:9345: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9441,11 +9443,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9444: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9446: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9448: \$? = $ac_status" >&5
+ echo "$as_me:9450: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9496,11 +9498,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9501: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9503: \$? = $ac_status" >&5
+ echo "$as_me:9505: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12244,7 +12246,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12247 "configure"
+#line 12249 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12344,7 +12346,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12347 "configure"
+#line 12349 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14347,11 +14349,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14354: \$? = $ac_status" >&5
+ echo "$as_me:14356: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14446,11 +14448,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14449: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14451: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14453: \$? = $ac_status" >&5
+ echo "$as_me:14455: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14498,11 +14500,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14501: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14503: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14505: \$? = $ac_status" >&5
+ echo "$as_me:14507: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16238,9 +16240,57 @@ fi
done
+# Check for zlib.
HAVE_ZLIB=0
if test "$with_zlib" != no; then
- { echo "$as_me:$LINENO: checking for library containing zlibVersion" >&5
+
+ { echo "$as_me:$LINENO: checking zlib version" >&5
+echo $ECHO_N "checking zlib version... $ECHO_C" >&6; }
+
+ # First check the zlib header version.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #include <zlib.h>
+ #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1204)
+ # error zlib version too old
+ #endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
+ { echo "$as_me:$LINENO: result: ok (1.2.0.4 or later)" >&5
+echo "${ECHO_T}ok (1.2.0.4 or later)" >&6; }
+
+ # Also need to add -lz to the linker flags and make sure this succeeds.
+ { echo "$as_me:$LINENO: checking for library containing zlibVersion" >&5
echo $ECHO_N "checking for library containing zlibVersion... $ECHO_C" >&6; }
if test "${ac_cv_search_zlibVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16321,21 +16371,54 @@ ac_res=$ac_cv_search_zlibVersion
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZLIB 1
_ACEOF
- HAVE_ZLIB=1
+ HAVE_ZLIB=1
+
else
- if test "$with_zlib" != check; then
- { { echo "$as_me:$LINENO: error: --with-zlib was given, but test for zlib failed
+
+ if test "$with_zlib" != check; then
+
+ { { echo "$as_me:$LINENO: error: --with-zlib was given, but no working zlib library was found
See \`config.log' for more details." >&5
-echo "$as_me: error: --with-zlib was given, but test for zlib failed
+echo "$as_me: error: --with-zlib was given, but no working zlib library was found
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
- fi
+
+fi
+
+
+fi
+
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ if test "$with_zlib" = check; then
+
+ { echo "$as_me:$LINENO: result: headers missing or too old (requires 1.2.0.4)" >&5
+echo "${ECHO_T}headers missing or too old (requires 1.2.0.4)" >&6; }
+
+else
+
+ { { echo "$as_me:$LINENO: error: --with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)
+See \`config.log' for more details." >&5
+echo "$as_me: error: --with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
fi
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
fi
if test $HAVE_ZLIB = 1; then
@@ -17102,11 +17185,20 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_cv_cxx_hash_map=""
- for location in ext/hash_map hash_map; do
- for namespace in __gnu_cxx "" std stdext; do
- if test -z "$ac_cv_cxx_hash_map"; then
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cv_cxx_hash_map_header=""
+ ac_cv_cxx_hash_map_class=""
+ for location in tr1/unordered_map ext/hash_map hash_map; do
+ for namespace in std::tr1 __gnu_cxx "" std stdext; do
+ for name in unordered_map hash_map; do
+
+ if test -z "$ac_cv_cxx_hash_map_header"; then
+
+ # On OSX 1.5 / GCC 4.0.1 (the standard compiler on that platform),
+ # calling find() on a const unordered_map does not compile. So, we
+ # include a call to find() in our test to detect this broken
+ # implementation and avoid using it. Note that ext/hash_map works
+ # fine on this platform, so we'll end up using that.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17116,7 +17208,8 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-${namespace}::hash_map<int, int> t
+const ${namespace}::$name<int, int> t;
+ t.find(1);
;
return 0;
}
@@ -17138,8 +17231,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_cxx_hash_map="<$location>";
- ac_cv_cxx_hash_namespace="$namespace";
+ ac_cv_cxx_hash_map_header="<$location>";
+ ac_cv_cxx_hash_namespace="$namespace";
+ ac_cv_cxx_hash_map_class="$name";
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17148,11 +17242,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+ fi
+ done
done
done
- ac_cv_cxx_hash_set=`echo "$ac_cv_cxx_hash_map" | sed s/map/set/`;
- if test -n "$ac_cv_cxx_hash_map"; then
+ ac_cv_cxx_hash_set_header=`echo "$ac_cv_cxx_hash_map_header" | sed s/map/set/`;
+ ac_cv_cxx_hash_set_class=`echo "$ac_cv_cxx_hash_map_class" | sed s/map/set/`;
+ if test -n "$ac_cv_cxx_hash_map_header"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_HASH_MAP 1
@@ -17165,12 +17261,22 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define HASH_MAP_H $ac_cv_cxx_hash_map
+#define HASH_MAP_H $ac_cv_cxx_hash_map_header
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define HASH_SET_H $ac_cv_cxx_hash_set_header
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define HASH_MAP_CLASS $ac_cv_cxx_hash_map_class
_ACEOF
cat >>confdefs.h <<_ACEOF
-#define HASH_SET_H $ac_cv_cxx_hash_set
+#define HASH_SET_CLASS $ac_cv_cxx_hash_set_class
_ACEOF
@@ -17178,8 +17284,8 @@ cat >>confdefs.h <<_ACEOF
#define HASH_NAMESPACE $ac_cv_cxx_hash_namespace
_ACEOF
- { echo "$as_me:$LINENO: result: $ac_cv_cxx_hash_map" >&5
-echo "${ECHO_T}$ac_cv_cxx_hash_map" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_cxx_hash_map_header" >&5
+echo "${ECHO_T}$ac_cv_cxx_hash_map_header" >&6; }
else
{ echo "$as_me:$LINENO: result: " >&5
echo "${ECHO_T}" >&6; }
@@ -17188,8 +17294,10 @@ echo "$as_me: WARNING: could not find an STL hash_map" >&2;}
fi
-# HACK: Make gtest's configure script pick up our copy of CXXFLAGS, since the
-# flags added by ACX_CHECK_SUNCC must be used when compiling gtest too.
+# 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.
+export CFLAGS
export CXXFLAGS
subdirs="$subdirs gtest"
@@ -17641,7 +17749,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Protocol Buffers $as_me 2.2.0a, which was
+This file was extended by Protocol Buffers $as_me 2.3.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17694,7 +17802,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Protocol Buffers config.status 2.2.0a
+Protocol Buffers config.status 2.3.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"