fabi/Snappy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix public issue #5: Replace the EXTRA_LIBSNAPPY_LDFLAGS setup with something

Browse Source 
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:
snappy.mirrorbot@gmail.com
2011-03-23 11:12:44 +00:00
parent a8dd170087
commit 60add43d99
8 changed files with 54 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
# Library.
lib_LTLIBRARIES = libsnappy.la
libsnappy_la_SOURCES = snappy.cc snappy-sinksource.cc snappy-stubs-internal.cc
libsnappy_la_LDFLAGS = $(EXTRA_LIBSNAPPY_LDFLAGS)
libsnappy_la_LDFLAGS = -version-info $(SNAPPY_LTVERSION)
include_HEADERS = snappy.h snappy-sinksource.h snappy-stubs-public.h
noinst_HEADERS = snappy-internal.h snappy-stubs-internal.h snappy-test.h

4
Makefile.in
View File

@@ -159,7 +159,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_LIBSNAPPY_LDFLAGS = @EXTRA_LIBSNAPPY_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTEST_CONFIG = @GTEST_CONFIG@
@@ -203,6 +202,7 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SNAPPY_LTVERSION = @SNAPPY_LTVERSION@
SNAPPY_MAJOR = @SNAPPY_MAJOR@
SNAPPY_MINOR = @SNAPPY_MINOR@
SNAPPY_PATCHLEVEL = @SNAPPY_PATCHLEVEL@
@@ -270,7 +270,7 @@ ACLOCAL_AMFLAGS = -I m4
# Library.
lib_LTLIBRARIES = libsnappy.la
libsnappy_la_SOURCES = snappy.cc snappy-sinksource.cc snappy-stubs-internal.cc
libsnappy_la_LDFLAGS = $(EXTRA_LIBSNAPPY_LDFLAGS)
libsnappy_la_LDFLAGS = -version-info $(SNAPPY_LTVERSION)
include_HEADERS = snappy.h snappy-sinksource.h snappy-stubs-public.h
noinst_HEADERS = snappy-internal.h snappy-stubs-internal.h snappy-test.h

7
autom4te.cache/output.0
View File

@@ -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"

7
autom4te.cache/output.1
View File

@@ -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"

22
autom4te.cache/traces.0
View File

@@ -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

64
autom4te.cache/traces.1
View File

@@ -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])

7
configure vendored
View File

@@ -743,7 +743,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
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"

8
configure.ac
View File

@@ -5,7 +5,7 @@ m4_define([snappy_patchlevel], [0])
# Libtool shared library interface versions (current:revision:age)
# Update this value for every release! (A:B:C will map to foo.so.(A-C).C.B)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
m4_define([snappy_version], [1:0:0])
m4_define([snappy_ltversion], [1:0:0])
AC_INIT([snappy], [snappy_major.snappy_minor.snappy_patchlevel])
AC_CONFIG_MACRO_DIR([m4])
@@ -88,11 +88,7 @@ SNAPPY_PATCHLEVEL="snappy_patchlevel"
AC_SUBST([SNAPPY_MAJOR])
AC_SUBST([SNAPPY_MINOR])
AC_SUBST([SNAPPY_PATCHLEVEL])
# Set the libtool version for the library.
# (Note: snappy_version is an m4 macro, defined above.)
EXTRA_LIBSNAPPY_LDFLAGS="$EXTRA_LIBSNAPPY_LDFLAGS -version-info snappy_version"
AC_SUBST([EXTRA_LIBSNAPPY_LDFLAGS])
AC_SUBST([SNAPPY_LTVERSION], snappy_ltversion)
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile snappy-stubs-public.h])