--- gettext/build-aux/install-reloc 2006-11-09 06:26:40.000000000 -0800 +++ gnulib.relocatable/build-aux/install-reloc 2007-02-19 22:31:39.000000000 -0800 @@ -119,7 +119,7 @@ # 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" \ --- gettext/gettext-runtime/gnulib-lib/relocatable.c 2006-09-15 05:01:51.000000000 -0700 +++ gnulib.relocatable/lib/relocatable.c 2007-02-25 17:22:30.000000000 -0800 @@ -1,5 +1,5 @@ /* Provide relocatable packages. - Copyright (C) 2003-2006 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2007 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify it @@ -17,14 +17,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Tell glibc's to provide a prototype for getline(). - This must come before because may include - , and once has been included, it's too late. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - #include /* Specification. */ @@ -224,6 +216,8 @@ while (rpi > rel_installdir && cpi > cp_base) { + unsigned char c1, c2; + rpi--; cpi--; if (ISSLASH (*rpi) || ISSLASH (*cpi)) @@ -232,16 +226,18 @@ same = true; break; } + /* Do case-insensitive comparison if the filesystem is always or often case-insensitive. It's better to accept the comparison if the difference is only in case, rather than to fail. */ + c1 = *rpi; + c2 = *cpi; #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */ - if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi) - != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi)) + if (c_toupper (c1) != c_toupper (c2)) break; #else - if (*rpi != *cpi) + if (c1 != c2) break; #endif } --- gettext/gettext-runtime/gnulib-lib/relocwrapper.c 2006-09-15 05:01:51.000000000 -0700 +++ gnulib.relocatable/lib/relocwrapper.c 2007-02-19 22:02:58.000000000 -0800 @@ -1,5 +1,5 @@ /* Relocating wrapper program. - Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2006, 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 @@ { 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. */ --- gettext/gettext-runtime/gnulib-m4/relocatable.m4 2006-10-26 04:50:38.000000000 -0700 +++ gnulib.relocatable/m4/relocatable.m4 2007-02-25 18:09:29.000000000 -0800 @@ -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 @@ 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,29 @@ /*) 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]) + AC_SUBST([RELOCATABLE_LIBRARY_PATH]) + AC_SUBST([RELOCATABLE_SRC_DIR]) + AC_SUBST([RELOCATABLE_BUILD_DIR]) + AC_SUBST([RELOCATABLE_CONFIG_H_DIR]) ]) dnl Determine the platform dependent parameters needed to use relocatability: