intl: turn LIBINTL into -L / -l form
This variable currently refers directly, not to a .la file, but to an .a file. This produces wrong results when building into a library on some platforms: so convert it to the general form "-L${top_builddir}../intl -lintl ..." ... so that both libtool and non-libtool builds will always do the right thing for both static and shared links. intl/ChangeLog 2021-02-04 Nick Alcock <nick.alcock@oracle.com> * configure.ac (LIBINTL): Transform into -L/-lintl form. * configure: Regenerate.
This commit is contained in:
parent
53d4244ec0
commit
aee224d643
@ -1,3 +1,8 @@
|
|||||||
|
2021-02-04 Nick Alcock <nick.alcock@oracle.com>
|
||||||
|
|
||||||
|
* configure.ac (LIBINTL): Transform into -L/-lintl form.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2021-02-02 Nick Alcock <nick.alcock@oracle.com>
|
2021-02-02 Nick Alcock <nick.alcock@oracle.com>
|
||||||
|
|
||||||
* aclocal.m4: include picflag.m4.
|
* aclocal.m4: include picflag.m4.
|
||||||
|
3
intl/configure
vendored
3
intl/configure
vendored
@ -6787,8 +6787,7 @@ LIBINTL_DEP=
|
|||||||
INCINTL=
|
INCINTL=
|
||||||
case $USE_INCLUDED_LIBINTL in
|
case $USE_INCLUDED_LIBINTL in
|
||||||
yes)
|
yes)
|
||||||
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
|
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},-L&/..,; s,\.\./intl/libintl\.a,../intl -lintl,' `
|
||||||
LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
|
|
||||||
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
|
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
|
||||||
INCINTL='-I${top_builddir}/../intl'
|
INCINTL='-I${top_builddir}/../intl'
|
||||||
;;
|
;;
|
||||||
|
@ -40,8 +40,7 @@ LIBINTL_DEP=
|
|||||||
INCINTL=
|
INCINTL=
|
||||||
case $USE_INCLUDED_LIBINTL in
|
case $USE_INCLUDED_LIBINTL in
|
||||||
yes)
|
yes)
|
||||||
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
|
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},-L&/..,; s,\.\./intl/libintl\.a,../intl -lintl,' `
|
||||||
LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
|
|
||||||
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
|
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
|
||||||
INCINTL='-I${top_builddir}/../intl'
|
INCINTL='-I${top_builddir}/../intl'
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user