diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:00:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:00:06 -0500 |
| commit | 85c4087de9b80c2174e47359a5a97f5fac5c0c10 (patch) | |
| tree | 40438c6a1cb388fff6b08a86f21a26ddef9a0bb8 | |
| parent | aa0c4fd86d504e65c1a776ad6551496d7eb5c4de (diff) | |
| parent | f8cf2546ea6731d6fdca6a7cfc52d047bc47bb8b (diff) | |
| download | tor-85c4087de9b80c2174e47359a5a97f5fac5c0c10.tar.gz tor-85c4087de9b80c2174e47359a5a97f5fac5c0c10.zip | |
Merge branch 'maint-0.4.5'
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | changes/ticket33624 | 5 | ||||
| -rw-r--r-- | configure.ac | 10 |
3 files changed, 16 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5ecdf1d5c2..e6389ea1d4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do LDFLAGS="$tor_saved_LDFLAGS" - LIBS="$tor_saved_LIBS $3" + LIBS="$3 $tor_saved_LIBS" CPPFLAGS="$tor_saved_CPPFLAGS" if test -z "$tor_trydir" ; then @@ -219,7 +219,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ CPPFLAGS="$tor_saved_CPPFLAGS" ]) dnl end cache check -LIBS="$LIBS $3" +LIBS="$3 $LIBS" if test "$tor_cv_library_$1_dir" != "(system)"; then TOR_EXTEND_CODEPATH($tor_cv_library_$1_dir) fi diff --git a/changes/ticket33624 b/changes/ticket33624 new file mode 100644 index 0000000000..eded3b4dee --- /dev/null +++ b/changes/ticket33624 @@ -0,0 +1,5 @@ + o Minor bugfixes (configure, static build): + - Change our search library configure macro linker flag order so it works + for certain compilers that need the right order. Fixes bug 33624; bugfix + on 0.1.1.0-alpha. + diff --git a/configure.ac b/configure.ac index 95284086be..0ec813658c 100644 --- a/configure.ac +++ b/configure.ac @@ -359,6 +359,12 @@ dnl --- dnl All our modules. m4_define(MODULES, relay dirauth dircache) +# Some modules are only disabled through another option. For those, we don't +# want to print the help in the summary at the end of the configure. Any entry +# in the following set will not print the "--disable-module-NAME" command in +# the summary. +m4_set_add_all([MODULES_WITH_NO_OPTIONS], [dircache]) + dnl Relay module. AC_ARG_ENABLE([module-relay], AS_HELP_STRING([--disable-module-relay], @@ -2834,7 +2840,9 @@ PPRINT_SUBTITLE([Modules]) m4_foreach_w([mname], MODULES, [ AM_COND_IF(m4_join([], [BUILD_MODULE_], m4_toupper([]mname[])), value=1, value=0) - PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value) + m4_set_contains([MODULES_WITH_NO_OPTIONS], mname, + PPRINT_PROP_BOOL([mname], $value), + PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value)) ] ) |