You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 07:32:26 UTC
svn commit: r1131792 [3/13] - in /incubator/mesos/trunk: ./ src/
src/third_party/gtest-1.4.0-patched/
src/third_party/gtest-1.4.0-patched/build-aux/
src/third_party/gtest-1.4.0-patched/codegear/
src/third_party/gtest-1.4.0-patched/include/gtest/ src/th...
Copied: incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure (from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure?p2=incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure&p1=incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure&r1=1131791&r2=1131792&rev=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure (original)
+++ incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure Sun Jun 5 05:32:17 2011
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Google C++ Testing Framework 1.4.0.
+# Generated by GNU Autoconf 2.61 for Google C++ Testing Framework 1.5.0.
#
# Report bugs to <go...@googlegroups.com>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Google C++ Testing Framework'
PACKAGE_TARNAME='gtest'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='Google C++ Testing Framework 1.4.0'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='Google C++ Testing Framework 1.5.0'
PACKAGE_BUGREPORT='googletestframework@googlegroups.com'
ac_unique_file="./COPYING"
@@ -880,6 +880,8 @@ acx_pthread_config
PTHREAD_CC
PTHREAD_LIBS
PTHREAD_CFLAGS
+HAVE_PTHREADS_TRUE
+HAVE_PTHREADS_FALSE
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1400,7 +1402,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 Google C++ Testing Framework 1.4.0 to adapt to many kinds of systems.
+\`configure' configures Google C++ Testing Framework 1.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1470,7 +1472,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Google C++ Testing Framework 1.4.0:";;
+ short | recursive ) echo "Configuration of Google C++ Testing Framework 1.5.0:";;
esac
cat <<\_ACEOF
@@ -1492,6 +1494,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
+ --with-pthreads use pthreads (default is yes)
Some influential environment variables:
CC C compiler command
@@ -1572,7 +1575,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Google C++ Testing Framework configure 1.4.0
+Google C++ Testing Framework configure 1.5.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1586,7 +1589,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 Google C++ Testing Framework $as_me 1.4.0, which was
+It was created by Google C++ Testing Framework $as_me 1.5.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2290,7 +2293,7 @@ fi
# Define the identity of the package.
PACKAGE='gtest'
- VERSION='1.4.0'
+ VERSION='1.5.0'
cat >>confdefs.h <<_ACEOF
@@ -4814,7 +4817,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4817 "configure"' > conftest.$ac_ext
+ echo '#line 4820 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7398,11 +7401,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:7401: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7405: \$? = $ac_status" >&5
+ echo "$as_me:7408: \$? = $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.
@@ -7688,11 +7691,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:7691: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7694: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7695: \$? = $ac_status" >&5
+ echo "$as_me:7698: \$? = $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.
@@ -7792,11 +7795,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:7795: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7798: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7799: \$? = $ac_status" >&5
+ echo "$as_me:7802: \$? = $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
@@ -10169,7 +10172,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10172 "configure"
+#line 10175 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10269,7 +10272,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10272 "configure"
+#line 10275 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12670,11 +12673,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:12673: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12676: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12677: \$? = $ac_status" >&5
+ echo "$as_me:12680: \$? = $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.
@@ -12774,11 +12777,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:12777: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12780: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12781: \$? = $ac_status" >&5
+ echo "$as_me:12784: \$? = $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
@@ -14372,11 +14375,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:14375: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14378: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14379: \$? = $ac_status" >&5
+ echo "$as_me:14382: \$? = $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.
@@ -14476,11 +14479,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:14479: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14482: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14483: \$? = $ac_status" >&5
+ echo "$as_me:14486: \$? = $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
@@ -16696,11 +16699,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:16699: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16702: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16703: \$? = $ac_status" >&5
+ echo "$as_me:16706: \$? = $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.
@@ -16986,11 +16989,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:16989: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16992: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16993: \$? = $ac_status" >&5
+ echo "$as_me:16996: \$? = $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.
@@ -17090,11 +17093,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:17093: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17097: \$? = $ac_status" >&5
+ echo "$as_me:17100: \$? = $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
@@ -19857,7 +19860,18 @@ else
fi
-# Check for pthreads.
+# Configure pthreads.
+
+# Check whether --with-pthreads was given.
+if test "${with_pthreads+set}" = set; then
+ withval=$with_pthreads; with_pthreads=$withval
+else
+ with_pthreads=check
+fi
+
+
+have_pthreads=no
+if test "x$with_pthreads" != "xno"; then
@@ -20560,6 +20574,13 @@ _ACEOF
:
else
acx_pthread_ok=no
+ if test "x$with_pthreads" != "xcheck"; then
+ { { echo "$as_me:$LINENO: error: --with-pthreads was specified, but unable to be used
+See \`config.log' for more details." >&5
+echo "$as_me: error: --with-pthreads was specified, but unable to be used
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
fi
ac_ext=cpp
@@ -20569,6 +20590,19 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ have_pthreads="$acx_pthread_ok"
+fi
+
+ if test "x$have_pthreads" == "xyes"; then
+ HAVE_PTHREADS_TRUE=
+ HAVE_PTHREADS_FALSE='#'
+else
+ HAVE_PTHREADS_TRUE='#'
+ HAVE_PTHREADS_FALSE=
+fi
+
+
+
# TODO(chandlerc@google.com) Check for the necessary system headers.
@@ -20700,6 +20734,13 @@ echo "$as_me: error: conditional \"HAVE_
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_PTHREADS_TRUE}" && test -z "${HAVE_PTHREADS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PTHREADS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_PTHREADS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21000,7 +21041,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 Google C++ Testing Framework $as_me 1.4.0, which was
+This file was extended by Google C++ Testing Framework $as_me 1.5.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21053,7 +21094,7 @@ Report bugs to <bu...@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Google C++ Testing Framework config.status 1.4.0
+Google C++ Testing Framework config.status 1.5.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21385,11 +21426,13 @@ acx_pthread_config!$acx_pthread_config$a
PTHREAD_CC!$PTHREAD_CC$ac_delim
PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
+HAVE_PTHREADS_TRUE!$HAVE_PTHREADS_TRUE$ac_delim
+HAVE_PTHREADS_FALSE!$HAVE_PTHREADS_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Copied: incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure.ac (from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure.ac)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure.ac?p2=incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure.ac&p1=incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure.ac&r1=1131791&r2=1131792&rev=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure.ac (original)
+++ incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure.ac Sun Jun 5 05:32:17 2011
@@ -5,7 +5,7 @@ m4_include(m4/acx_pthread.m4)
# "[1.0.1]"). It also asumes that there won't be any closing parenthesis
# between "AC_INIT(" and the closing ")" including comments and strings.
AC_INIT([Google C++ Testing Framework],
- [1.4.0],
+ [1.5.0],
[googletestframework@googlegroups.com],
[gtest])
@@ -39,8 +39,24 @@ AS_IF([test "$PYTHON" != ":"],
[AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"])
-# Check for pthreads.
-ACX_PTHREAD
+# Configure pthreads.
+AC_ARG_WITH([pthreads],
+ [AS_HELP_STRING([--with-pthreads],
+ [use pthreads (default is yes)])],
+ [with_pthreads=$withval],
+ [with_pthreads=check])
+
+have_pthreads=no
+AS_IF([test "x$with_pthreads" != "xno"],
+ [ACX_PTHREAD(
+ [],
+ [AS_IF([test "x$with_pthreads" != "xcheck"],
+ [AC_MSG_FAILURE(
+ [--with-pthreads was specified, but unable to be used])])])
+ have_pthreads="$acx_pthread_ok"])
+AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"])
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_LIBS)
# TODO(chandlerc@google.com) Check for the necessary system headers.