From: Bruno Haible Date: Thu, 1 Mar 2007 02:14:04 +0000 (+0000) Subject: New modules relocatable, relocatable-lib, relocatable-script. X-Git-Tag: cvs-readonly~946 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=0c1478d961040909a8d9754b666db4b310357b80;p=gnulib.git New modules relocatable, relocatable-lib, relocatable-script. --- diff --git a/ChangeLog b/ChangeLog index fe12899dc..101e23d24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2007-02-26 Ben Pfaff + Bruno Haible + + * build-aux/install-reloc: Compile also c-ctype.c. + * build-aux/relocatable.sh.in: New file. + * doc/relocatable.texi: New file. + * doc/relocatable-maint.texi: New file. + * doc/gnulib.texi: Include relocatable-maint.texi. + * lib/progreloc.c: Include unistd.h unconditionally. + * lib/relocwrapper.c: Include unistd.h unconditionally. + Include c-ctype.h. + (add_dotbin): Use c_tolower. + * m4/relocatable-lib.m4: New file, extracted from m4/relocatable.m4. + (gl_RELOCATABLE_LIBRARY): Renamed from AC_RELOCATABLE_LIBRARY. + (gl_RELOCATABLE_NOP): Renamed from AC_RELOCATABLE_NOP. + * m4/relocatable.m4 (AC_RELOCATABLE_LIBRARY, AC_RELOCATABLE_NOP): Move + to m4/relocatable-lib.m4. + (gl_RELOCATABLE): Renamed from AC_RELOCATABLE. Set also + RELOCATABLE_CONFIG_H_DIR, RELOCATABLE_SRC_DIR, RELOCATABLE_BUILD_DIR. + (gl_RELOCATABLE_BODY): Renamed from AC_RELOCATABLE_BODY. Don't + require obsolete macro AC_EXEEXT. Don't check for unistd.h. Don't set + SET_RELOCATABLE. Instead set RELOCATABLE_LDFLAGS, INSTALL_PROGRAM_ENV. + * modules/relocatable: New file. + * modules/relocatable-lib: New file. + * modules/relocatable-script: New file. + 2007-02-28 Bruno Haible Import --enable-relocatable infrastructure. diff --git a/build-aux/install-reloc b/build-aux/install-reloc index 63b95e8bd..4c2c332b5 100755 --- a/build-aux/install-reloc +++ b/build-aux/install-reloc @@ -119,7 +119,7 @@ test -n "$libdirs" || exit 0 # Compile wrapper. installdir=`echo "$destprog" | sed -e 's,/[^/]*$,,'` -func_verbose $compile_command -I"$builddir" -I"$srcdir" -I"$config_h_dir" -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" -D"EXEEXT=\"$exeext\"" "$srcdir"/relocwrapper.c "$srcdir"/progname.c "$srcdir"/progreloc.c "$srcdir"/xreadlink.c "$srcdir"/readlink.c "$srcdir"/canonicalize-lgpl.c "$srcdir"/allocsa.c "$srcdir"/relocatable.c "$srcdir"/setenv.c "$srcdir"/strerror.c -o "$destprog.wrapper$exeext" || exit $? +func_verbose $compile_command -I"$builddir" -I"$srcdir" -I"$config_h_dir" -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" -D"EXEEXT=\"$exeext\"" "$srcdir"/relocwrapper.c "$srcdir"/progname.c "$srcdir"/progreloc.c "$srcdir"/xreadlink.c "$srcdir"/readlink.c "$srcdir"/canonicalize-lgpl.c "$srcdir"/allocsa.c "$srcdir"/relocatable.c "$srcdir"/setenv.c "$srcdir"/strerror.c "$srcdir"/c-ctype.c -o "$destprog.wrapper$exeext" || exit $? # Rename $destprog.wrapper -> $destprog -> $destprog.bin. ln -f "$destprog$exeext" "$destprog.bin$exeext" \ diff --git a/doc/gnulib.texi b/doc/gnulib.texi index 22b4cf7e2..032fa4326 100644 --- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -1,5 +1,5 @@ \input texinfo @c -*-texinfo-*- -@comment $Id: gnulib.texi,v 1.31 2007-01-03 18:51:20 karl Exp $ +@comment $Id: gnulib.texi,v 1.32 2007-03-01 02:14:04 haible Exp $ @comment %**start of header @setfilename gnulib.info @settitle GNU Gnulib @@ -7,7 +7,7 @@ @syncodeindex pg cp @comment %**end of header -@set UPDATED $Date: 2007-01-03 18:51:20 $ +@set UPDATED $Date: 2007-03-01 02:14:04 $ @copying This manual is for GNU Gnulib (updated @value{UPDATED}), @@ -365,6 +365,7 @@ Of course the license texts themselves should not be changed at all. * gcd:: * inet_ntoa:: * Regular expressions:: +* Supporting Relocation:: @end menu @include quote.texi @@ -372,6 +373,7 @@ Of course the license texts themselves should not be changed at all. @include ctime.texi @include gcd.texi @include inet_ntoa.texi +@include relocatable-maint.texi @node Regular expressions @section Regular expressions diff --git a/lib/progreloc.c b/lib/progreloc.c index cb9795999..edc3db606 100644 --- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -27,9 +27,7 @@ #include #include #include -#if HAVE_UNISTD_H -# include -#endif +#include #include /* Get declaration of _NSGetExecutablePath on MacOS X 10.2 or newer. */ diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c index c303803a8..8acac3d0a 100644 --- a/lib/relocwrapper.c +++ b/lib/relocwrapper.c @@ -1,5 +1,5 @@ /* Relocating wrapper program. - Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -28,6 +28,7 @@ -> setenv -> allocsa -> strerror + -> c-ctype Macros that need to be set while compiling this file: - ENABLE_RELOCATABLE 1 @@ -47,14 +48,13 @@ #include #include #include -#if HAVE_UNISTD_H -# include -#endif +#include #include #include "progname.h" #include "relocatable.h" #include "setenv.h" +#include "c-ctype.h" /* Return a copy of the filename, with an extra ".bin" at the end. More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}". */ @@ -83,8 +83,7 @@ add_dotbin (const char *filename) { unsigned char c1 = *s1; unsigned char c2 = *s2; - if ((c1 >= 'A' && c1 <= 'Z' ? c1 - 'A' + 'a' : c1) - != (c2 >= 'A' && c2 <= 'Z' ? c2 - 'A' + 'a' : c2)) + if (c_tolower (c1) != c_tolower (c2)) goto simple_append; } /* Insert ".bin" before EXEEXT or its equivalent. */ diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4 new file mode 100644 index 000000000..398f5c50f --- /dev/null +++ b/m4/relocatable-lib.m4 @@ -0,0 +1,38 @@ +# relocatable-lib.m4 serial 1 +dnl Copyright (C) 2003, 2005-2006, 2007 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl Support for relocatable libraries. +AC_DEFUN([gl_RELOCATABLE_LIBRARY], +[ + AC_REQUIRE([gl_RELOCATABLE_NOP]) + dnl Easier to put this here once, instead of into the DEFS of each Makefile. + if test "X$prefix" = "XNONE"; then + reloc_final_prefix="$ac_default_prefix" + else + reloc_final_prefix="$prefix" + fi + AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"], + [Define to the value of ${prefix}, as a string.]) +]) + +dnl Support for relocatable packages for which it is a nop. +AC_DEFUN([gl_RELOCATABLE_NOP], +[ + AC_MSG_CHECKING([whether to activate relocatable installation]) + AC_ARG_ENABLE(relocatable, + [ --enable-relocatable install a package that can be moved in the filesystem], + [if test "$enableval" != no; then + RELOCATABLE=yes + else + RELOCATABLE=no + fi + ], RELOCATABLE=no) + AC_SUBST(RELOCATABLE) + AC_MSG_RESULT([$RELOCATABLE]) +]) + diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 index 0e463f47f..624d7a8c9 100644 --- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,33 +1,38 @@ -# relocatable.m4 serial 7 (gettext-0.16) -dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. +# relocatable.m4 serial 8 +dnl Copyright (C) 2003, 2005-2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -dnl Support for relocateble programs. -AC_DEFUN([AC_RELOCATABLE], +dnl gl_RELOCATABLE([RELOCWRAPPER-DIR]) +dnl ---------------------------------------------------------- +dnl Support for relocatable programs. +dnl Supply RELOCWRAPPER-DIR as the directory where relocwrapper.c may be found. +AC_DEFUN([gl_RELOCATABLE], [ - AC_REQUIRE([AC_RELOCATABLE_BODY]) + AC_REQUIRE([gl_RELOCATABLE_BODY]) if test $RELOCATABLE = yes; then AC_LIBOBJ([relocatable]) fi + : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'} + RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base" + RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base" ]) -dnl The guts of AC_RELOCATABLE. Needs to be expanded only once. -AC_DEFUN([AC_RELOCATABLE_BODY], +dnl The guts of gl_RELOCATABLE. Needs to be expanded only once. +AC_DEFUN([gl_RELOCATABLE_BODY], [ AC_REQUIRE([AC_PROG_INSTALL]) dnl This AC_BEFORE invocation leads to unjustified autoconf warnings - dnl when AC_RELOCATABLE_BODY is invoked more than once. + dnl when gl_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_BODY]) + AC_BEFORE([AC_PROG_INSTALL],[gl_RELOCATABLE_BODY]) AC_REQUIRE([AC_LIB_LIBPATH]) - AC_REQUIRE([AC_RELOCATABLE_LIBRARY]) - AC_REQUIRE([AC_EXEEXT]) + AC_REQUIRE([gl_RELOCATABLE_LIBRARY]) is_noop=no use_elf_origin_trick=no if test $RELOCATABLE = yes; then @@ -35,14 +40,15 @@ AC_DEFUN([AC_RELOCATABLE_BODY], enable_rpath=no 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]) + AC_CHECK_HEADERS([mach-o/dyld.h]) AC_CHECK_FUNCS([_NSGetExecutablePath]) case "$host_os" in mingw*) is_noop=yes ;; linux*) use_elf_origin_trick=yes ;; esac if test $is_noop = yes; then - SET_RELOCATABLE="RELOCATABLE_LDFLAGS = :" + RELOCATABLE_LDFLAGS=: + AC_SUBST([RELOCATABLE_LDFLAGS]) else if test $use_elf_origin_trick = yes; then dnl Use the dynamic linker's support for relocatable programs. @@ -50,55 +56,30 @@ AC_DEFUN([AC_RELOCATABLE_BODY], /*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;; *) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;; esac - SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\"" + RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\"" + AC_SUBST([RELOCATABLE_LDFLAGS]) else dnl Unfortunately we cannot define INSTALL_PROGRAM to a command dnl consisting of more than one word - libtool doesn't support this. dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the dnl 'install-strip' target. - SET_RELOCATABLE="INSTALL_PROGRAM_ENV = RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\"" + INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\"" + AC_SUBST([INSTALL_PROGRAM_ENV]) case "$ac_aux_dir" in /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;; *) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;; esac fi fi - else - SET_RELOCATABLE= fi - AC_SUBST([SET_RELOCATABLE]) AM_CONDITIONAL([RELOCATABLE_VIA_LD], [test $is_noop = yes || test $use_elf_origin_trick = yes]) -]) - -dnl Support for relocatable libraries. -AC_DEFUN([AC_RELOCATABLE_LIBRARY], -[ - AC_REQUIRE([AC_RELOCATABLE_NOP]) - dnl Easier to put this here once, instead of into the DEFS of each Makefile. - if test "X$prefix" = "XNONE"; then - reloc_final_prefix="$ac_default_prefix" - else - reloc_final_prefix="$prefix" - fi - AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"], - [Define to the value of ${prefix}, as a string.]) -]) -dnl Support for relocatable packages for which it is a nop. -AC_DEFUN([AC_RELOCATABLE_NOP], -[ - AC_MSG_CHECKING([whether to activate relocatable installation]) - AC_ARG_ENABLE(relocatable, - [ --enable-relocatable install a package that can be moved in the filesystem], - [if test "$enableval" != no; then - RELOCATABLE=yes - else - RELOCATABLE=no - fi - ], RELOCATABLE=no) - AC_SUBST(RELOCATABLE) - AC_MSG_RESULT([$RELOCATABLE]) + dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty. + AC_SUBST([RELOCATABLE_LIBRARY_PATH]) + AC_SUBST([RELOCATABLE_CONFIG_H_DIR]) + AC_SUBST([RELOCATABLE_SRC_DIR]) + AC_SUBST([RELOCATABLE_BUILD_DIR]) ]) dnl Determine the platform dependent parameters needed to use relocatability: