diff --git a/intl/ChangeLog b/intl/ChangeLog index 8da6ef7be9..466f5644d9 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 6498a39257..7ddb624249 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 5ec7b0944e..77e2fd2d8c 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' ;;