build-sys: Fix map-file check

configure doesn't provide an abs_top_srcdir early enough, so we just use
srcdir for that. There was also a problem with the path we were setting
in VERSIONING_LDFLAGS that is fixed now.

diff --git a/configure.ac b/configure.ac
index af30fd3..b67b329 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -168,8 +168,8 @@ AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [AX_APPEND_FLAG(["-DFASTPATH"], [CPPFLAG
 # Check whether the linker supports the -version-script option.
 # The Make variable $(srcdir) needs to be in the LDFLAGS in that form,
 # so that it is expanded the right way in every subdir.
-AX_CHECK_LINK_FLAG(["-Wl,-version-script=${abs_top_srcdir}/src/map-file"],
-    [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/map-file'])
+AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/src/map-file"],
+    [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/src/map-file'])
 AC_SUBST([VERSIONING_LDFLAGS])
 
 # Use immediate (now) bindings; avoids the funky re-call in itself.