Hi,
libatomic detection is currently broken in configure.ac; it will
define -latomic even in case where it wouldn't be required (e.g.
because it's already provided by the compiler).
The attached patch fixes the broken case. Unfortunately I don't know a
system where this library is required, I'm convinced there's room for
further simplification.
--
Francesco
=== modified file 'configure.ac'
--- configure.ac 2015-12-04 02:28:25 +0000
+++ configure.ac 2015-12-23 22:26:05 +0000
@@ -431,61 +431,64 @@
])
SQUID_DEFINE_BOOL(XMALLOC_STATISTICS,${enable_xmalloc_statistics:=no},
[Show malloc statistics in status page])
AC_MSG_NOTICE([xmalloc stats display: $enable_xmalloc_statistics])
squid_opt_aufs_threads=""
AC_ARG_WITH(aufs-threads,
AS_HELP_STRING([--with-aufs-threads=N_THREADS],
[Tune the number of worker threads for the aufs object store.]), [
case $withval in
[[0-9]]*)
squid_opt_aufs_threads=$withval
;;
*)
AC_MSG_ERROR(--with-aufs-threads expects a numeric argument)
;;
esac
])
if test "x$squid_opt_aufs_threads" != "x"; then
AC_MSG_NOTICE([With $squid_opt_aufs_threads aufs threads])
AC_DEFINE_UNQUOTED(AUFS_IO_THREADS,$squid_opt_aufs_threads,
[Defines how many threads aufs uses for I/O])
fi
AC_ARG_WITH(dl, AS_HELP_STRING([--with-dl],[Use dynamic linking]))
if test "x$with_dl" = "xyes"; then
AC_MSG_NOTICE([With dl])
fi
## check for atomics library before anything that might need it
-AC_SEARCH_LIBS([__atomic_load_8],[atomic],[ATOMICLIB="-latomic"],[])
+AC_SEARCH_LIBS([__atomic_load_8],[atomic])
+if test "x$ac_cv_search___atomic_load_8" = "-latomic"; then
+ ATOMICLIB="-latomic"
+fi
AC_SUBST(ATOMICLIB)
AC_SEARCH_LIBS([shm_open], [rt])
if test "x$ac_cv_search_shm_open" != "xno" ; then
AC_DEFINE(HAVE_SHM,1,[Support shared memory features])
fi
AC_MSG_CHECKING([for DiskIO modules to be enabled])
squid_disk_module_candidates=""
squid_opt_enable_diskio="auto" #values: no, yes, "auto"(=yes+detect modules)
AC_ARG_ENABLE(disk-io,
AS_HELP_STRING([--enable-disk-io="list of modules"],
[Build support for the list of disk I/O modules.
Set without a value or omitted, all available modules will be built.
See src/DiskIO for a list of available modules, or
Programmers Guide section on DiskIO
for details on how to build your custom disk module]), [
case $enableval in
yes)
${TRUE}
#do nothing, "auto" is ok
;;
no)
squid_opt_enable_diskio="no"
;;
*)
squid_opt_enable_diskio="yes"
squid_disk_module_candidates=" `echo $enableval| sed -e 's/,/ /g;s/ */ /g'` "
SQUID_CLEANUP_MODULES_LIST([squid_disk_module_candidates])
;;
_______________________________________________
squid-dev mailing list
[email protected]
http://lists.squid-cache.org/listinfo/squid-dev
