Make --enable-relocatable work again.

diff --git a/ChangeLog b/ChangeLog
index d7595f45dbfb33e41166eaa2b9fd0e4c1faf77ec..6513656b850cc6255d3d7883816a6acc2984722c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        * gettext-0.16 released.
 
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh (GNULIB_MODULES_OTHER): For libgettextpo, add
+       gettext-tools-libgettextpo-misc.
+
 2006-10-25  Bruno Haible  <bruno@clisp.org>
 
        * build-aux/install-reloc: Define IN_RELOCWRAPPER for the compilation.

diff --git a/autogen.sh b/autogen.sh
index bd498a6598d160979a6c01d1c3f79a16799559a8..933385bec0de26f1771ed78b084ebaf9be5f413f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -199,7 +199,9 @@ if test -n "$GNULIB_TOOL"; then
   xstriconv
   xvasprintf
   '
-  GNULIB_MODULES_OTHER=''
+  GNULIB_MODULES_OTHER='
+  gettext-tools-libgettextpo-misc
+  '
   $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local \
     --import $GNULIB_MODULES_FOR_LIBGETTEXTPO $GNULIB_MODULES_OTHER
 fi

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 1e4369271ec53385fc40d7d2e1e025902408d36f..7db8a0de8e2dec039ad5ee88b72dd59ee6690d69 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -2,6 +2,11 @@
 
        * gettext-0.16 released.
 
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Don't invoke AC_RELOCATABLE; now done through the
+       relocwrapper module.
+
 2006-10-25  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (DLL_VARIABLE): Define to empty if IN_RELOCWRAPPER is

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index dd28a427b9d3d480a9a40bf3d75f1f49de1c4481..2d14004e8ff7c8191290d02b8e206bcb8e10ed17 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -67,8 +67,6 @@ gl_WOE32_DLL
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_RELOCATABLE
-
 dnl Checks for libraries.
 
 dnl These are the only lines required to internationalize the package.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 94bc64b8175d582fdc7bf1e4969c2ad84583deee..6a09c711a5c9bd200e9fafe0e2197cf994808dcf 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -2,6 +2,11 @@
 
        * gettext-0.16 released.
 
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Don't invoke AC_RELOCATABLE; now done through the
+       relocwrapper and gettext-tools-libgettextpo-misc modules.
+
 2006-10-25  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (DLL_VARIABLE): Define to empty if IN_RELOCWRAPPER is

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index d517e15e541e89f540cba3ce48f30efc982fda2d..638c32ea9040f54efb16ec52fa544fee6e740879 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -98,8 +98,6 @@ case "$host_os" in
 esac
 AC_SUBST([LTNOUNDEF])
 
-AC_RELOCATABLE
-
 dnl Checks for libraries.
 
 dnl These are the only lines required to internationalize the package.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 795936a441ddea3ebb9f4aa7d4f174c0a9ed12a8..65d3c55e3f35a42e280453927d9f57f5584412f9 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -2,6 +2,16 @@
 
        * gettext-0.16 released.
 
+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

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 8aad33860c2032b7c241904de168f36ca0002ee8..5103484c82ca3cb4fd33b74b5b546fda43187e3e 100644 (file)
--- 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 ac4127c858ec123d2755ee35b751cdd646f846e4..0e463f47f3378c940c96321f7952aa2f3b898c79 100644 (file)
--- 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,
@@ -8,15 +8,23 @@ 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 c03233ccf15ce86c3ea7d13aee0e574eba5c6e43..05658789bfd627bfca2b8b52f5146311c4f7f393 100644 (file)
--- 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