Add comments.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 82a874cf88f9f6f6daee06da570bd3f5b5309722..c5f73df5b4dcfc620dc86cb7e482a75759abd354 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29  Bruno Haible  <bruno@clisp.org>
+
+       * relocatable.m4: Add comments.
+
 2006-07-23  Bruno Haible  <bruno@clisp.org>
 
        * openmp.m4: New file.

diff --git a/gettext-tools/m4/relocatable.m4 b/gettext-tools/m4/relocatable.m4
index caee4c439d32495bf5ec30584213a33945f807e0..9962f90f173c1bd0d28e59d83301510e86b089d5 100644 (file)
--- a/gettext-tools/m4/relocatable.m4
+++ b/gettext-tools/m4/relocatable.m4
@@ -1,4 +1,4 @@
-# relocatable.m4 serial 5 (gettext-0.15)
+# relocatable.m4 serial 6 (gettext-0.15.1)
 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,
@@ -10,6 +10,12 @@ dnl Support for relocateble programs.
 AC_DEFUN([AC_RELOCATABLE],
 [
   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 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_REQUIRE([AC_LIB_LIBPATH])
   AC_REQUIRE([AC_RELOCATABLE_LIBRARY])