Skip to content

Commit 1a5a661

Browse files
committed
Update --enable-relocatable support after gnulib changed.
1 parent 1badfd5 commit 1a5a661

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/build-aux/config.libpath
1212
/build-aux/config.rpath
1313
/build-aux/install-reloc
14+
/build-aux/libtool-reloc
1415
/build-aux/reloc-ldflags
1516
/doc/relocatable.texi
1617
/libcharset/INSTALL.generic
@@ -133,6 +134,7 @@
133134
/srcm4/iconv.m4
134135
/srcm4/include_next.m4
135136
/srcm4/intdiv0.m4
137+
/srcm4/intl-thread-locale.m4
136138
/srcm4/intl.m4
137139
/srcm4/intldir.m4
138140
/srcm4/intlmacosx.m4

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+
Update --enable-relocatable support after gnulib changed.
4+
* configure.ac: Move the LT_INIT invocation before the gl_RELOCATABLE
5+
invocation. Remove unused argument to gl_RELOCATABLE.
6+
17
2019-01-27 Bruno Haible <bruno@clisp.org>
28

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

configure.ac

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dnl Copyright (C) 1999-2011, 2016, 2018 Free Software Foundation, Inc.
1+
dnl Copyright (C) 1999-2011, 2016, 2018-2019 Free Software Foundation, Inc.
22
dnl This file is part of the GNU LIBICONV Library.
33
dnl
44
dnl The GNU LIBICONV Library is free software; you can redistribute it
@@ -50,9 +50,10 @@ dnl checks for UNIX variants that set DEFS
5050

5151
gl_EARLY
5252

53-
dnl checks for installer options
53+
dnl checks for build configuration
5454

55-
gl_RELOCATABLE([srclib])
55+
LT_INIT([disable-static win32-dll])
56+
gl_RELOCATABLE
5657

5758
AC_ARG_ENABLE([extra-encodings],
5859
[AC_HELP_STRING([--enable-extra-encodings],
@@ -74,9 +75,7 @@ dnl checks for compiler output filename suffixes
7475
AC_OBJEXT
7576
AC_EXEEXT
7677

77-
dnl check for build configuration
78-
79-
LT_INIT([disable-static win32-dll])
78+
dnl checks for build configuration
8079

8180
dnl Prepares the libtool configuration for handling of Windows resources, and
8281
dnl sets the RC variable to a program that compiles Windows resource files.

0 commit comments

Comments
 (0)