Moved --enable-relocatable infrastructure to gnulib.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index f365da4fc32027836fe1a83ab96d06d00dccd7bc..a8e54834cb48222253fb1855c16bb236a7ad22f7 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-04  Bruno Haible  <bruno@clisp.org>
+
+       Moved --enable-relocatable infrastructure to gnulib.
+       * modules/gettext-tools-libgettextpo-misc: Remove file.
+       * modules/progreloc: Remove file.
+       * modules/relocatable: Remove file.
+       * modules/relocwrapper: Remove file.
+       * lib/strerror.c.diff: Remove file.
+       * Makefile.am (EXTRA_DIST): Remove these files.
+
 2007-02-28  Bruno Haible  <bruno@clisp.org>
 
        Move relocatability infrastructure to gnulib.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 1d92cd726eaf13655e4cfbe033a3fa7e4d1229d3..b3361bffdb84df3aa4d774b5bb28f043a37d9445 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -229,7 +229,6 @@ lib/ostream.oo.h \
 lib/progname.h.diff \
 lib/propername.c \
 lib/propername.h \
-lib/strerror.c.diff \
 lib/styled-ostream.oo.c \
 lib/styled-ostream.oo.h \
 lib/term-ostream.oo.c \
@@ -280,7 +279,6 @@ modules/gcj \
 modules/gen-lbrkprop \
 modules/gettext-runtime-misc \
 modules/gettext-tools-misc \
-modules/gettext-tools-libgettextpo-misc \
 modules/hash \
 modules/html-ostream \
 modules/html-styled-ostream \
@@ -293,12 +291,9 @@ modules/memory-ostream \
 modules/moo \
 modules/moo-tests \
 modules/ostream \
-modules/progreloc \
 modules/propername \
 modules/quotearg.diff \
 modules/quote.diff \
-modules/relocatable \
-modules/relocwrapper \
 modules/styled-ostream \
 modules/termcap \
 modules/termcap-h \

diff --git a/gnulib-local/lib/strerror.c.diff b/gnulib-local/lib/strerror.c.diff
deleted file mode 100644 (file)
index d6bba5e..0000000
--- a/gnulib-local/lib/strerror.c.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-*** gnulib/lib/strerror.c      2005-09-19 19:28:15.000000000 +0200
---- srclib/strerror.c  2005-10-10 13:00:57.000000000 +0200
-***************
-*** 21,26 ****
---- 21,28 ----
-  # include <config.h>
-  #endif
-  
-+ #if !HAVE_STRERROR
-+ 
-  #include <limits.h>
-  
-  /* Don't include <stdio.h>, since it may or may not declare
-***************
-*** 47,49 ****
---- 49,59 ----
-    else
-      return sys_errlist[n];
-  }
-+ 
-+ #else
-+ 
-+ /* This declaration is solely to ensure that after preprocessing
-+    this file is never empty.  */
-+ typedef int dummy;
-+ 
-+ #endif

diff --git a/gnulib-local/modules/gettext-tools-libgettextpo-misc b/gnulib-local/modules/gettext-tools-libgettextpo-misc
deleted file mode 100644 (file)
index d372762..0000000
--- a/gnulib-local/modules/gettext-tools-libgettextpo-misc
+++ /dev/null
@@ -1,21 +0,0 @@
-Description:
-
-Files:
-m4/relocatable.m4
-
-Depends-on:
-relocatable
-
-configure.ac:
-AC_RELOCATABLE
-
-Makefile.am:
-
-Include:
-
-License:
-GPL
-
-Maintainer:
-Bruno Haible
-

diff --git a/gnulib-local/modules/progreloc b/gnulib-local/modules/progreloc
deleted file mode 100644 (file)
index 0df36a8..0000000
--- a/gnulib-local/modules/progreloc
+++ /dev/null
@@ -1,26 +0,0 @@
-Description:
-Support for relocatable installation.
-
-Files:
-lib/progreloc.c
-
-Depends-on:
-canonicalize-lgpl
-relocatable
-stdbool
-xreadlink
-
-configure.ac:
-
-Makefile.am:
-AM_CPPFLAGS += -DEXEEXT=\"$(EXEEXT)\"
-lib_SOURCES += progreloc.c
-
-Include:
-
-License:
-GPL
-
-Maintainer:
-Bruno Haible
-

diff --git a/gnulib-local/modules/relocatable b/gnulib-local/modules/relocatable
deleted file mode 100644 (file)
index 804585a..0000000
--- a/gnulib-local/modules/relocatable
+++ /dev/null
@@ -1,22 +0,0 @@
-Description:
-Support for relocatable installation.
-
-Files:
-lib/relocatable.h
-lib/relocatable.c
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-
-Include:
-"relocatable.h"
-
-License:
-LGPL
-
-Maintainer:
-Bruno Haible
-

diff --git a/gnulib-local/modules/relocwrapper b/gnulib-local/modules/relocwrapper
deleted file mode 100644 (file)
index c46a55c..0000000
--- a/gnulib-local/modules/relocwrapper
+++ /dev/null
@@ -1,27 +0,0 @@
-Description:
-Support for relocatable installation.
-
-Files:
-lib/relocwrapper.c
-m4/relocatable.m4
-
-Depends-on:
-progname
-progreloc
-relocatable
-setenv
-strerror
-
-configure.ac:
-AC_RELOCATABLE
-
-Makefile.am:
-
-Include:
-
-License:
-GPL
-
-Maintainer:
-Bruno Haible
-