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.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 8da6ef7be9f3edc427fe238523dd4ca0851f475a..466f5644d9b628fe5a80ea5b3b16f7f3437abdf6 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -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.

diff --git a/intl/configure b/intl/configure
index 6498a3925709c446f39d06cf84c4241a61d40b05..7ddb624249dc94a2bf304cd9610b6b05873684d8 100755 (executable)
--- a/intl/configure
+++ b/intl/configure
@@ -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'
     ;;

diff --git a/intl/configure.ac b/intl/configure.ac
index 5ec7b0944e2f0c4e2b463f411626b92ac2fcac8c..77e2fd2d8c5d538c697d3ce68490051f8ca4a3ad 100644 (file)
--- a/intl/configure.ac
+++ b/intl/configure.ac
@@ -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'
     ;;