X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frelocatable.m4;h=27f5724a542dbc4cfc7e2b0b48c521e82d0967d4;hb=79c6120f531843f8933ac1acbf6ea8df20d5024e;hp=fc24f79f8e17d6ce6e1fd66ef80152f0eb8823a8;hpb=a5f3d7882be93b0dd5244e8e2cfb06ef1094c981;p=gnulib.git

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index fc24f79f8..27f5724a5 100644
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,4 +1,4 @@
-# relocatable.m4 serial 9
+# relocatable.m4 serial 11
 dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,8 +13,9 @@ dnl Supply RELOCWRAPPER-DIR as the directory where relocwrapper.c may be found.
 AC_DEFUN([gl_RELOCATABLE],
 [
   AC_REQUIRE([gl_RELOCATABLE_BODY])
+  gl_RELOCATABLE_LIBRARY
   if test $RELOCATABLE = yes; then
-    AC_LIBOBJ([relocatable])
+    AC_LIBOBJ([progreloc])
   fi
   : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
   RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
@@ -32,7 +33,7 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
   dnl macro's setting of INSTALL_PROGRAM to persist.
   AC_BEFORE([AC_PROG_INSTALL],[gl_RELOCATABLE_BODY])
   AC_REQUIRE([AC_LIB_LIBPATH])
-  AC_REQUIRE([gl_RELOCATABLE_LIBRARY])
+  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
   is_noop=no
   use_elf_origin_trick=no
   if test $RELOCATABLE = yes; then