summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-08 17:01:18 +0000
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-08 17:03:04 +0000
commitd60bd53ce53dd5d527fc56a60302663b8529e697 (patch)
tree4ced795c14b365c15573733b98635507e316ee74
parent96fd36a98877302ae4b71b23b3378332fb3d2fc0 (diff)
Don't pass a library suffix to ./configure
-rw-r--r--configure.ac11
-rw-r--r--telepathy-yell/Makefile.am1
2 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 7620095..b4829e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,13 +83,12 @@ AC_ARG_ENABLE(coding-style-checks,
AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
dnl shared library
-AC_ARG_ENABLE(library-suffix,
- AC_HELP_STRING([--enable-library-suffix=foo-0.2],
- [produce a shared library to install and give it this suffix]),
- [LIBRARY_SUFFIX=$enableval], [LIBRARY_SUFFIX=no])
+AC_ARG_ENABLE(shared-library,
+ AC_HELP_STRING([--enable-shared-library],
+ [produce a shared library to install]),
+ [ENABLE_SHARED_LIBRARY=yes], [ENABLE_SHARED_LIBRARY=no])
-AM_CONDITIONAL(ENABLE_SHARED_LIBRARY, test "x$LIBRARY_SUFFIX" != "xno")
-AC_SUBST([LIBRARY_SUFFIX])
+AM_CONDITIONAL(ENABLE_SHARED_LIBRARY, test "x$ENABLE_SHARED_LIBRARY" != "xno")
dnl Check for Glib
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26, gobject-2.0 >= 2.26])
diff --git a/telepathy-yell/Makefile.am b/telepathy-yell/Makefile.am
index e1fd996..8800596 100644
--- a/telepathy-yell/Makefile.am
+++ b/telepathy-yell/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST = \
if ENABLE_SHARED_LIBRARY
lib_LTLIBRARIES = libtelepathy-yell.la
-libtelepathy_yell_la_LDFLAGS = -release $(LIBRARY_SUFFIX)
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = telepathy-yell.pc
tpyincludedir=$(includedir)/telepathy-1.0/telepathy-yell