From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 16 Aug 2011 05:33:25 +0000 (-0700)
Subject: relocatable-prog: fix link error
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20110819030503%2Fgnulib;hp=513aefc6d7001728ad09ef645e3a3ce25d8d67f5;p=pspp

relocatable-prog: fix link error

* modules/relocatable-prog (configure.ac) [RELOCATABLE]: Also
invoke AC_LIBOBJ([relocatable]).  This invocation was previously
in the gl_RELOCATABLE_LIBRARY macro.  That invocation was moved
into modules/relocatable-lib without noticing that
modules/relocatable-prog also invokes gl_RELOCATABLE_LIBRARY and
also needs to build relocatable.c.
---

diff --git a/ChangeLog b/ChangeLog
index 6535a0d8c6..aab48d7724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-15  Ben Pfaff  <blp@cs.stanford.edu>
+
+	relocatable-prog: fix link error
+	* modules/relocatable-prog (configure.ac) [RELOCATABLE]: Also
+	invoke AC_LIBOBJ([relocatable]).  This invocation was previously
+	in the gl_RELOCATABLE_LIBRARY macro.  That invocation was moved
+	into modules/relocatable-lib without noticing that
+	modules/relocatable-prog also invokes gl_RELOCATABLE_LIBRARY and
+	also needs to build relocatable.c.
+
 2011-08-12  Paul Eggert  <eggert@cs.ucla.edu>
 
 	getaddrinfo: fix sh typo in gai_strerrorA decl checking
diff --git a/modules/relocatable-prog b/modules/relocatable-prog
index a7f50ac6b9..72bc253778 100644
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -28,6 +28,7 @@ configure.ac:
 gl_RELOCATABLE([$gl_source_base])
 if test $RELOCATABLE = yes; then
   AC_LIBOBJ([progreloc])
+  AC_LIBOBJ([relocatable])
 fi
 
 Makefile.am: