From 27d9b3b829a8ce070c66cb80851103b718932ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Mon, 5 Dec 2016 13:13:52 +0100 Subject: [PATCH 1/8] Fix typos: synchonization -> synchronization, paramaters -> parameters --- include/qb/qbatomic.h | 2 +- include/qb/qbloop.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qb/qbatomic.h b/include/qb/qbatomic.h index 45c762e76..8777e2e0d 100644 --- a/include/qb/qbatomic.h +++ b/include/qb/qbatomic.h @@ -52,7 +52,7 @@ extern "C" { * You must not directly read integers or pointers concurrently * accessed by multiple threads, but use the atomic accessor functions * instead. That is, always use qb_atomic_int_get() and qb_atomic_pointer_get() - * for read outs. They provide the necessary synchonization mechanisms + * for read outs. They provide the necessary synchronization mechanisms * like memory barriers to access memory locations concurrently. * * If you are using those functions for anything apart from diff --git a/include/qb/qbloop.h b/include/qb/qbloop.h index a1e444389..ff5a7d263 100644 --- a/include/qb/qbloop.h +++ b/include/qb/qbloop.h @@ -115,7 +115,7 @@ int32_t qb_loop_job_add(qb_loop_t *l, * This will try to delete the job if it hasn't run yet. * * @note this will remove the first job that matches the - * paramaters (priority, data, dispatch_fn). + * parameters (priority, data, dispatch_fn). * * @param l pointer to the loop instance * @param p the priority From ff7a3f40479f04452585f3edc4633b4810cda037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Mon, 5 Dec 2016 12:29:22 +0100 Subject: [PATCH 2/8] configure: help string cleanup The [ default="no" ] branches were sense- and (mostly) harmless. --- configure.ac | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index fa13ae6e4..bb8357c69 100644 --- a/configure.ac +++ b/configure.ac @@ -452,33 +452,27 @@ LINT_FLAGS="-weak -D__gnuc_va_list=va_list -D__attribute\(x\)= \ # local options AC_ARG_ENABLE([ansi], - [ --enable-ansi : force to build with ANSI standards. ], - [ default="no" ]) + [AS_HELP_STRING([--enable-ansi],[force to build with ANSI standards])]) AC_ARG_ENABLE([fatal-warnings], - [ --enable-fatal-warnings : enable fatal warnings. ], - [ default="no" ]) + [AS_HELP_STRING([--enable-fatal-warnings],[enable fatal warnings])]) AC_ARG_ENABLE([debug], - [ --enable-debug : enable debug build. ], - [ default="no" ]) + [AS_HELP_STRING([--enable-debug],[enable debug build])]) AC_ARG_ENABLE([coverage], - [ --enable-coverage : coverage analysis of the codebase. ], - [ default="no" ]) + [AS_HELP_STRING([--enable-coverage],[coverage analysis of the codebase])]) AC_ARG_ENABLE([slow-tests], - [ --enable-slow-tests : build and run slow tests. ], - [ default="no" ]) + [AS_HELP_STRING([--enable-slow-tests],[build and run slow tests])]) if test x"$with_check" = xyes; then AC_ARG_ENABLE([syslog-tests], - [ --enable-syslog-tests : build and run syslog tests. ], - [ default="no" ]) + [AS_HELP_STRING([--enable-syslog-tests],[build and run syslog tests])]) fi AC_ARG_WITH([socket-dir], - [ --with-socket-dir=DIR : socket dir. ], + [AS_HELP_STRING([--with-socket-dir=DIR],[socket directory @<:@LOCALSTATEDIR/run@:>@])], [ SOCKETDIR="$withval" ], [ SOCKETDIR="$localstatedir/run" ]) From 64371306a613d0ccd8f4eaadba3fcb33012365c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Wed, 7 Dec 2016 14:44:51 +0100 Subject: [PATCH 3/8] configure: LTLIBOBJS is also a Make variable So let's use the more friendly syntax. --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 06fb2fa4d..cb8178703 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -40,7 +40,7 @@ source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \ map.c skiplist.c hashtable.c trie.c libqb_la_SOURCES = $(source_to_lint) unix.c -libqb_la_LIBADD = @LTLIBOBJS@ +libqb_la_LIBADD = $(LTLIBOBJS) AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=) From 56754d05096a8e6b8f46f38464f50d28517fd025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Mon, 5 Dec 2016 13:28:50 +0100 Subject: [PATCH 4/8] configure: restrict -ldl to where it's actually needed This reduces overlinking of qb-blackbox. Being a seldom used executable, the gains are mostly theoretical, but at least this silences warnings from some QA tools. --- configure.ac | 5 ++- lib/Makefile.am | 2 +- m4/ax_restore_flags.m4 | 52 +++++++++++++++++++++++++++++++ m4/ax_save_flags.m4 | 71 ++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 1 + 5 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 m4/ax_restore_flags.m4 create mode 100644 m4/ax_save_flags.m4 diff --git a/configure.ac b/configure.ac index bb8357c69..a21270913 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,10 @@ dnl it will always be "none needed", but it is not true dnl when linking libraries. Looks like a bug. AC_SEARCH_LIBS([pthread_create], [pthread]) AC_SEARCH_LIBS([mq_open], [rt]) -AC_SEARCH_LIBS([dlopen], [dl]) +AX_SAVE_FLAGS +AC_SEARCH_LIBS([dlopen],[dl],,[AC_MSG_ERROR([cannot find dlopen() function])]) +AC_SUBST([dlopen_LIBS],[$LIBS]) +AX_RESTORE_FLAGS AC_SEARCH_LIBS([socket], [socket]) AC_SEARCH_LIBS([gethostbyname], [nsl]) diff --git a/lib/Makefile.am b/lib/Makefile.am index cb8178703..5e6fe1e12 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -40,7 +40,7 @@ source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \ map.c skiplist.c hashtable.c trie.c libqb_la_SOURCES = $(source_to_lint) unix.c -libqb_la_LIBADD = $(LTLIBOBJS) +libqb_la_LIBADD = $(LTLIBOBJS) $(dlopen_LIBS) AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=) diff --git a/m4/ax_restore_flags.m4 b/m4/ax_restore_flags.m4 new file mode 100644 index 000000000..aafd36386 --- /dev/null +++ b/m4/ax_restore_flags.m4 @@ -0,0 +1,52 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_restore_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RESTORE_FLAGS([namespace]) +# +# DESCRIPTION +# +# Restore common compilation flags from temporary variables. +# +# Compilation flags includes: CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS, LIBS, +# OBJCFLAGS. +# +# By default these flags are restored to a global (empty) namespace, but +# user could restore from specific NAMESPACE by using +# AX_RESTORE_FLAGS(NAMESPACE) macro. +# +# Typical usage is like: +# +# AX_SAVE_FLAGS(mypackage) +# CPPFLAGS="-Imypackagespath ${CPPFLAGS}" +# dnl ... do some detection ... +# AX_RESTORE_FLAGS(mypackage) +# +# LICENSE +# +# Copyright (c) 2009 Filippo Giunchedi +# Copyright (c) 2011 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2011 Russ Allbery +# Copyright (c) 2013 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +# save one flag in name space +AC_DEFUN([_AX_RESTORE_ONE_FLAG],[dnl + AS_VAR_PUSHDEF([_ax_restore_flag_var], [$2[]_$1[]_ax_save_flags]) + AS_VAR_COPY($2[],_ax_restore_flag_var) + AS_VAR_POPDEF([_ax_restore_flag_var]) +]) + +AC_DEFUN([AX_RESTORE_FLAGS], [dnl + m4_foreach([FLAG], dnl + [_AX_SAVE_FLAGS_LIST()], dnl + [_AX_RESTORE_ONE_FLAG([$1],FLAG)]) +]) diff --git a/m4/ax_save_flags.m4 b/m4/ax_save_flags.m4 new file mode 100644 index 000000000..39f45be46 --- /dev/null +++ b/m4/ax_save_flags.m4 @@ -0,0 +1,71 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_save_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SAVE_FLAGS([NAMESPACE]) +# +# DESCRIPTION +# +# Save common compilation flags into temporary variables. +# +# Compilation flags includes: CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS, LIBS, +# OBJCFLAGS. +# +# By default these flags are saved to a global (empty) namespace, but user +# could specify a specific NAMESPACE to AX_SAVE_FLAGS macro and latter +# restore it by using AX_RESTORE_FLAGS(NAMESPACE). +# +# AX_SAVE_FLAGS(mypackage) +# CPPFLAGS="-Imypackagespath ${CPPFLAGS}" +# dnl .. do some detection ... +# AX_RESTORE_FLAGS(mypackage) +# +# LICENSE +# +# Copyright (c) 2009 Filippo Giunchedi +# Copyright (c) 2011 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2011 Russ Allbery +# Copyright (c) 2013 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +# list of flag to save +AC_DEFUN([_AX_SAVE_FLAGS_LIST],[dnl +[CCASFLAGS],dnl +[CFLAGS],dnl +[CPPFLAGS],dnl +[CXXFLAGS],dnl +[ERLCFLAGS],dnl +[FCFLAGS],dnl +[FCLIBS],dnl +[FFLAGS],dnl +[FLIBS],dnl +[GCJFLAGS],dnl +[JAVACFLAGS],dnl +[LDFLAGS],dnl +[LIBS],dnl +[OBJCFLAGS],dnl +[OBJCXXFLAGS],dnl +[UPCFLAGS],dnl +[VALAFLAGS]dnl +]) + +# save one flag in name space +AC_DEFUN([_AX_SAVE_ONE_FLAG],[ + AS_VAR_PUSHDEF([_ax_save_flag_var], [$2[]_$1[]_ax_save_flags]) + AS_VAR_COPY(_ax_save_flag_var, $2[]) + AS_VAR_POPDEF([_ax_save_flag_var]) +]) + +AC_DEFUN([AX_SAVE_FLAGS],[dnl + m4_foreach([FLAG], dnl + [_AX_SAVE_FLAGS_LIST()], dnl + [_AX_SAVE_ONE_FLAG([$1],FLAG)]) +]) diff --git a/tests/Makefile.am b/tests/Makefile.am index f7736d736..e3568bdd7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -147,6 +147,7 @@ ipc_test_LDADD += _failure_injection.la check_LTLIBRARIES += _failure_injection.la _failure_injection_la_SOURCES = _failure_injection.c _failure_injection.h _failure_injection_la_LDFLAGS = -module +_failure_injection_la_LIBADD = $(dlopen_LIBS) endif log_test_SOURCES = check_log.c $(top_builddir)/include/qb/qblog.h From cb5ee921c04bfba24edf8b6f128d11161d161cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Mon, 5 Dec 2016 15:56:38 +0100 Subject: [PATCH 5/8] configure: restrict pthreads to where it's actually needed mq_open() is no longer relevant beyond 70a9623 (Remove message queues). --- configure.ac | 19 +- lib/Makefile.am | 3 +- m4/ax_pthread.m4 | 485 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 496 insertions(+), 11 deletions(-) create mode 100644 m4/ax_pthread.m4 diff --git a/configure.ac b/configure.ac index a21270913..40fa47493 100644 --- a/configure.ac +++ b/configure.ac @@ -102,12 +102,7 @@ case $exec_prefix in esac # Checks for libraries. -dnl librt from glibc NEEDs libpthread -dnl so. if test for libpthread after librt -dnl it will always be "none needed", but it is not true -dnl when linking libraries. Looks like a bug. -AC_SEARCH_LIBS([pthread_create], [pthread]) -AC_SEARCH_LIBS([mq_open], [rt]) +AX_PTHREAD AX_SAVE_FLAGS AC_SEARCH_LIBS([dlopen],[dl],,[AC_MSG_ERROR([cannot find dlopen() function])]) AC_SUBST([dlopen_LIBS],[$LIBS]) @@ -201,13 +196,17 @@ AC_CHECK_FUNCS([alarm clock_gettime ftruncate gettimeofday \ strchr strrchr strdup strstr strcasecmp \ poll epoll_create epoll_create1 kqueue \ random rand getrlimit sysconf \ - pthread_spin_lock pthread_setschedparam \ - pthread_mutexattr_setpshared \ - pthread_condattr_setpshared \ - sem_timedwait semtimedop \ getpeerucred getpeereid \ openat unlinkat]) +AX_SAVE_FLAGS +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +LIBS="$LIBS $PTHREAD_LIBS" +AC_CHECK_FUNCS([pthread_spin_lock pthread_setschedparam \ + pthread_mutexattr_setpshared \ + pthread_condattr_setpshared \ + sem_timedwait semtimedop]) +AX_RESTORE_FLAGS # Checks for defined macros AC_MSG_CHECKING(for MSG_NOSIGNAL) diff --git a/lib/Makefile.am b/lib/Makefile.am index 5e6fe1e12..0e7b0dc70 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -40,7 +40,8 @@ source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \ map.c skiplist.c hashtable.c trie.c libqb_la_SOURCES = $(source_to_lint) unix.c -libqb_la_LIBADD = $(LTLIBOBJS) $(dlopen_LIBS) +libqb_la_CFLAGS = $(PTHREAD_CFLAGS) +libqb_la_LIBADD = $(LTLIBOBJS) $(dlopen_LIBS) $(PTHREAD_LIBS) AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=) diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 new file mode 100644 index 000000000..4c4051ea3 --- /dev/null +++ b/m4/ax_pthread.m4 @@ -0,0 +1,485 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_pthread.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) +# +# Also sets PTHREAD_CC to any special C compiler that is needed for +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also to link with them as well. For example, you might link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# +# If you are only building threaded programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: +# +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" +# +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to +# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +# +# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the +# PTHREAD_PRIO_INHERIT symbol is defined when compiling with +# PTHREAD_CFLAGS. +# +# ACTION-IF-FOUND is a list of shell commands to run if a threads library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_PTHREAD. +# +# Please let the authors know if this macro fails on any platform, or if +# you have any other suggestions or comments. This macro was based on work +# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help +# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by +# Alejandro Forero Cuervo to the autoconf macro repository. We are also +# grateful for the helpful feedback of numerous users. +# +# Updated for Autoconf 2.68 by Daniel Richard G. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2011 Daniel Richard G. +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 23 + +AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) +AC_DEFUN([AX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_SED]) +AC_LANG_PUSH([C]) +ax_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on Tru64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then + ax_pthread_save_CC="$CC" + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) + AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) + AC_MSG_RESULT([$ax_pthread_ok]) + if test "x$ax_pthread_ok" = "xno"; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + CC="$ax_pthread_save_CC" + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 +# (Note: HP C rejects this with "bad form for `-t' option") +# -pthreads: Solaris/gcc (Note: HP C also rejects) +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads and +# -D_REENTRANT too), HP C (must be checked before -lpthread, which +# is present but should not be used directly; and before -mthreads, +# because the compiler interprets this as "-mt" + "-hreads") +# -mthreads: Mingw32/gcc, Lynx/gcc +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case $host_os in + + freebsd*) + + # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) + # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) + + ax_pthread_flags="-kthread lthread $ax_pthread_flags" + ;; + + hpux*) + + # From the cc(1) man page: "[-mt] Sets various -D flags to enable + # multi-threading and also sets -lpthread." + + ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" + ;; + + openedition*) + + # IBM z/OS requires a feature-test macro to be defined in order to + # enable POSIX threads at all, so give the user a hint if this is + # not set. (We don't define these ourselves, as they can affect + # other portions of the system API in unpredictable ways.) + + AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], + [ +# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) + AX_PTHREAD_ZOS_MISSING +# endif + ], + [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) + ;; + + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (N.B.: The stubs are missing + # pthread_cleanup_push, or rather a function called by this macro, + # so we could check for that, but who knows whether they'll stub + # that too in a future libc.) So we'll check first for the + # standard Solaris way of linking pthreads (-mt -lpthread). + + ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" + ;; +esac + +# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) + +AS_IF([test "x$GCC" = "xyes"], + [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) + +# The presence of a feature test macro requesting re-entrant function +# definitions is, on some systems, a strong hint that pthreads support is +# correctly enabled + +case $host_os in + darwin* | hpux* | linux* | osf* | solaris*) + ax_pthread_check_macro="_REENTRANT" + ;; + + aix*) + ax_pthread_check_macro="_THREAD_SAFE" + ;; + + *) + ax_pthread_check_macro="--" + ;; +esac +AS_IF([test "x$ax_pthread_check_macro" = "x--"], + [ax_pthread_check_cond=0], + [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) + +# Are we compiling with Clang? + +AC_CACHE_CHECK([whether $CC is Clang], + [ax_cv_PTHREAD_CLANG], + [ax_cv_PTHREAD_CLANG=no + # Note that Autoconf sets GCC=yes for Clang as well as GCC + if test "x$GCC" = "xyes"; then + AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], + [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ +# if defined(__clang__) && defined(__llvm__) + AX_PTHREAD_CC_IS_CLANG +# endif + ], + [ax_cv_PTHREAD_CLANG=yes]) + fi + ]) +ax_pthread_clang="$ax_cv_PTHREAD_CLANG" + +ax_pthread_clang_warning=no + +# Clang needs special handling, because older versions handle the -pthread +# option in a rather... idiosyncratic way + +if test "x$ax_pthread_clang" = "xyes"; then + + # Clang takes -pthread; it has never supported any other flag + + # (Note 1: This will need to be revisited if a system that Clang + # supports has POSIX threads in a separate library. This tends not + # to be the way of modern systems, but it's conceivable.) + + # (Note 2: On some systems, notably Darwin, -pthread is not needed + # to get POSIX threads support; the API is always present and + # active. We could reasonably leave PTHREAD_CFLAGS empty. But + # -pthread does define _REENTRANT, and while the Darwin headers + # ignore this macro, third-party headers might not.) + + PTHREAD_CFLAGS="-pthread" + PTHREAD_LIBS= + + ax_pthread_ok=yes + + # However, older versions of Clang make a point of warning the user + # that, in an invocation where only linking and no compilation is + # taking place, the -pthread option has no effect ("argument unused + # during compilation"). They expect -pthread to be passed in only + # when source code is being compiled. + # + # Problem is, this is at odds with the way Automake and most other + # C build frameworks function, which is that the same flags used in + # compilation (CFLAGS) are also used in linking. Many systems + # supported by AX_PTHREAD require exactly this for POSIX threads + # support, and in fact it is often not straightforward to specify a + # flag that is used only in the compilation phase and not in + # linking. Such a scenario is extremely rare in practice. + # + # Even though use of the -pthread flag in linking would only print + # a warning, this can be a nuisance for well-run software projects + # that build with -Werror. So if the active version of Clang has + # this misfeature, we search for an option to squash it. + + AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], + [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], + [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown + # Create an alternate version of $ac_link that compiles and + # links in two steps (.c -> .o, .o -> exe) instead of one + # (.c -> exe), because the warning occurs only in the second + # step + ax_pthread_save_ac_link="$ac_link" + ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' + ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` + ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" + ax_pthread_save_CFLAGS="$CFLAGS" + for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do + AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) + CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" + ac_link="$ax_pthread_save_ac_link" + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], + [ac_link="$ax_pthread_2step_ac_link" + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], + [break]) + ]) + done + ac_link="$ax_pthread_save_ac_link" + CFLAGS="$ax_pthread_save_CFLAGS" + AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) + ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" + ]) + + case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in + no | unknown) ;; + *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; + esac + +fi # $ax_pthread_clang = yes + +if test "x$ax_pthread_ok" = "xno"; then +for ax_pthread_try_flag in $ax_pthread_flags; do + + case $ax_pthread_try_flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -mt,pthread) + AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) + PTHREAD_CFLAGS="-mt" + PTHREAD_LIBS="-lpthread" + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) + PTHREAD_CFLAGS="$ax_pthread_try_flag" + ;; + + pthread-config) + AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) + AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) + PTHREAD_LIBS="-l$ax_pthread_try_flag" + ;; + esac + + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include +# if $ax_pthread_check_cond +# error "$ax_pthread_check_macro must be defined" +# endif + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */])], + [ax_pthread_ok=yes], + []) + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + AC_MSG_RESULT([$ax_pthread_ok]) + AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$ax_pthread_ok" = "xyes"; then + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_CACHE_CHECK([for joinable pthread attribute], + [ax_cv_PTHREAD_JOINABLE_ATTR], + [ax_cv_PTHREAD_JOINABLE_ATTR=unknown + for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int attr = $ax_pthread_attr; return attr /* ; */])], + [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], + []) + done + ]) + AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ + test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ + test "x$ax_pthread_joinable_attr_defined" != "xyes"], + [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], + [$ax_cv_PTHREAD_JOINABLE_ATTR], + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + ax_pthread_joinable_attr_defined=yes + ]) + + AC_CACHE_CHECK([whether more special flags are required for pthreads], + [ax_cv_PTHREAD_SPECIAL_FLAGS], + [ax_cv_PTHREAD_SPECIAL_FLAGS=no + case $host_os in + solaris*) + ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" + ;; + esac + ]) + AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ + test "x$ax_pthread_special_flags_added" != "xyes"], + [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" + ax_pthread_special_flags_added=yes]) + + AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], + [ax_cv_PTHREAD_PRIO_INHERIT], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[int i = PTHREAD_PRIO_INHERIT;]])], + [ax_cv_PTHREAD_PRIO_INHERIT=yes], + [ax_cv_PTHREAD_PRIO_INHERIT=no]) + ]) + AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ + test "x$ax_pthread_prio_inherit_defined" != "xyes"], + [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) + ax_pthread_prio_inherit_defined=yes + ]) + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + # More AIX lossage: compile with *_r variant + if test "x$GCC" != "xyes"; then + case $host_os in + aix*) + AS_CASE(["x/$CC"], + [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], + [#handle absolute path differently from PATH based program lookup + AS_CASE(["x$CC"], + [x/*], + [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], + [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) + ;; + esac + fi +fi + +test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" + +AC_SUBST([PTHREAD_LIBS]) +AC_SUBST([PTHREAD_CFLAGS]) +AC_SUBST([PTHREAD_CC]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test "x$ax_pthread_ok" = "xyes"; then + ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) + : +else + ax_pthread_ok=no + $2 +fi +AC_LANG_POP +])dnl AX_PTHREAD From 1a9b4128e4b95c7a873f855d9276209e3fa0af0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Mon, 5 Dec 2016 23:01:49 +0100 Subject: [PATCH 6/8] configure: restrict socket lib to where it's actually needed --- configure.ac | 5 ++++- examples/Makefile.am | 4 ++-- lib/Makefile.am | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 40fa47493..396f90fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,10 @@ AX_SAVE_FLAGS AC_SEARCH_LIBS([dlopen],[dl],,[AC_MSG_ERROR([cannot find dlopen() function])]) AC_SUBST([dlopen_LIBS],[$LIBS]) AX_RESTORE_FLAGS -AC_SEARCH_LIBS([socket], [socket]) +AX_SAVE_FLAGS +AC_SEARCH_LIBS([socket], [socket],,[AC_MSG_ERROR([cannot find socket() function])]) +AC_SUBST([socket_LIBS],[$LIBS]) +AX_RESTORE_FLAGS AC_SEARCH_LIBS([gethostbyname], [nsl]) # look for testing harness "check" diff --git a/examples/Makefile.am b/examples/Makefile.am index d546fca41..3ba95fbb3 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -33,11 +33,11 @@ simplelog_LDADD = $(top_builddir)/lib/libqb.la tcpclient_SOURCES = tcpclient.c $(top_builddir)/include/qb/qbloop.h tcpclient_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -tcpclient_LDADD = $(top_builddir)/lib/libqb.la +tcpclient_LDADD = $(top_builddir)/lib/libqb.la $(socket_LIBS) tcpserver_SOURCES = tcpserver.c $(top_builddir)/include/qb/qbloop.h tcpserver_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -tcpserver_LDADD = $(top_builddir)/lib/libqb.la +tcpserver_LDADD = $(top_builddir)/lib/libqb.la $(socket_LIBS) ipcclient_SOURCES = ipcclient.c $(top_builddir)/include/qb/qbloop.h \ $(top_builddir)/include/qb/qbipcc.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 0e7b0dc70..b37262863 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -41,7 +41,7 @@ source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \ libqb_la_SOURCES = $(source_to_lint) unix.c libqb_la_CFLAGS = $(PTHREAD_CFLAGS) -libqb_la_LIBADD = $(LTLIBOBJS) $(dlopen_LIBS) $(PTHREAD_LIBS) +libqb_la_LIBADD = $(LTLIBOBJS) $(dlopen_LIBS) $(PTHREAD_LIBS) $(socket_LIBS) AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=) From 8fad8acb6752974c454a2ba829c95e85651ecdf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20W=C3=A1gner?= Date: Mon, 5 Dec 2016 23:02:15 +0100 Subject: [PATCH 7/8] configure: restrict nsl lib to where it's actually needed --- configure.ac | 5 ++++- examples/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 396f90fd6..d8a9b33f2 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,10 @@ AX_SAVE_FLAGS AC_SEARCH_LIBS([socket], [socket],,[AC_MSG_ERROR([cannot find socket() function])]) AC_SUBST([socket_LIBS],[$LIBS]) AX_RESTORE_FLAGS -AC_SEARCH_LIBS([gethostbyname], [nsl]) +AX_SAVE_FLAGS +AC_SEARCH_LIBS([gethostbyname], [nsl],,[AC_MSG_ERROR([cannot find gethostbyname() function])]) +AC_SUBST([nsl_LIBS],[$LIBS]) +AX_RESTORE_FLAGS # look for testing harness "check" PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],[with_check=yes],[with_check=no]) diff --git a/examples/Makefile.am b/examples/Makefile.am index 3ba95fbb3..3637d3063 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -33,7 +33,7 @@ simplelog_LDADD = $(top_builddir)/lib/libqb.la tcpclient_SOURCES = tcpclient.c $(top_builddir)/include/qb/qbloop.h tcpclient_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -tcpclient_LDADD = $(top_builddir)/lib/libqb.la $(socket_LIBS) +tcpclient_LDADD = $(top_builddir)/lib/libqb.la $(socket_LIBS) $(nsl_LIBS) tcpserver_SOURCES = tcpserver.c $(top_builddir)/include/qb/qbloop.h tcpserver_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include From 602d04dacfc8c7958e8a6c0e42da3a7b7ba7ca3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Thu, 8 Dec 2016 17:09:46 +0100 Subject: [PATCH 8/8] build: drop allegedly no longer intrusive syslog-tests opt-in switch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intention behind enabling the syslog tests on demand (642f74d) was to tread cautiously as libtool used to alert that something controversial is going on: $ ./autogen.sh && ./configure --enable-syslog-tests && make check > ... > *** Warning: Linking the executable log.test against the loadable module > *** _syslog_override.so is not portable! > ... owing to the fact that _syslog_override.so is being linked (through libtool) with LDFLAGS=-module. In fact, the issue did go away with a fix to the "make install" process (ebcff54) for which _syslog_override.so* files were being picked undesirably prior to the fix, which manifested itself also on "make rpm" (hence the respective commit message): > RPM build errors: > Installed (but unpackaged) file(s) found: > /usr/lib64/_syslog_override.so > /usr/lib64/_syslog_override.so.0 > /usr/lib64/_syslog_override.so.0.0.0 The explanation for the secondary positive effect on the mentioned libtool's warning going away is rather simple: "lib" prefix switches the expectations about the result as a library (also due to "libdir" destination) rather than as an executable object. Change like that ensures the result is what libtool's manual calls "dynamic module that can be opened by lt_dlopen" rather than "runtime library that cannot" in the context of Mac OS X, which was likely the cause of the portability warning. (https://www.gnu.org/software/libtool/manual/libtool.html#FOOT10) And because the tests themselves are run through the libtool wrapper scripts capable of relinking and other magic What libtool manual has to say on this topic: > Note that libtool modules don’t need to have a "lib" prefix. However, > Automake 1.4 or higher is required to build such modules. referring to version released 15+ years back, which is assumed anyway. (https://www.gnu.org/software/libtool/manual/libtool.html#Modules-for-libltdl) * * * That being said, there's now no longer a reason to have "syslog-tests" enablement conditionalized (no longer supposed intrusive), hence enable them unconditionally along the other libcheck-based tests -- whenever libcheck is detected. This changeset also drops any trace of --enable-syslog-tests switch in various places using that (spec file, Travis CI configuration) making for a complete vaporizatio of this choice. --- .travis.yml | 2 +- configure.ac | 11 ----------- libqb.spec.in | 4 +--- tests/Makefile.am | 10 ++++------ tests/check_log.c | 7 ------- 5 files changed, 6 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6811bd152..b9e30bfa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ addons: script: RPMBUILDOPTS_="--nodeps --define '_without_check 1'"; ./autogen.sh && ./configure - && DISTCHECK_CONFIGURE_FLAGS=--enable-syslog-tests VERBOSE=1 make distcheck + && VERBOSE=1 make distcheck && sed "s|RPMBUILDOPTS =|\\0 ${RPMBUILDOPTS_}|" Makefile | make -f- rpm after_failure: diff --git a/configure.ac b/configure.ac index d8a9b33f2..560b330a5 100644 --- a/configure.ac +++ b/configure.ac @@ -474,11 +474,6 @@ AC_ARG_ENABLE([coverage], AC_ARG_ENABLE([slow-tests], [AS_HELP_STRING([--enable-slow-tests],[build and run slow tests])]) -if test x"$with_check" = xyes; then -AC_ARG_ENABLE([syslog-tests], - [AS_HELP_STRING([--enable-syslog-tests],[build and run syslog tests])]) -fi - AC_ARG_WITH([socket-dir], [AS_HELP_STRING([--with-socket-dir=DIR],[socket directory @<:@LOCALSTATEDIR/run@:>@])], [ SOCKETDIR="$withval" ], @@ -578,12 +573,6 @@ if test "x${enable_slow_tests}" = xyes ; then fi AM_CONDITIONAL(HAVE_SLOW_TESTS, [test "x${enable_slow_tests}" = xyes]) AC_SUBST(HAVE_SLOW_TESTS) -if test "x${enable_syslog_tests}" = xyes ; then - AC_DEFINE([HAVE_SYSLOG_TESTS], 1,[have syslog tests]) - AC_MSG_NOTICE([Enabling syslog tests]) -fi -AM_CONDITIONAL(HAVE_SYSLOG_TESTS, [test "x${enable_syslog_tests}" = xyes]) -AC_SUBST(HAVE_SYSLOG_TESTS) # --- callsite sections --- if test "x${GCC}" = xyes; then diff --git a/libqb.spec.in b/libqb.spec.in index bd2b8f056..8320982d2 100644 --- a/libqb.spec.in +++ b/libqb.spec.in @@ -1,5 +1,4 @@ %bcond_without check -%bcond_without syslog_tests %global alphatag @alphatag@ %global numcomm @numcomm@ @@ -27,8 +26,7 @@ and polling. %build ./autogen.sh -%configure --disable-static \ - %{?with_syslog_tests:--enable-syslog-tests} +%configure --disable-static make %{?_smp_mflags} %if 0%{?with_check} diff --git a/tests/Makefile.am b/tests/Makefile.am index e3568bdd7..fe5474116 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -150,17 +150,15 @@ _failure_injection_la_LDFLAGS = -module _failure_injection_la_LIBADD = $(dlopen_LIBS) endif +check_LTLIBRARIES += _syslog_override.la +_syslog_override_la_SOURCES = _syslog_override.c _syslog_override.h +_syslog_override_la_LDFLAGS = -module + log_test_SOURCES = check_log.c $(top_builddir)/include/qb/qblog.h log_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include log_test_LDADD = $(top_builddir)/lib/libqb.la @CHECK_LIBS@ -if HAVE_SYSLOG_TESTS log_test_LDADD += _syslog_override.la -check_LTLIBRARIES += _syslog_override.la -_syslog_override_la_SOURCES = _syslog_override.c _syslog_override.h -_syslog_override_la_LDFLAGS = -module -endif - util_test_SOURCES = check_util.c $(top_builddir)/include/qb/qbutil.h util_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include util_test_LDADD = $(top_builddir)/lib/libqb.la @CHECK_LIBS@ diff --git a/tests/check_log.c b/tests/check_log.c index 4ca8b4018..bc050b44a 100644 --- a/tests/check_log.c +++ b/tests/check_log.c @@ -30,9 +30,7 @@ #include #include -#ifdef HAVE_SYSLOG_TESTS #include "_syslog_override.h" -#endif extern size_t qb_vsnprintf_serialize(char *serialize, size_t max_len, const char *fmt, va_list ap); extern size_t qb_vsnprintf_deserialize(char *string, size_t strlen, const char *buf); @@ -859,7 +857,6 @@ START_TEST(test_zero_tags) } END_TEST -#ifdef HAVE_SYSLOG_TESTS START_TEST(test_syslog) { qb_log_init("flip", LOG_USER, LOG_INFO); @@ -876,7 +873,6 @@ START_TEST(test_syslog) qb_log_fini(); } END_TEST -#endif static Suite * log_suite(void) @@ -898,10 +894,7 @@ log_suite(void) #endif add_tcase(s, tc, test_extended_information); add_tcase(s, tc, test_zero_tags); - -#ifdef HAVE_SYSLOG_TESTS add_tcase(s, tc, test_syslog); -#endif return s; }