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

@@ -2515,47 +2515,48 @@ m4trace:configure.ac:23: -1- m4_pattern_allow([^HAVE_GTEST_TRUE$])
m4trace:configure.ac:23: -1- m4_pattern_allow([^HAVE_GTEST_FALSE$])
m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([HAVE_GTEST_TRUE])
m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([HAVE_GTEST_FALSE])
m4trace:configure.ac:24: -1- PKG_CHECK_MODULES([gflags], [libgflags], [AC_DEFINE([HAVE_GFLAGS], [1], [Use the gflags package for command-line parsing.])], [true # Ignore; we can live without it.
])
m4trace:configure.ac:24: -1- PKG_PROG_PKG_CONFIG
m4trace:configure.ac:24: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^gflags_CFLAGS$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^gflags_LIBS$])
m4trace:configure.ac:24: -1- PKG_CHECK_EXISTS([libgflags], [pkg_cv_[]gflags_CFLAGS=`$PKG_CONFIG --[]cflags "libgflags" 2>/dev/null`], [pkg_failed=yes])
m4trace:configure.ac:24: -1- PKG_CHECK_EXISTS([libgflags], [pkg_cv_[]gflags_LIBS=`$PKG_CONFIG --[]libs "libgflags" 2>/dev/null`], [pkg_failed=yes])
m4trace:configure.ac:24: -1- _PKG_SHORT_ERRORS_SUPPORTED
m4trace:configure.ac:24: -1- m4_pattern_allow([^HAVE_GFLAGS$])
m4trace:configure.ac:33: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
m4trace:configure.ac:33: -1- PKG_CHECK_MODULES([gflags], [libgflags], [AC_DEFINE([HAVE_GFLAGS], [1], [Use the gflags package for command-line parsing.])], [if test "x$with_gflags" != "xcheck"; then
AC_MSG_FAILURE([--with-gflags was given, but test for gflags failed])
fi])
m4trace:configure.ac:33: -1- PKG_PROG_PKG_CONFIG
m4trace:configure.ac:33: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4trace:configure.ac:33: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
m4trace:configure.ac:33: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:33: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:33: -1- m4_pattern_allow([^gflags_CFLAGS$])
m4trace:configure.ac:33: -1- m4_pattern_allow([^gflags_LIBS$])
m4trace:configure.ac:33: -1- PKG_CHECK_EXISTS([libgflags], [pkg_cv_[]gflags_CFLAGS=`$PKG_CONFIG --[]cflags "libgflags" 2>/dev/null`], [pkg_failed=yes])
m4trace:configure.ac:33: -1- PKG_CHECK_EXISTS([libgflags], [pkg_cv_[]gflags_LIBS=`$PKG_CONFIG --[]libs "libgflags" 2>/dev/null`], [pkg_failed=yes])
m4trace:configure.ac:33: -1- _PKG_SHORT_ERRORS_SUPPORTED
m4trace:configure.ac:33: -1- m4_pattern_allow([^HAVE_GFLAGS$])
m4trace:configure.ac:46: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2581: AC_TRY_COMPILE is expanded from...
configure.ac:33: the top level])
m4trace:configure.ac:43: -1- m4_pattern_allow([^HAVE_BUILTIN_EXPECT$])
m4trace:configure.ac:50: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
configure.ac:46: the top level])
m4trace:configure.ac:56: -1- m4_pattern_allow([^HAVE_BUILTIN_EXPECT$])
m4trace:configure.ac:63: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2581: AC_TRY_COMPILE is expanded from...
configure.ac:50: the top level])
m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_BUILTIN_CTZ$])
m4trace:configure.ac:65: -1- m4_pattern_allow([^HAVE_LIBZ$])
m4trace:configure.ac:66: -1- m4_pattern_allow([^HAVE_LIBLZO2$])
m4trace:configure.ac:67: -1- m4_pattern_allow([^HAVE_LIBLZF$])
m4trace:configure.ac:68: -1- m4_pattern_allow([^HAVE_LIBFASTLZ$])
m4trace:configure.ac:69: -1- m4_pattern_allow([^HAVE_LIBQUICKLZ$])
m4trace:configure.ac:73: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:75: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:78: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:80: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:88: -1- m4_pattern_allow([^SNAPPY_MAJOR$])
m4trace:configure.ac:89: -1- m4_pattern_allow([^SNAPPY_MINOR$])
m4trace:configure.ac:90: -1- m4_pattern_allow([^SNAPPY_PATCHLEVEL$])
m4trace:configure.ac:91: -1- m4_pattern_allow([^SNAPPY_LTVERSION$])
m4trace:configure.ac:95: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:95: -1- m4_pattern_allow([^LTLIBOBJS$])
m4trace:configure.ac:95: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
m4trace:configure.ac:95: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
m4trace:configure.ac:95: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
m4trace:configure.ac:95: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
m4trace:configure.ac:95: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
m4trace:configure.ac:95: -1- _LT_PROG_LTMAIN
configure.ac:63: the top level])
m4trace:configure.ac:73: -1- m4_pattern_allow([^HAVE_BUILTIN_CTZ$])
m4trace:configure.ac:78: -1- m4_pattern_allow([^HAVE_LIBZ$])
m4trace:configure.ac:79: -1- m4_pattern_allow([^HAVE_LIBLZO2$])
m4trace:configure.ac:80: -1- m4_pattern_allow([^HAVE_LIBLZF$])
m4trace:configure.ac:81: -1- m4_pattern_allow([^HAVE_LIBFASTLZ$])
m4trace:configure.ac:82: -1- m4_pattern_allow([^HAVE_LIBQUICKLZ$])
m4trace:configure.ac:86: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:88: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:91: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:93: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:101: -1- m4_pattern_allow([^SNAPPY_MAJOR$])
m4trace:configure.ac:102: -1- m4_pattern_allow([^SNAPPY_MINOR$])
m4trace:configure.ac:103: -1- m4_pattern_allow([^SNAPPY_PATCHLEVEL$])
m4trace:configure.ac:104: -1- m4_pattern_allow([^SNAPPY_LTVERSION$])
m4trace:configure.ac:108: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:108: -1- m4_pattern_allow([^LTLIBOBJS$])
m4trace:configure.ac:108: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
m4trace:configure.ac:108: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
m4trace:configure.ac:108: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
m4trace:configure.ac:108: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
m4trace:configure.ac:108: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
m4trace:configure.ac:108: -1- _LT_PROG_LTMAIN