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:
@@ -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>
|
||||
|
||||
* aclocal.m4: include picflag.m4.
|
||||
|
||||
Vendored
+1
-2
@@ -6787,8 +6787,7 @@ LIBINTL_DEP=
|
||||
INCINTL=
|
||||
case $USE_INCLUDED_LIBINTL in
|
||||
yes)
|
||||
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
|
||||
LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
|
||||
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},-L&/..,; s,\.\./intl/libintl\.a,../intl -lintl,' `
|
||||
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
|
||||
INCINTL='-I${top_builddir}/../intl'
|
||||
;;
|
||||
|
||||
+1
-2
@@ -40,8 +40,7 @@ LIBINTL_DEP=
|
||||
INCINTL=
|
||||
case $USE_INCLUDED_LIBINTL in
|
||||
yes)
|
||||
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
|
||||
LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
|
||||
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},-L&/..,; s,\.\./intl/libintl\.a,../intl -lintl,' `
|
||||
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
|
||||
INCINTL='-I${top_builddir}/../intl'
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user