From af011b1c9cc0de7904fcea24cf43ef98e2dd7226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 8 Dec 2014 20:43:03 +0100
Subject: [PATCH] Drop srcdir reference for linker scripts.
---
ChangeLog | 3 +++
aclocal.m4 | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dbcb5435..79c81cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-12-08 Niels Möller <nisse@lysator.liu.se>
+ * aclocal.m4 (LD_VERSION_SCRIPT): Linker scripts no longer located
+ in the source tree.
+
* configure.ac (LIBNETTLE_MAJOR): Bump major number, now 6.
(LIBHOGWEED_MAJOR): Bump major number, now 5.
diff --git a/aclocal.m4 b/aclocal.m4
index 4c0bd410..28ec2705 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1264,9 +1264,9 @@ EOF
AC_MSG_RESULT($have_ld_version_script)
fi
if test "$have_ld_version_script" = "yes";then
- EXTRA_LINKER_FLAGS="-Wl,--version-script=\$(srcdir)/libnettle.map"
+ EXTRA_LINKER_FLAGS="-Wl,--version-script=libnettle.map"
AC_SUBST(EXTRA_LINKER_FLAGS)
- EXTRA_HOGWEED_LINKER_FLAGS="-Wl,--version-script=\$(srcdir)/libhogweed.map"
+ EXTRA_HOGWEED_LINKER_FLAGS="-Wl,--version-script=libhogweed.map"
AC_SUBST(EXTRA_HOGWEED_LINKER_FLAGS)
fi
])
--
GitLab