Skip to content

Commit cc27bbd

Browse files
committed
Add support for --enable-relocatable to libcharset.
1 parent 1a5a661 commit cc27bbd

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616
/doc/relocatable.texi
1717
/libcharset/INSTALL.generic
1818
/libcharset/build-aux/config.libpath
19+
/libcharset/build-aux/libtool-reloc
1920
/libcharset/m4/codeset.m4
2021
/libcharset/m4/fcntl-o.m4
2122
/libcharset/m4/glibc21.m4
23+
/libcharset/m4/lib-ld.m4
24+
/libcharset/m4/relocatable-lib.m4
25+
/libcharset/m4/relocatable.m4
2226
/libcharset/m4/visibility.m4
2327
/srclib/_Noreturn.h
2428
/srclib/Makefile.gnulib

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2019-03-04 Bruno Haible <bruno@clisp.org>
2+
3+
Add support for --enable-relocatable to libcharset.
4+
* autogen.sh: Copy some more files to libcharset/build-aux/ and
5+
libcharset/m4/.
6+
17
2019-03-04 Bruno Haible <bruno@clisp.org>
28

39
Update --enable-relocatable support after gnulib changed.

autogen.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# It also requires
1313
# - the gperf program.
1414

15-
# Copyright (C) 2003-2012, 2016, 2018 Free Software Foundation, Inc.
15+
# Copyright (C) 2003-2012, 2016, 2018-2019 Free Software Foundation, Inc.
1616
#
1717
# This program is free software: you can redistribute it and/or modify
1818
# it under the terms of the GNU General Public License as published by
@@ -75,10 +75,10 @@ make -f Makefile.devel totally-clean all || exit $?
7575
for file in INSTALL.generic; do
7676
cp -p $file libcharset/$file || exit $?
7777
done
78-
for file in config.guess config.libpath config.sub install-sh mkinstalldirs; do
78+
for file in config.guess config.libpath config.sub install-sh libtool-reloc mkinstalldirs; do
7979
cp -p build-aux/$file libcharset/build-aux/$file || exit $?
8080
done
81-
for file in codeset.m4 fcntl-o.m4 glibc21.m4 visibility.m4; do
81+
for file in codeset.m4 fcntl-o.m4 glibc21.m4 lib-ld.m4 relocatable.m4 relocatable-lib.m4 visibility.m4; do
8282
cp -p srcm4/$file libcharset/m4/$file || exit $?
8383
done
8484

libcharset/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2019-03-04 Bruno Haible <bruno@clisp.org>
2+
3+
Add support for --enable-relocatable.
4+
* libcharset/configure.ac: Invoke gl_RELOCATABLE.
5+
16
2019-01-27 Bruno Haible <bruno@clisp.org>
27

38
Accommodate a shell that is not in /bin/sh.

libcharset/configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ dnl checks for compiler output filename suffixes
4545
AC_OBJEXT
4646
AC_EXEEXT
4747

48-
dnl check for build configuration
48+
dnl checks for build configuration
4949

5050
LT_INIT([win32-dll])
51+
gl_RELOCATABLE
5152
gl_VISIBILITY
5253

5354
dnl checks for header files and functions

0 commit comments

Comments
 (0)