diff options
| -rw-r--r-- | intl/ChangeLog | 5 | ||||
| -rwxr-xr-x | intl/configure | 3 | ||||
| -rw-r--r-- | intl/configure.ac | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 8da6ef7..466f564 100644 --- 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 6498a39..7ddb624 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 5ec7b09..77e2fd2 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' ;; |