Fix public issue #6: Add a --with-gflags for disabling gflags autodetection

and using a manually given setting (use/don't use) instead.

R=csilvers
DELTA=16  (13 added, 0 deleted, 3 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=991


git-svn-id: https://snappy.googlecode.com/svn/trunk@9 03e5f5b5-db94-4691-08a0-1a8bf15f6143
This commit is contained in:
snappy.mirrorbot@gmail.com
2011-03-23 11:13:13 +00:00
parent 60add43d99
commit 39d27bea23
6 changed files with 255 additions and 172 deletions

View File

@@ -884,6 +884,7 @@ enable_dependency_tracking
with_gnu_ld
enable_libtool_lock
enable_gtest
with_gflags
'
ac_precious_vars='build_alias
host_alias
@@ -1542,6 +1543,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects @<:@default=use
both@:>@
--with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@
--with-gflags use Google Flags package to enhance the unit test
@<:@default=check@:>@
Some influential environment variables:
CC C compiler command
@@ -14824,6 +14827,17 @@ fi
@%:@ Check whether --with-gflags was given.
if test "${with_gflags+set}" = set; then :
withval=$with_gflags;
else
with_gflags=check
fi
if test "x$with_gflags" != "xno"; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -14999,11 +15013,19 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
true # Ignore; we can live without it.
if test "x$with_gflags" != "xcheck"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "--with-gflags was given, but test for gflags failed
See \`config.log' for more details." "$LINENO" 5; }
fi
elif test $pkg_failed = untried; then
true # Ignore; we can live without it.
if test "x$with_gflags" != "xcheck"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "--with-gflags was given, but test for gflags failed
See \`config.log' for more details." "$LINENO" 5; }
fi
else
gflags_CFLAGS=$pkg_cv_gflags_CFLAGS
gflags_LIBS=$pkg_cv_gflags_LIBS
@@ -15012,6 +15034,7 @@ $as_echo "yes" >&6; }
$as_echo "@%:@define HAVE_GFLAGS 1" >>confdefs.h
fi
fi
# See if we have __builtin_expect.