From aee224d6434c08a1404a4357cf0a664a4c2f02eb Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Thu, 4 Feb 2021 16:58:35 +0000 Subject: [PATCH] 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 * configure.ac (LIBINTL): Transform into -L/-lintl form. * configure: Regenerate. --- intl/ChangeLog | 5 +++++ intl/configure | 3 +-- intl/configure.ac | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index 8da6ef7be9f..466f5644d9b 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,8 @@ +2021-02-04 Nick Alcock + + * configure.ac (LIBINTL): Transform into -L/-lintl form. + * configure: Regenerate. + 2021-02-02 Nick Alcock * aclocal.m4: include picflag.m4. diff --git a/intl/configure b/intl/configure index 6498a392570..7ddb624249d 100755 --- 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 5ec7b0944e2..77e2fd2d8c5 100644 --- 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' ;; -- 2.30.2