diff options
| author | Dan McGee <dpmcgee@gmail.com> | 2012-02-16 23:30:07 -0600 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2012-02-21 10:20:44 +0200 |
| commit | 0e3ff74b849431fd0921138205f4205faecc682e (patch) | |
| tree | c69f58e156b0d5fdffa2634a076035e0db2dd0b2 | |
| parent | f3f8ebe91bb95aa340b49a24e5b945a82cefe7c7 (diff) | |
| download | spice-0e3ff74b849431fd0921138205f4205faecc682e.tar.gz spice-0e3ff74b849431fd0921138205f4205faecc682e.tar.xz spice-0e3ff74b849431fd0921138205f4205faecc682e.zip | |
Add configure-time check for -Wl, --version-script option
This is supported by the GNU linker, but not the Solaris linker, which
is used as the default on that platform even when compiling with GCC.
Omit passing the option to the linker on platforms that do not support
it.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | server/Makefile.am | 12 |
2 files changed, 18 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1c15e745..b8acfa94 100644 --- a/configure.ac +++ b/configure.ac @@ -518,6 +518,16 @@ fi AC_MSG_RESULT($have_gcc4) AC_SUBST(VISIBILITY_HIDDEN_CFLAGS) +dnl ensure linker supports ---version-script option before using it +AC_CACHE_CHECK([if -Wl,--version-script works], [spice_cv_ld_version_script], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,--version-script=$srcdir/server/spice-server.syms" + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [spice_cv_ld_version_script=yes], [spice_cv_ld_version_script=no]) + LDFLAGS="$save_LDFLAGS"]) +AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], + [test x"$spice_cv_ld_version_script" = xyes]) + AC_SUBST(SPICE_REQUIRES) AC_SUBST(SPICE_NONPKGCONFIG_CFLAGS) AC_SUBST(SPICE_NONPKGCONFIG_LIBS) diff --git a/server/Makefile.am b/server/Makefile.am index 12847040..a88e464a 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -31,12 +31,16 @@ generated_marshallers.h: $(top_srcdir)/spice.proto lib_LTLIBRARIES = libspice-server.la -libspice_server_la_LDFLAGS = \ - -version-number $(SPICE_LT_VERSION) \ - -Wl,--version-script=$(top_srcdir)/server/spice-server.syms \ - -no-undefined \ +libspice_server_la_LDFLAGS = \ + -version-number $(SPICE_LT_VERSION) \ + -no-undefined \ $(NULL) +if HAVE_LD_VERSION_SCRIPT +libspice_server_la_LDFLAGS += \ + -Wl,--version-script=$(top_srcdir)/server/spice-server.syms +endif + libspice_server_la_LIBADD = \ $(top_builddir)/common/libspice-common.la \ $(CELT051_LIBS) \ |