Make the installed package relocatable.

3 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c3e4e98..666d7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-24  Bruno Haible  <bruno@clisp.org>
+
+	Make the installed package relocatable.
+	* autogen.sh (GNULIB_MODULES): Add relocatable-lib-lgpl.
+	* lib/Makefile.am (AM_CPPFLAGS): Add DEPENDS_ON_LIBICONV definition.
+
 2009-04-23  Bruno Haible  <bruno@clisp.org>
 
 	Fix recognition of "nm" command.
diff --git a/autogen.sh b/autogen.sh
index ae33505..30426c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -398,6 +398,7 @@ if test $skip_gnulib = false; then
       unicase/ulc-casecmp
       unicase/ulc-casecoll
       unicase/ulc-casexfrm
+      relocatable-lib-lgpl
     '
     $GNULIB_TOOL --lib=libunistring --source-base=lib --m4-base=gnulib-m4 --tests-base=tests \
       --with-tests --lgpl --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 40704fd..5c0d8f8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -241,6 +241,9 @@ endif
 libunistring_la_LIBADD       += $(WOE32_LIBADD)
 libunistring_la_DEPENDENCIES += $(WOE32_LIBADD)
 
+# Parametrization of the 'relocatable-lib-lgpl' module.
+AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1
+
 # Libtool's library version information for libunistring.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=0