diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2019-12-02 15:21:42 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2019-12-02 15:21:42 +0200 |
commit | 663f088cebbce45d6a681a80866992fb81c265df (patch) | |
tree | 7a8af97869a4f2b4cc73abe5c08b6b0973235ce8 /configure.ac | |
parent | 81cc5cac81898097d7de49b241d6a4118147e115 (diff) | |
download | mailutils-663f088cebbce45d6a681a80866992fb81c265df.tar.gz mailutils-663f088cebbce45d6a681a80866992fb81c265df.tar.bz2 |
Improve the rpath solution
Instead of eliminating all -Wl options, translate -Wl,-rpath -Wl,DIR
and -Wl,-rpath,DIR to -R DIR.
Rename am/wlelim.m4 to am/rpath.m4 and rename all macros accordingly.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 9f63f7d1f..41806b4ab 100644 --- a/configure.ac +++ b/configure.ac @@ -50,8 +50,8 @@ dnl Other variables AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux') AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)') -MU_WLELIM_VAR([LTLIBINTL]) -MU_WLELIM_VAR([LTLIBICONV]) +MU_RPATH_FIXUP_VAR([LTLIBINTL]) +MU_RPATH_FIXUP_VAR([LTLIBICONV]) AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)') AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/lib/libmuaux.la') @@ -160,7 +160,7 @@ AC_ARG_ENABLE([experimental], # Initialize authlibs -MU_WLELIM_SUBST(MU_AUTHLIBS) +MU_RPATH_FIXUP_SUBST(MU_AUTHLIBS) AC_SUBST(MU_AUTHINCS) dnl Check for arguments @@ -235,7 +235,7 @@ case "${withval}" in *) AC_MSG_ERROR(bad value ${withval} for --without-readline) ;; esac],[status_readline=probe]) -MU_WLELIM_SUBST(SERV_AUTHLIBS) +MU_RPATH_FIXUP_SUBST(SERV_AUTHLIBS) AC_SUBST(SERV_AUTHINCS) AC_ARG_WITH([gssapi], @@ -334,7 +334,7 @@ AH_BOTTOM( ################################## # DBM Support ################################## -MU_WLELIM_SUBST(DBMLIBS) +MU_RPATH_FIXUP_SUBST(DBMLIBS) AC_SUBST(DBMINCLUDES) enable_dbm= @@ -1201,7 +1201,7 @@ case "${enableval}" in *) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;; esac],[status_python=yes]) -MU_WLELIM_SUBST(PYTHON_LIBS) +MU_RPATH_FIXUP_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_INCLUDES) AC_SUBST(PYTHON_MAJOR) @@ -1394,7 +1394,7 @@ if test -z "$PERL"; then fi AC_SUBST([GITINFO],'$(PERL) $(mu_aux_dir)/gitinfo') -MU_WLELIM_COMMIT +MU_RPATH_FIXUP_COMMIT AC_CONFIG_COMMANDS([status],[ cat <<EOF |