Fix public issue #5: Replace the EXTRA_LIBSNAPPY_LDFLAGS setup with something
slightly more standard, that also doesn't leak libtool command-line into configure.ac. R=csilvers DELTA=7 (0 added, 4 deleted, 3 changed) Revision created by MOE tool push_codebase. MOE_MIGRATION=990 git-svn-id: https://snappy.googlecode.com/svn/trunk@8 03e5f5b5-db94-4691-08a0-1a8bf15f6143
This commit is contained in:
@@ -743,7 +743,7 @@ ac_subst_vars='am__EXEEXT_FALSE
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIB@&t@OBJS
|
||||
EXTRA_LIBSNAPPY_LDFLAGS
|
||||
SNAPPY_LTVERSION
|
||||
SNAPPY_PATCHLEVEL
|
||||
SNAPPY_MINOR
|
||||
SNAPPY_MAJOR
|
||||
@@ -15356,10 +15356,7 @@ SNAPPY_PATCHLEVEL="0"
|
||||
|
||||
|
||||
|
||||
|
||||
# Set the libtool version for the library.
|
||||
# (Note: snappy_version is an m4 macro, defined above.)
|
||||
EXTRA_LIBSNAPPY_LDFLAGS="$EXTRA_LIBSNAPPY_LDFLAGS -version-info 1:0:0"
|
||||
SNAPPY_LTVERSION=1:0:0
|
||||
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
@@ -743,7 +743,7 @@ ac_subst_vars='am__EXEEXT_FALSE
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIB@&t@OBJS
|
||||
EXTRA_LIBSNAPPY_LDFLAGS
|
||||
SNAPPY_LTVERSION
|
||||
SNAPPY_PATCHLEVEL
|
||||
SNAPPY_MINOR
|
||||
SNAPPY_MAJOR
|
||||
@@ -15352,10 +15352,7 @@ SNAPPY_PATCHLEVEL="0"
|
||||
|
||||
|
||||
|
||||
|
||||
# Set the libtool version for the library.
|
||||
# (Note: snappy_version is an m4 macro, defined above.)
|
||||
EXTRA_LIBSNAPPY_LDFLAGS="$EXTRA_LIBSNAPPY_LDFLAGS -version-info 1:0:0"
|
||||
SNAPPY_LTVERSION=1:0:0
|
||||
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
@@ -2548,14 +2548,14 @@ 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:95: -1- m4_pattern_allow([^EXTRA_LIBSNAPPY_LDFLAGS$])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^LIB@&t@OBJS$])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^LTLIBOBJS$])
|
||||
m4trace:configure.ac:99: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
|
||||
m4trace:configure.ac:99: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:99: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:99: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
|
||||
m4trace:configure.ac:99: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
m4trace:configure.ac:99: -1- _LT_PROG_LTMAIN
|
||||
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
|
||||
|
||||
@@ -660,35 +660,35 @@ 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:95: -1- AC_SUBST([EXTRA_LIBSNAPPY_LDFLAGS])
|
||||
m4trace:configure.ac:95: -1- AC_SUBST_TRACE([EXTRA_LIBSNAPPY_LDFLAGS])
|
||||
m4trace:configure.ac:95: -1- m4_pattern_allow([^EXTRA_LIBSNAPPY_LDFLAGS$])
|
||||
m4trace:configure.ac:97: -1- AC_CONFIG_HEADERS([config.h])
|
||||
m4trace:configure.ac:98: -1- AC_CONFIG_FILES([Makefile snappy-stubs-public.h])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^LIB@&t@OBJS$])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LTLIBOBJS])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^LTLIBOBJS$])
|
||||
m4trace:configure.ac:99: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:99: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
|
||||
m4trace:configure.ac:99: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:99: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([top_builddir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([top_build_prefix])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([srcdir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_srcdir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([top_srcdir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_top_srcdir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([builddir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_builddir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_top_builddir])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([INSTALL])
|
||||
m4trace:configure.ac:99: -1- AC_SUBST_TRACE([MKDIR_P])
|
||||
m4trace:configure.ac:99: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
|
||||
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])
|
||||
|
||||
Reference in New Issue
Block a user