Skip to content

Commit 8f95ac2

Browse files
bhaiblebhaible
committed
Update from gettext: Support for mingw.
1 parent 2046698 commit 8f95ac2

File tree

4 files changed

+66
-48
lines changed

4 files changed

+66
-48
lines changed

‎ChangeLog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2005-07-05 Bruno Haible <bruno@clisp.org>
2+
3+
* m4/relocatable.m4 (AC_RELOCATABLE): On mingw, simply set
4+
SET_RELOCATABLE to a trivial value.
5+
16
2004-08-08 Bruno Haible <bruno@clisp.org>
27

38
* srclib/progreloc.c (xstrdup): Define as strdup if no xmalloc should

‎libcharset/m4/ChangeLog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2005-07-05 Bruno Haible <bruno@clisp.org>
2+
3+
* relocatable.m4 (AC_RELOCATABLE): On mingw, simply set
4+
SET_RELOCATABLE to a trivial value.
5+
16
2003-04-05 Bruno Haible <bruno@clisp.org>
27

38
Support for relocatable installation.

‎libcharset/m4/relocatable.m4‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# relocatable.m4 serial 2 (gettext-0.13)
2-
dnl Copyright (C) 2003 Free Software Foundation, Inc.
3-
dnl This file is free software, distributed under the terms of the GNU
4-
dnl General Public License. As a special exception to the GNU General
5-
dnl Public License, this file may be distributed as part of a program
6-
dnl that contains a configuration script generated by Autoconf, under
7-
dnl the same distribution terms as the rest of that program.
1+
# relocatable.m4 serial 3 (gettext-0.15)
2+
dnl Copyright (C) 2003, 2005 Free Software Foundation, Inc.
3+
dnl This file is free software; the Free Software Foundation
4+
dnl gives unlimited permission to copy and/or distribute it,
5+
dnl with or without modifications, as long as this notice is preserved.
86

97
dnl From Bruno Haible.
108

