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

@@ -587,108 +587,108 @@ m4trace:configure.ac:23: -1- AC_SUBST_TRACE([HAVE_GTEST_FALSE])
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- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
m4trace:configure.ac:24: -1- AC_SUBST([PKG_CONFIG])
m4trace:configure.ac:24: -1- AC_SUBST_TRACE([PKG_CONFIG])
m4trace:configure.ac:24: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:24: -1- AC_SUBST([PKG_CONFIG])
m4trace:configure.ac:24: -1- AC_SUBST_TRACE([PKG_CONFIG])
m4trace:configure.ac:24: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:24: -1- AC_SUBST([gflags_CFLAGS])
m4trace:configure.ac:24: -1- AC_SUBST_TRACE([gflags_CFLAGS])
m4trace:configure.ac:24: -1- m4_pattern_allow([^gflags_CFLAGS$])
m4trace:configure.ac:24: -1- AC_SUBST([gflags_LIBS])
m4trace:configure.ac:24: -1- AC_SUBST_TRACE([gflags_LIBS])
m4trace:configure.ac:24: -1- m4_pattern_allow([^gflags_LIBS$])
m4trace:configure.ac:24: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GFLAGS])
m4trace:configure.ac:24: -1- m4_pattern_allow([^HAVE_GFLAGS$])
m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_GFLAGS], [/* Use the gflags package for command-line parsing. */
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- AC_SUBST([PKG_CONFIG])
m4trace:configure.ac:33: -1- AC_SUBST_TRACE([PKG_CONFIG])
m4trace:configure.ac:33: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:33: -1- AC_SUBST([PKG_CONFIG])
m4trace:configure.ac:33: -1- AC_SUBST_TRACE([PKG_CONFIG])
m4trace:configure.ac:33: -1- m4_pattern_allow([^PKG_CONFIG$])
m4trace:configure.ac:33: -1- AC_SUBST([gflags_CFLAGS])
m4trace:configure.ac:33: -1- AC_SUBST_TRACE([gflags_CFLAGS])
m4trace:configure.ac:33: -1- m4_pattern_allow([^gflags_CFLAGS$])
m4trace:configure.ac:33: -1- AC_SUBST([gflags_LIBS])
m4trace:configure.ac:33: -1- AC_SUBST_TRACE([gflags_LIBS])
m4trace:configure.ac:33: -1- m4_pattern_allow([^gflags_LIBS$])
m4trace:configure.ac:33: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GFLAGS])
m4trace:configure.ac:33: -1- m4_pattern_allow([^HAVE_GFLAGS$])
m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_GFLAGS], [/* Use the gflags package for command-line parsing. */
@%:@undef HAVE_GFLAGS])
m4trace:configure.ac:33: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
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- AC_DEFINE_TRACE_LITERAL([HAVE_BUILTIN_EXPECT])
m4trace:configure.ac:43: -1- m4_pattern_allow([^HAVE_BUILTIN_EXPECT$])
m4trace:configure.ac:43: -1- AH_OUTPUT([HAVE_BUILTIN_EXPECT], [/* Define to 1 if the compiler supports __builtin_expect. */
configure.ac:46: the top level])
m4trace:configure.ac:56: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BUILTIN_EXPECT])
m4trace:configure.ac:56: -1- m4_pattern_allow([^HAVE_BUILTIN_EXPECT$])
m4trace:configure.ac:56: -1- AH_OUTPUT([HAVE_BUILTIN_EXPECT], [/* Define to 1 if the compiler supports __builtin_expect. */
@%:@undef HAVE_BUILTIN_EXPECT])
m4trace:configure.ac:50: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
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- AC_DEFINE_TRACE_LITERAL([HAVE_BUILTIN_CTZ])
m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_BUILTIN_CTZ$])
m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_BUILTIN_CTZ], [/* Define to 1 if the compiler supports __builtin_ctz and friends. */
configure.ac:63: the top level])
m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BUILTIN_CTZ])
m4trace:configure.ac:73: -1- m4_pattern_allow([^HAVE_BUILTIN_CTZ$])
m4trace:configure.ac:73: -1- AH_OUTPUT([HAVE_BUILTIN_CTZ], [/* Define to 1 if the compiler supports __builtin_ctz and friends. */
@%:@undef HAVE_BUILTIN_CTZ])
m4trace:configure.ac:65: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define to 1 if you have the `z\' library (-lz). */
m4trace:configure.ac:78: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define to 1 if you have the `z\' library (-lz). */
@%:@undef HAVE_LIBZ])
m4trace:configure.ac:65: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ])
m4trace:configure.ac:65: -1- m4_pattern_allow([^HAVE_LIBZ$])
m4trace:configure.ac:66: -1- AH_OUTPUT([HAVE_LIBLZO2], [/* Define to 1 if you have the `lzo2\' library (-llzo2). */
m4trace:configure.ac:78: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ])
m4trace:configure.ac:78: -1- m4_pattern_allow([^HAVE_LIBZ$])
m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_LIBLZO2], [/* Define to 1 if you have the `lzo2\' library (-llzo2). */
@%:@undef HAVE_LIBLZO2])
m4trace:configure.ac:66: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLZO2])
m4trace:configure.ac:66: -1- m4_pattern_allow([^HAVE_LIBLZO2$])
m4trace:configure.ac:67: -1- AH_OUTPUT([HAVE_LIBLZF], [/* Define to 1 if you have the `lzf\' library (-llzf). */
m4trace:configure.ac:79: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLZO2])
m4trace:configure.ac:79: -1- m4_pattern_allow([^HAVE_LIBLZO2$])
m4trace:configure.ac:80: -1- AH_OUTPUT([HAVE_LIBLZF], [/* Define to 1 if you have the `lzf\' library (-llzf). */
@%:@undef HAVE_LIBLZF])
m4trace:configure.ac:67: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLZF])
m4trace:configure.ac:67: -1- m4_pattern_allow([^HAVE_LIBLZF$])
m4trace:configure.ac:68: -1- AH_OUTPUT([HAVE_LIBFASTLZ], [/* Define to 1 if you have the `fastlz\' library (-lfastlz). */
m4trace:configure.ac:80: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLZF])
m4trace:configure.ac:80: -1- m4_pattern_allow([^HAVE_LIBLZF$])
m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_LIBFASTLZ], [/* Define to 1 if you have the `fastlz\' library (-lfastlz). */
@%:@undef HAVE_LIBFASTLZ])
m4trace:configure.ac:68: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBFASTLZ])
m4trace:configure.ac:68: -1- m4_pattern_allow([^HAVE_LIBFASTLZ$])
m4trace:configure.ac:69: -1- AH_OUTPUT([HAVE_LIBQUICKLZ], [/* Define to 1 if you have the `quicklz\' library (-lquicklz). */
m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBFASTLZ])
m4trace:configure.ac:81: -1- m4_pattern_allow([^HAVE_LIBFASTLZ$])
m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_LIBQUICKLZ], [/* Define to 1 if you have the `quicklz\' library (-lquicklz). */
@%:@undef HAVE_LIBQUICKLZ])
m4trace:configure.ac:69: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBQUICKLZ])
m4trace:configure.ac:69: -1- m4_pattern_allow([^HAVE_LIBQUICKLZ$])
m4trace:configure.ac:73: -1- AC_SUBST([ac_cv_have_stdint_h], [1])
m4trace:configure.ac:73: -1- AC_SUBST_TRACE([ac_cv_have_stdint_h])
m4trace:configure.ac:73: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:75: -1- AC_SUBST([ac_cv_have_stdint_h], [0])
m4trace:configure.ac:75: -1- AC_SUBST_TRACE([ac_cv_have_stdint_h])
m4trace:configure.ac:75: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:78: -1- AC_SUBST([ac_cv_have_stddef_h], [1])
m4trace:configure.ac:78: -1- AC_SUBST_TRACE([ac_cv_have_stddef_h])
m4trace:configure.ac:78: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:80: -1- AC_SUBST([ac_cv_have_stddef_h], [0])
m4trace:configure.ac:80: -1- AC_SUBST_TRACE([ac_cv_have_stddef_h])
m4trace:configure.ac:80: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:88: -1- AC_SUBST([SNAPPY_MAJOR])
m4trace:configure.ac:88: -1- AC_SUBST_TRACE([SNAPPY_MAJOR])
m4trace:configure.ac:88: -1- m4_pattern_allow([^SNAPPY_MAJOR$])
m4trace:configure.ac:89: -1- AC_SUBST([SNAPPY_MINOR])
m4trace:configure.ac:89: -1- AC_SUBST_TRACE([SNAPPY_MINOR])
m4trace:configure.ac:89: -1- m4_pattern_allow([^SNAPPY_MINOR$])
m4trace:configure.ac:90: -1- AC_SUBST([SNAPPY_PATCHLEVEL])
m4trace:configure.ac:90: -1- AC_SUBST_TRACE([SNAPPY_PATCHLEVEL])
m4trace:configure.ac:90: -1- m4_pattern_allow([^SNAPPY_PATCHLEVEL$])
m4trace:configure.ac:91: -1- AC_SUBST([SNAPPY_LTVERSION], [1:0:0])
m4trace:configure.ac:91: -1- AC_SUBST_TRACE([SNAPPY_LTVERSION])
m4trace:configure.ac:91: -1- m4_pattern_allow([^SNAPPY_LTVERSION$])
m4trace:configure.ac:93: -1- AC_CONFIG_HEADERS([config.h])
m4trace:configure.ac:94: -1- AC_CONFIG_FILES([Makefile snappy-stubs-public.h])
m4trace:configure.ac:95: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:95: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:95: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([LTLIBOBJS])
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- AC_SUBST([am__EXEEXT_TRUE])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
m4trace:configure.ac:95: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
m4trace:configure.ac:95: -1- AC_SUBST([am__EXEEXT_FALSE])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
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_SUBST_TRACE([top_builddir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([top_build_prefix])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([srcdir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_srcdir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([top_srcdir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_top_srcdir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([INSTALL])
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([MKDIR_P])
m4trace:configure.ac:95: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBQUICKLZ])
m4trace:configure.ac:82: -1- m4_pattern_allow([^HAVE_LIBQUICKLZ$])
m4trace:configure.ac:86: -1- AC_SUBST([ac_cv_have_stdint_h], [1])
m4trace:configure.ac:86: -1- AC_SUBST_TRACE([ac_cv_have_stdint_h])
m4trace:configure.ac:86: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:88: -1- AC_SUBST([ac_cv_have_stdint_h], [0])
m4trace:configure.ac:88: -1- AC_SUBST_TRACE([ac_cv_have_stdint_h])
m4trace:configure.ac:88: -1- m4_pattern_allow([^ac_cv_have_stdint_h$])
m4trace:configure.ac:91: -1- AC_SUBST([ac_cv_have_stddef_h], [1])
m4trace:configure.ac:91: -1- AC_SUBST_TRACE([ac_cv_have_stddef_h])
m4trace:configure.ac:91: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:93: -1- AC_SUBST([ac_cv_have_stddef_h], [0])
m4trace:configure.ac:93: -1- AC_SUBST_TRACE([ac_cv_have_stddef_h])
m4trace:configure.ac:93: -1- m4_pattern_allow([^ac_cv_have_stddef_h$])
m4trace:configure.ac:101: -1- AC_SUBST([SNAPPY_MAJOR])
m4trace:configure.ac:101: -1- AC_SUBST_TRACE([SNAPPY_MAJOR])
m4trace:configure.ac:101: -1- m4_pattern_allow([^SNAPPY_MAJOR$])
m4trace:configure.ac:102: -1- AC_SUBST([SNAPPY_MINOR])
m4trace:configure.ac:102: -1- AC_SUBST_TRACE([SNAPPY_MINOR])
m4trace:configure.ac:102: -1- m4_pattern_allow([^SNAPPY_MINOR$])
m4trace:configure.ac:103: -1- AC_SUBST([SNAPPY_PATCHLEVEL])
m4trace:configure.ac:103: -1- AC_SUBST_TRACE([SNAPPY_PATCHLEVEL])
m4trace:configure.ac:103: -1- m4_pattern_allow([^SNAPPY_PATCHLEVEL$])
m4trace:configure.ac:104: -1- AC_SUBST([SNAPPY_LTVERSION], [1:0:0])
m4trace:configure.ac:104: -1- AC_SUBST_TRACE([SNAPPY_LTVERSION])
m4trace:configure.ac:104: -1- m4_pattern_allow([^SNAPPY_LTVERSION$])
m4trace:configure.ac:106: -1- AC_CONFIG_HEADERS([config.h])
m4trace:configure.ac:107: -1- AC_CONFIG_FILES([Makefile snappy-stubs-public.h])
m4trace:configure.ac:108: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:108: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:108: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([LTLIBOBJS])
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- AC_SUBST([am__EXEEXT_TRUE])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
m4trace:configure.ac:108: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
m4trace:configure.ac:108: -1- AC_SUBST([am__EXEEXT_FALSE])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
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_SUBST_TRACE([top_builddir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([top_build_prefix])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([srcdir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([abs_srcdir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([top_srcdir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([abs_top_srcdir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([INSTALL])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([MKDIR_P])
m4trace:configure.ac:108: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])