summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjwybrow <mjwybrow@users.sourceforge.net>2008-05-04 15:26:51 +0000
committermjwybrow <mjwybrow@users.sourceforge.net>2008-05-04 15:26:51 +0000
commit52f66eca790a0f918687ae36fc9a4fbbb3bfa2fc (patch)
tree1d0bf5b84c0991acb377fb14492f66a40f18c9f2
parentAddress string-literal-to-char* warning: Make gm_read_error global var point ... (diff)
downloadinkscape-52f66eca790a0f918687ae36fc9a4fbbb3bfa2fc.tar.gz
inkscape-52f66eca790a0f918687ae36fc9a4fbbb3bfa2fc.zip
* configure.ac: Have the "linker tolerates -z relro" configure test do
a AC_LINK_IFELSE since the existing AC_COMPILE_IFELSE didn't use the LDFLAGS and therefore wasn't actually performing the test. (bzr r5598)
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 6c55b89e7..eaa420af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ if test "$GCC" = "yes"; then
AC_MSG_CHECKING([linker tolerates -z relro])
ink_svd_LDFLAGS="$LDFLAGS"
LDFLAGS="-Wl,-z,relro $LDFLAGS"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
AC_MSG_RESULT([$ink_opt_ok])
if test "x$ink_opt_ok" != "xyes"; then
LDFLAGS="$ink_svd_LDFLAGS"