libsubid: fix defining SONAME version

We were overriding this when --enable-shared was passed. We can actually
just dump the conditional logic as libtool will do the right thing for
us here anyway.

Without this patch, libsubid is installed as .0.

Signed-off-by: Sam James <sam@gentoo.org>

diff --git a/configure.ac b/configure.ac
index 29b94d0060f0e632f931b87495659b2f8275b515..a94e897fa691a25f6809eee26dd793238c301197 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -321,8 +321,6 @@ if test "$with_sha_crypt" = "yes"; then
        AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
 fi
 
-AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
-
 AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
 if test "$with_bcrypt" = "yes"; then
        AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])

diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
index ca4a1e1e058e9f55a5e91976cdbb5c2f90547393..09ec3416dbd6de81880c41af2864c198519e335e 100644 (file)
--- a/libsubid/Makefile.am
+++ b/libsubid/Makefile.am
@@ -1,10 +1,6 @@
 lib_LTLIBRARIES = libsubid.la
-if ENABLE_SHARED
-libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \
-       -shared -version-info @LIBSUBID_ABI_MAJOR@
-endif
 libsubid_la_SOURCES = api.c
-libsubid_la_LDFLAGS = -export-symbols-regex '^subid_'
+libsubid_la_LDFLAGS = -version-info @LIBSUBID_ABI_MAJOR@ -export-symbols-regex '^subid_'
 
 pkginclude_HEADERS = subid.h