@@ -15,6 +13,7 @@ AC_DEFUN([AC_RELOCATABLE],
1513
AC_BEFORE([AC_PROG_INSTALL],[AC_RELOCATABLE])
1614
AC_REQUIRE([AC_LIB_LIBPATH])
1715
AC_REQUIRE([AC_RELOCATABLE_LIBRARY])
16+
is_noop=no
1817
use_elf_origin_trick=no
1918
if test $RELOCATABLE = yes; then
2019
# --enable-relocatable implies --disable-rpath
@@ -23,32 +22,37 @@ AC_DEFUN([AC_RELOCATABLE],
2322
AC_DEFINE([ENABLE_RELOCATABLE], 1,
2423
[Define to 1 if the package shall run at any location in the filesystem.])
2524
case "$host_os" in
25+
mingw*) is_noop=yes ;;
2626
linux*) use_elf_origin_trick=yes ;;
2727
esac
28-
if test $use_elf_origin_trick = yes; then
29-
dnl Use the dynamic linker's support for relocatable programs.
30-
case "$ac_aux_dir" in
31-
/*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
32-
*) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
33-
esac
34-
SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
28+
if test $is_noop = yes; then
29+
SET_RELOCATABLE="RELOCATABLE_LDFLAGS = :"
3530
else
36-
dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
37-
dnl consisting of more than one word - libtool doesn't support this.
38-
dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
39-
dnl 'install-strip' target.
40-
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_INSTALL_PROG=\"$INSTALL_PROGRAM\""
41-
case "$ac_aux_dir" in
42-
/*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
43-
*) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
44-
esac
31+
if test $use_elf_origin_trick = yes; then
32+
dnl Use the dynamic linker's support for relocatable programs.
33+
case "$ac_aux_dir" in
34+
/*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
35+
*) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
36+
esac
37+
SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
38+
else
39+
dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
40+
dnl consisting of more than one word - libtool doesn't support this.
41+
dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
42+
dnl 'install-strip' target.
43+
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_INSTALL_PROG=\"$INSTALL_PROGRAM\""
44+
case "$ac_aux_dir" in
45+
/*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
46+
*) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
47+
esac
48+
fi
4549
fi
4650
else
4751
SET_RELOCATABLE=
4852
fi
4953
AC_SUBST([SET_RELOCATABLE])
5054
AM_CONDITIONAL([RELOCATABLE_VIA_LD],
51-
[test $use_elf_origin_trick = yes])
55+
[test $is_noop = yes || test $use_elf_origin_trick = yes])
5256
])
5357

5458
dnl Support for relocatable libraries.

‎m4/relocatable.m4‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# relocatable.m4 serial 2 (gettext-0.13)
2-
dnl Copyright (C) 2003 Free Software Foundation, Inc.
3-
dnl This file is free software, distributed under the terms of the GNU
4-
dnl General Public License. As a special exception to the GNU General
5-
dnl Public License, this file may be distributed as part of a program
6-
dnl that contains a configuration script generated by Autoconf, under
7-
dnl the same distribution terms as the rest of that program.
1+
# relocatable.m4 serial 3 (gettext-0.15)
2+
dnl Copyright (C) 2003, 2005 Free Software Foundation, Inc.
3+
dnl This file is free software; the Free Software Foundation
4+
dnl gives unlimited permission to copy and/or distribute it,
5+
dnl with or without modifications, as long as this notice is preserved.
86

97
dnl From Bruno Haible.
108

@@ -15,6 +13,7 @@ AC_DEFUN([AC_RELOCATABLE],
1513
AC_BEFORE([AC_PROG_INSTALL],[AC_RELOCATABLE])
1614
AC_REQUIRE([AC_LIB_LIBPATH])
1715
AC_REQUIRE([AC_RELOCATABLE_LIBRARY])
16+
is_noop=no
1817
use_elf_origin_trick=no
1918
if test $RELOCATABLE = yes; then
2019
# --enable-relocatable implies --disable-rpath
@@ -23,32 +22,37 @@ AC_DEFUN([AC_RELOCATABLE],
2322
AC_DEFINE([ENABLE_RELOCATABLE], 1,
2423
[Define to 1 if the package shall run at any location in the filesystem.])
2524
case "$host_os" in
25+
mingw*) is_noop=yes ;;
2626
linux*) use_elf_origin_trick=yes ;;
2727
esac
28-
if test $use_elf_origin_trick = yes; then
29-
dnl Use the dynamic linker's support for relocatable programs.
30-
case "$ac_aux_dir" in
31-
/*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
32-
*) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
33-
esac
34-
SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
28+
if test $is_noop = yes; then
29+
SET_RELOCATABLE="RELOCATABLE_LDFLAGS = :"
3530
else
36-
dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
37-
dnl consisting of more than one word - libtool doesn't support this.
38-
dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
39-
dnl 'install-strip' target.
40-
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_INSTALL_PROG=\"$INSTALL_PROGRAM\""
41-
case "$ac_aux_dir" in
42-
/*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
43-
*) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
44-
esac
31+
if test $use_elf_origin_trick = yes; then
32+
dnl Use the dynamic linker's support for relocatable programs.
33+
case "$ac_aux_dir" in
34+
/*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
35+
*) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
36+
esac
37+
SET_RELOCATABLE="RELOCATABLE_LDFLAGS = \"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
38+
else
39+
dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
40+
dnl consisting of more than one word - libtool doesn't support this.
41+
dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
42+
dnl 'install-strip' target.
43+
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_INSTALL_PROG=\"$INSTALL_PROGRAM\""
44+
case "$ac_aux_dir" in
45+
/*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
46+
*) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
47+
esac
48+
fi
4549
fi
4650
else
4751
SET_RELOCATABLE=
4852
fi
4953
AC_SUBST([SET_RELOCATABLE])
5054
AM_CONDITIONAL([RELOCATABLE_VIA_LD],
51-
[test $use_elf_origin_trick = yes])
55+
[test $is_noop = yes || test $use_elf_origin_trick = yes])
5256
])
5357

5458
dnl Support for relocatable libraries.

0 commit comments

Comments
 (0)