gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

updated autoconf macro gl_LD_VERSION_SCRIPT from gnulib to version 4

Browse Source 
This new version now checks that version script with syntax error are
rejected, it probably led to mis-detect the option as supported when it was
actually just ignored with at most a warning; it also now implement caching
of the result to speed-up re-run of configure if user enabled it.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2015-01-05 11:06:30 +01:00
committed by Carlos R. Mafra
parent 796b557c3a
commit d12b647069
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
m4/ld-version-script.m4
View File

@@ -1,5 +1,5 @@
# ld-version-script.m4 serial 2 # ld-version-script.m4 serial 4
dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
@@ -18,14 +18,18 @@ dnl From Simon Josefsson
AC_DEFUN([gl_LD_VERSION_SCRIPT], AC_DEFUN([gl_LD_VERSION_SCRIPT],
[ [
AC_ARG_ENABLE([ld-version-script], AC_ARG_ENABLE([ld-version-script],
AS_HELP_STRING([--enable-ld-version-script], [AS_HELP_STRING([--enable-ld-version-script],
[enable linker version script (default is enabled when possible)]), [enable linker version script (default is enabled when possible)])],
[have_ld_version_script=$enableval], []) [have_ld_version_script=$enableval],
if test -z "$have_ld_version_script"; then [AC_CACHE_CHECK([if LD -Wl,--version-script works],
AC_MSG_CHECKING([if LD -Wl,--version-script works]) [gl_cv_sys_ld_version_script],
save_LDFLAGS="$LDFLAGS" [gl_cv_sys_ld_version_script=no
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
cat > conftest.map <<EOF echo foo >conftest.map
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[],
[cat > conftest.map <<EOF
VERS_1 { VERS_1 {
global: sym; global: sym;
}; };
@@ -35,10 +39,10 @@ VERS_2 {
} VERS_1; } VERS_1;
EOF EOF
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[have_ld_version_script=yes], [have_ld_version_script=no]) [gl_cv_sys_ld_version_script=yes])])
rm -f conftest.map rm -f conftest.map
LDFLAGS="$save_LDFLAGS" LDFLAGS=$save_LDFLAGS])
AC_MSG_RESULT($have_ld_version_script) have_ld_version_script=$gl_cv_sys_ld_version_script])
fi AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") [test "$have_ld_version_script" = yes])
]) ])