Alon Bar-Lev <alon.bar...@gmail.com> writes: > opt out overriding the libdir, in most cases downstream distribution is > providing the correct one > > Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> > --- > configure.ac | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index 379c021c..fb0b3c8c 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -339,7 +339,11 @@ case "$host_cpu" in > ;; > esac > > -if test "x$ABI" != xstandard ; then > +AC_ARG_ENABLE(libdir-abi-detection, > + AC_HELP_STRING([--disable-libdir-abi-detection], [Disable libdir ABI > detection]),, > + [enable_libdir_abi_detection=yes]) > + > +if test "x$ABI" != xstandard -a "x${enable_libdir_abi_detection}" = "yes" ; > then > AC_MSG_NOTICE([Compiler uses $ABI-bit ABI. To change, set CC.]) > if test "$libdir" = '${exec_prefix}/lib' ; then > # Try setting a better default
Isn't it clearer to use ./configure --prefix=/usr --libdir=/usr/lib rather than ./configure --prefix=/usr --disable-libdir-abi-detection The above if test "$libdir" = '${exec_prefix}/lib' disables the automatic choice if you use --libdir=foo, with foo different from the magic string '${exec_prefix}/lib'. Alon Bar-Lev <alon.bar...@gmail.com> writes: > Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> > --- > configure.ac | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index fb0b3c8c..5f2bf170 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -654,13 +654,13 @@ case "$host_os" in > LIBNETTLE_FORLINK=libnettle.dylib > LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR).dylib' > LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR).dylib' > - LIBNETTLE_LINK='$(CC) $(CFLAGS) -dynamiclib $(LDFLAGS) -install_name > ${libdir}/$(LIBNETTLE_SONAME) -compatibility_version $(LIBNETTLE_MAJOR) > -current_version $(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)' > + LIBNETTLE_LINK='$(CC) $(CFLAGS) -dynamiclib $(LDFLAGS) -install_name > $(libdir)/$(LIBNETTLE_SONAME) -compatibility_version $(LIBNETTLE_MAJOR) > -current_version $(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)' > LIBNETTLE_LIBS='' I don't understand this change. $(foo) and ${foo} have the same meaning in make (and this is quoted from the shell). A think it's an improvement to change ${} to $() here, for consistency with other nerby make references, but I take it you intend to do something more than an aesthetic change? Am I missing something? Regards, /Niels -- Niels Möller. PGP-encrypted email is preferred. Keyid 368C6677. Internet email is subject to wholesale government surveillance. _______________________________________________ nettle-bugs mailing list nettle-bugs@lists.lysator.liu.se http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs