From: Bruno Haible Date: Thu, 26 Oct 2006 11:50:38 +0000 (+0000) Subject: Make --enable-relocatable work again. X-Git-Tag: 0.16.x-branchpoint~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4a342c915d77c7567a2e87fcdb78db744aa4a7;p=thirdparty%2Fgettext.git Make --enable-relocatable work again. --- diff --git a/ChangeLog b/ChangeLog index d7595f45d..6513656b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ * gettext-0.16 released. +2006-10-25 Bruno Haible + + * autogen.sh (GNULIB_MODULES_OTHER): For libgettextpo, add + gettext-tools-libgettextpo-misc. + 2006-10-25 Bruno Haible * build-aux/install-reloc: Define IN_RELOCWRAPPER for the compilation. diff --git a/autogen.sh b/autogen.sh index bd498a659..933385bec 100755 --- 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 1e4369271..7db8a0de8 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -2,6 +2,11 @@ * gettext-0.16 released. +2006-10-25 Bruno Haible + + * configure.ac: Don't invoke AC_RELOCATABLE; now done through the + relocwrapper module. + 2006-10-25 Bruno Haible * configure.ac (DLL_VARIABLE): Define to empty if IN_RELOCWRAPPER is diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index dd28a427b..2d14004e8 100644 --- 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 94bc64b81..6a09c711a 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -2,6 +2,11 @@ * gettext-0.16 released. +2006-10-25 Bruno Haible + + * configure.ac: Don't invoke AC_RELOCATABLE; now done through the + relocwrapper and gettext-tools-libgettextpo-misc modules. + 2006-10-25 Bruno Haible * configure.ac (DLL_VARIABLE): Define to empty if IN_RELOCWRAPPER is diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index d517e15e5..638c32ea9 100644 --- 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 795936a44..65d3c55e3 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -2,6 +2,16 @@ * gettext-0.16 released. +2006-10-25 Bruno Haible + + * 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 * lib/gettext.h (_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS): Define to diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index 8aad33860..5103484c8 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 ac4127c85..0e463f47f 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, @@ -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 c03233ccf..05658789b 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