Revert "configure : Disable versioned dynamic library when compling for Android."

This reverts commit 432479b3f5.

This approach didn't work.
This commit is contained in:
Erik de Castro Lopo 2014-11-26 06:22:02 +11:00
parent 5e7b135195
commit 6c67259489
2 changed files with 2 additions and 7 deletions

View File

@ -63,7 +63,7 @@ AC_CHECK_PROG(HAVE_XCODE_SELECT, xcode-select, yes, no)
CLEAN_VERSION=`echo $PACKAGE_VERSION | $SED "s/p.*//"`
VERSION_MINOR=`echo $CLEAN_VERSION | $SED "s/.*\.//"`
SHARED_VERSION_INFO="-version-info 1:$VERSION_MINOR:0"
SHARED_VERSION_INFO="1:$VERSION_MINOR:0"
#------------------------------------------------------------------------------------
@ -410,11 +410,6 @@ case "$host_os" in
openbsd*)
os_is_openbsd=1
;;
linux-android*)
# Disable versioned libraries for Android.
# See: https://github.com/erikd/libsndfile/issues/51
SHARED_VERSION_INFO=""
;;
esac
AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32])

View File

@ -43,7 +43,7 @@ endif
#===============================================================================
# MinGW requires -no-undefined if a DLL is to be built.
libsndfile_la_LDFLAGS = -no-undefined $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG)
libsndfile_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG)
libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS)
nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS)
libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la \