Make --enable-relocatable work again.

4 files changed, 23 insertions, 7 deletions

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 795936a..65d3c55 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -4,6 +4,16 @@
 
 2006-10-25  Bruno Haible  <bruno@clisp.org>
 
+	* m4/relocatable.m4 (AC_RELOCATABLE_BODY): Renamed from AC_RELOCATABLE,
+	without the AC_LIBOBJ invocation.
+	(AC_RELOCATABLE): New macro. Invoke AC_LIBOBJ here.
+	* modules/relocwrapper (configure.ac): Invoke AC_RELOCATABLE instead
+	of requiring it.
+	* modules/gettext-tools-libgettextpo-misc: New file.
+	* Makefile.am (EXTRA_DIST): Add it.
+
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
 	* lib/gettext.h (_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS): Define to
 	false for non-gcc C++ compilers.
 	Reported by Nelson H. F. Beebe <beebe@math.utah.edu>.
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 8aad338..5103484 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -96,6 +96,7 @@ modules/gcj \
 modules/gen-lbrkprop \
 modules/gettext-runtime-misc \
 modules/gettext-tools-misc \
+modules/gettext-tools-libgettextpo-misc \
 modules/hash \
 modules/java \
 modules/javacomp.diff \
diff --git a/gnulib-local/m4/relocatable.m4 b/gnulib-local/m4/relocatable.m4
index ac4127c..0e463f4 100644
--- a/gnulib-local/m4/relocatable.m4
+++ b/gnulib-local/m4/relocatable.m4
@@ -1,4 +1,4 @@
-# relocatable.m4 serial 6 (gettext-0.16)
+# relocatable.m4 serial 7 (gettext-0.16)
 dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,14 +9,22 @@ dnl From Bruno Haible.
 dnl Support for relocateble programs.
 AC_DEFUN([AC_RELOCATABLE],
 [
+  AC_REQUIRE([AC_RELOCATABLE_BODY])
+  if test $RELOCATABLE = yes; then
+    AC_LIBOBJ([relocatable])
+  fi
+])
+dnl The guts of AC_RELOCATABLE. Needs to be expanded only once.
+AC_DEFUN([AC_RELOCATABLE_BODY],
+[
   AC_REQUIRE([AC_PROG_INSTALL])
   dnl This AC_BEFORE invocation leads to unjustified autoconf warnings
-  dnl when AC_RELOCATABLE is invoked more than once.
+  dnl when AC_RELOCATABLE_BODY is invoked more than once.
   dnl We need this AC_BEFORE because AC_PROG_INSTALL is documented to
   dnl overwrite earlier settings of INSTALL and INSTALL_PROGRAM (even
   dnl though in autoconf-2.52..2.60 it doesn't do so), but we want this
   dnl macro's setting of INSTALL_PROGRAM to persist.
-  AC_BEFORE([AC_PROG_INSTALL],[AC_RELOCATABLE])
+  AC_BEFORE([AC_PROG_INSTALL],[AC_RELOCATABLE_BODY])
   AC_REQUIRE([AC_LIB_LIBPATH])
   AC_REQUIRE([AC_RELOCATABLE_LIBRARY])
   AC_REQUIRE([AC_EXEEXT])
@@ -25,7 +33,6 @@ AC_DEFUN([AC_RELOCATABLE],
   if test $RELOCATABLE = yes; then
     # --enable-relocatable implies --disable-rpath
     enable_rpath=no
-    AC_LIBOBJ([relocatable])
     AC_DEFINE([ENABLE_RELOCATABLE], 1,
       [Define to 1 if the package shall run at any location in the filesystem.])
     AC_CHECK_HEADERS([unistd.h mach-o/dyld.h])
diff --git a/gnulib-local/modules/relocwrapper b/gnulib-local/modules/relocwrapper
index c03233c..0565878 100644
--- a/gnulib-local/modules/relocwrapper
+++ b/gnulib-local/modules/relocwrapper
@@ -13,9 +13,7 @@ setenv
 strerror
 
 configure.ac:
-dnl Use AC_REQUIRE here, because autoconf warns when AC_RELOCATABLE is
-dnl expanded more than once.
-AC_REQUIRE([AC_RELOCATABLE])
+AC_RELOCATABLE
 
 Makefile.am:
 EXTRA_DIST += relocwrapper.c