X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Frelocatable-lib.m4;h=d292a571f0ffb6b342a54f63604789d61c7adf8e;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=48e42971796060861e08548d3f6ca4199ed6808d;hpb=d93391bffb3c76c651161b5b8c199c358bc6256a;p=gnulib.git

diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4
index 48e429717..d292a571f 100644
--- a/m4/relocatable-lib.m4
+++ b/m4/relocatable-lib.m4
@@ -1,5 +1,5 @@
-# relocatable-lib.m4 serial 5
-dnl Copyright (C) 2003, 2005-2007, 2009 Free Software Foundation, Inc.
+# relocatable-lib.m4 serial 6
+dnl Copyright (C) 2003, 2005-2007, 2009-2014 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])
 ])
-