mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5
This commit is contained in:
commit
f8cf2546ea
@ -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
|
||||
|
5
changes/ticket33624
Normal file
5
changes/ticket33624
Normal file
@ -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.
|
||||
|
10
configure.ac
10
configure.ac
@ -357,6 +357,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],
|
||||
@ -2821,7 +2827,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))
|
||||
]
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user