diff options
| author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:39 +0100 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:39 +0100 |
| commit | 8dfc46115527afe3706e9e4225e9ad019c97d695 (patch) | |
| tree | 372d5192b218455834781a0037c57e919a06b488 /gnulib-m4/relocatable-lib.m4 | |
| parent | 2291cf138eb72ad38d8c59b8b6f762875c8c4ff2 (diff) | |
| parent | 5f2b09982312c98863eb9a8dfe2c608b81f58259 (diff) | |
Merge tag 'upstream/0.9.6'
Upstream version 0.9.6
Diffstat (limited to 'gnulib-m4/relocatable-lib.m4')
| -rw-r--r-- | gnulib-m4/relocatable-lib.m4 | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/gnulib-m4/relocatable-lib.m4 b/gnulib-m4/relocatable-lib.m4 index c1923786..889e0992 100644 --- a/gnulib-m4/relocatable-lib.m4 +++ b/gnulib-m4/relocatable-lib.m4 @@ -1,5 +1,5 @@ -# relocatable-lib.m4 serial 5 -dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc. +# relocatable-lib.m4 serial 6 +dnl Copyright (C) 2003, 2005-2007, 2009-2015 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. @@ -10,9 +10,6 @@ dnl Support for relocatable libraries. AC_DEFUN([gl_RELOCATABLE_LIBRARY], [ AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) - if test $RELOCATABLE = yes; then - AC_LIBOBJ([relocatable]) - fi ]) AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], [ @@ -32,13 +29,6 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], fi ]) -dnl Like gl_RELOCATABLE_LIBRARY, except prepare for separate compilation -dnl (no AC_LIBOBJ). -AC_DEFUN([gl_RELOCATABLE_LIBRARY_SEPARATE], -[ - AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) -]) - dnl Support for relocatable packages for which it is a nop. AC_DEFUN([gl_RELOCATABLE_NOP], [ @@ -55,4 +45,3 @@ AC_DEFUN([gl_RELOCATABLE_NOP], AC_SUBST([RELOCATABLE]) AC_MSG_RESULT([$RELOCATABLE]) ]) - |