diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-11-18 00:20:36 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-11-18 00:20:36 +0100 |
| commit | 60859fa9e71f85af96ab0951a4d681813705b761 (patch) | |
| tree | 0c1fe20c852a474ebc4a269cdaf480dce43e9d81 /lib | |
| parent | e6e8f49cb25b8323ffe04f72a8c6af70fc4af3d8 (diff) | |
| download | gnutls-60859fa9e71f85af96ab0951a4d681813705b761.tar.gz | |
Fix linker script test.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/configure.ac | 2 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 1 | ||||
| -rw-r--r-- | lib/m4/linker-script.m4 | 30 |
3 files changed, 2 insertions, 31 deletions
diff --git a/lib/configure.ac b/lib/configure.ac index a8f814f97a..f2cbcc9c45 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -86,7 +86,9 @@ LIBGNUTLS_CFLAGS="-I${includedir}" AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_CFLAGS) +# Finish things from ../configure.ac. AC_SUBST([WARN_CFLAGS]) +AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") AC_CONFIG_FILES([ Makefile diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index 45e62508db..cce7145abf 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -227,7 +227,6 @@ AC_DEFUN([LIBGNUTLS_HOOKS], AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes") sj_OUTPUT_DEF - sj_LINKER_SCRIPT([$srcdir/libgnutls.vers]) # For storing integers in pointers without warnings # http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc diff --git a/lib/m4/linker-script.m4 b/lib/m4/linker-script.m4 deleted file mode 100644 index 7570a942a2..0000000000 --- a/lib/m4/linker-script.m4 +++ /dev/null @@ -1,30 +0,0 @@ -# linker-script.m4 serial 1 -dnl Copyright (C) 2008 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# sj_LINKER_SCRIPT(VERSION-SCRIPT) -# ------------- -# Check if ld supports linker scripts, and define automake conditional -# HAVE_LD_VERSION_SCRIPT if so. VERSION-SCRIPT is a valid version script -# file. -AC_DEFUN([sj_LINKER_SCRIPT], -[ - AC_ARG_ENABLE([ld-version-script], - AS_HELP_STRING([--enable-ld-version-script], - [enable/disable linker version script (default is enabled when possible)]), - [have_ld_version_script=$enableval], []) - if test -z "$have_ld_version_script"; then - AC_MSG_CHECKING([if -Wl,--version-script works]) - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,--version-script=$1" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), - [have_ld_version_script=yes], [have_ld_version_script=no]) - LDFLAGS="$save_LDFLAGS" - AC_MSG_RESULT($have_ld_version_script) - fi - AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") -]) |