Merge branch 'maint-0.4.5'

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

changes/ticket33624

+  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.
+

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))
   ]
 )