From: Michael Wallner Date: Thu, 6 Feb 2020 13:17:57 +0000 (+0100) Subject: remove autotools files X-Git-Tag: post_cmake~22 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4a35931d46dadb5d664389b0fbe1498c5567e15f;p=m6w6%2Flibmemcached remove autotools files --- diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index b105d013..00000000 --- a/GNUmakefile +++ /dev/null @@ -1,36 +0,0 @@ -# vim:ft=make -# -_bootstrap_Makefile := $(wildcard [M]akefile) -_bootstrap_config-status := $(wildcard config.status) - -ALL_RECURSIVE_TARGETS= - -ifneq ($(_bootstrap_Makefile),) - include Makefile -else - ifneq ($(_bt_config-status),) - $(srcdir)/config.status - $(MAKE) $(AM_MAKEFLAGS) configure - endif - -.DEFAULT_GOAL:= basic_build -srcdir= . - -configure: bootstrap.sh - @$(srcdir)/bootstrap.sh -a - -Makefile: configure - @$(srcdir)/bootstrap.sh -c - -.PHONY: basic_build -basic_build: Makefile - @$(MAKE) $(AM_MAKEFLAGS) -endif - -ALL_RECURSIVE_TARGETS+= $(AM_RECURSIVE_TARGETS) - -ifneq ($(word 2, $(MAKECMDGOALS)), ) -ifneq ($(filter $(ALL_RECURSIVE_TARGETS), $(MAKECMDGOALS)), ) -.NOTPARALLEL: -endif -endif diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 789e6dcf..00000000 --- a/Makefile.am +++ /dev/null @@ -1,154 +0,0 @@ -# vim:ft=automake - -ACLOCAL_AMFLAGS= -I m4 -I libtest/m4 -AM_YFLAGS= -d - -# includes append to these: -SUFFIXES = -.PHONY = -TESTS = -XFAIL_TESTS = -CLEANFILES = -DISTCLEANFILES = -bin_PROGRAMS = -noinst_HEADERS = -lib_LTLIBRARIES = -man_MANS = -noinst_LTLIBRARIES = -noinst_PROGRAMS = -include_HEADERS = -nobase_include_HEADERS = -check_PROGRAMS = -check_LTLIBRARIES= -EXTRA_HEADERS = -BUILT_SOURCES= -EXTRA_DIST= -dist_man_MANS= -MAINTAINERCLEANFILES= - -if IS_VCS_CHECKOUT -SUBDIRS= docs -endif - -#includes additional rules from aminclude.am -@INC_AMINCLUDE@ - -DISTCLEANFILES+= aminclude.am - -EXTRA_DIST+= README.FIRST -EXTRA_DIST+= README.win32 - -aclocaldir= $(datadir)/aclocal -dist_aclocal_DATA= - -# Build targets for Windows -if BUILD_WIN32 -include libhashkit-1.0/include.am -include libhashkit/include.am -include libmemcached/include.am -include libmemcached-1.0/include.am -else - -include libtest/include.am - -include libhashkit-1.0/include.am -include libmemcached-1.0/include.am - -if BUILD_LIBMEMCACHED_PROTOCOL -include libmemcachedprotocol-0.0/include.am -endif - -include libmemcachedutil-1.0/include.am - -include clients/include.am - -include man/include.am - -if BUILD_LIBMEMCACHED_PROTOCOL -include example/include.am -endif - -include libhashkit/include.am -include libmemcached/include.am -include libmemcachedutil/include.am - -if BUILD_LIBMEMCACHED_PROTOCOL -include libmemcachedprotocol/include.am -endif - -include libmemcachedinternal/include.am -include libmemcachedinternal/util/include.am -include rpm/include.mk -include support/include.am -include tests/include.am -include util/include.am -include win32/include.am - -include m4/include.am -endif - -TESTS += ${check_PROGRAMS} - -if ! BUILD_WIN32 - -merge-clean: - @find ./ | $(GREP) \.gcda | xargs rm -f - @find ./ | $(GREP) \.gcno | xargs rm -f - @find ./ | $(GREP) \.gz | xargs rm -f - @find ./ | $(GREP) \.moved | xargs rm -r -f - @find ./ | $(GREP) \\.orig | xargs rm -f - @find ./ | $(GREP) \.rej | xargs rm -f - @find ./ | $(GREP) \.THIS | xargs rm -f - @find ./ | $(GREP) \.OTHER | xargs rm -f - @find ./ | $(GREP) \.BASE | xargs rm -f - @find ./ | $(GREP) \~$$ | xargs rm -f - @echo "Files that need to be either removed or checked in:" - @bzr unknowns - -clean-local: clean-libtest-check clean-rpm - - -lcov: lcov-clean check - @echo - @echo " ------------------------------------------------------" - @echo "Make sure ./configure was run with '--enable-coverage'" - @echo "------------------------------------------------------" - @echo - @cd libmemcached && lcov --capture --directory . --base-directory .. --output-file lcov.out - @genhtml -o lcov --function-coverage -t libmemcached libmemcached/lcov.out - -lcov-clean: clean - @rm -rf lcov */lcov.out - @find . -name '*.gcno' | xargs rm -f - @find . -name '*.gcda' | xargs rm -f -endif - -DISTCLEANFILES+= config/top.h - -maintainer-clean-local: - find . -type f -name '*~' -exec rm -f '{}' \; - -$(RM) $(dist_man_MANS) - -rm -f Makefile.in - -rm -f aclocal.m4 - -rm -f build-aux/compile - -rm -f build-aux/config.guess - -rm -f build-aux/config.sub - -rm -f build-aux/depcomp - -rm -f build-aux/install-sh - -rm -f build-aux/ltmain.sh - -rm -f build-aux/missing - -rm -f build-aux/test-driver - -rm -f build-aux/ylwrap - -rm -f mem_config.in - -rm -f config.log - -rm -f config.status - -rm -f configure - -rm -f m4/libtool.m4 - -rm -f m4/ltoptions.m4 - -rm -f m4/ltsugar.m4 - -rm -f m4/ltversion.m4 - -rm -f m4/lt~obsolete.m4 - -rm -f m4/test-driver - -rmdir build-aux - -rm -rf ${top_builddir}/html - -rm -f $(DIST_ARCHIVES) diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100755 index 25cc175a..00000000 --- a/bootstrap.sh +++ /dev/null @@ -1,1918 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2012-2013 Brian Aker -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -# Environment Variables that will influence the build: -# AUTOMAKE -# AUTORECONF -# LIBTOOLIZE -# MAKE -# PREFIX -# LOG_COMPILER -# VERBOSE -# WARNINGS -# - -use_banner () -{ - echo "#####################################################################################" - echo "#" - echo "#" - echo "#" - echo "# TARGET:$1" - echo "#" - echo "#" - echo "#" - echo "#####################################################################################" -} - -command_not_found_handle () -{ - warn "$@: command not found" - - #if $DEBUG; then - echo "" - echo "Stack trace:" - local frame=0 - while caller $frame; do - ((frame++)); - done - echo "" - #fi - - return 127 -} - -error () -{ - echo "$BASH_SOURCE:$BASH_LINENO: $@" >&2 -} - -die () -{ - echo "$BASH_SOURCE:$BASH_LINENO: $@" >&2 - exit 1; -} - -warn () -{ - echo "$BASH_SOURCE:$BASH_LINENO: $@" - #echo "$BASH_SOURCE:$BASH_LINENO: $@" >&1 -} - -nassert () -{ - local param_name=\$"$1" - local param_value="$(eval "expr \"$param_name\" ")" - - if [ -n "$param_value" ]; then - echo "$bash_source:$bash_lineno: assert($param_name) had value of "$param_value"" >&2 - exit 1 - fi -} - -assert () -{ - local param_name=\$"$1" - local param_value="$(eval "expr \"$param_name\" ")" - - if [ -z "$param_value" ]; then - echo "$bash_source:$bash_lineno: assert($param_name)" >&2 - exit 1 - fi -} - -assert_file () -{ - if [ ! -f "$1" ]; then - echo "$BASH_SOURCE:$BASH_LINENO: assert($1) does not exist: $2" >&2 - exit 1; - fi -} - -assert_no_file () -{ - if [ -f "$1" ]; then - echo "$BASH_SOURCE:$BASH_LINENO: assert($1) file exists: $2" >&2 - exit 1; - fi -} - -assert_no_directory () -{ - if [ -d "$1" ]; then - echo "$BASH_SOURCE:$BASH_LINENO: assert($1) directory exists: $2" >&2 - exit 1; - fi -} - -assert_exec_file () -{ - if [ ! -f "$1" ]; then - echo "$BASH_SOURCE:$BASH_LINENO: assert($1) does not exist: $2" >&2 - exit 1; - fi - - if [ ! -x "$1" ]; then - echo "$BASH_SOURCE:$BASH_LINENO: assert($1) exists but is not executable: $2" >&2 - exit 1; - fi -} - -command_exists () -{ - type "$1" &> /dev/null ; -} - -rebuild_host_os () -{ - HOST_OS="${UNAME_MACHINE_ARCH}-${VENDOR}-${VENDOR_DISTRIBUTION}-${VENDOR_RELEASE}-${UNAME_KERNEL}-${UNAME_KERNEL_RELEASE}" - if [ -z "$1" ]; then - if $verbose; then - echo "HOST_OS=$HOST_OS" - fi - fi -} - -# Validate the distribution name, or toss an erro -# values: darwin,fedora,rhel,ubuntu,debian,opensuse -set_VENDOR_DISTRIBUTION () -{ - local dist="$(echo "$1" | tr '[:upper:]' '[:lower:]')" - case "$dist" in - darwin) - VENDOR_DISTRIBUTION='darwin' - ;; - fedora) - VENDOR_DISTRIBUTION='fedora' - ;; - rhel) - VENDOR_DISTRIBUTION='rhel' - ;; - debian) - VENDOR_DISTRIBUTION='debian' - ;; - ubuntu) - VENDOR_DISTRIBUTION='ubuntu' - ;; - suse) - VENDOR_DISTRIBUTION='opensuse' - ;; - opensuse) - VENDOR_DISTRIBUTION='opensuse' - ;; - arch) - VENDOR_DISTRIBUTION='arch' - ;; - *) - die "attempt to set an invalid VENDOR_DISTRIBUTION=$dist" - ;; - esac -} - -# Validate a Vendor's release name/number -set_VENDOR_RELEASE () -{ - local release="$(echo "$1" | tr '[:upper:]' '[:lower:]')" - - if $verbose; then - echo "VENDOR_DISTRIBUTION:$VENDOR_DISTRIBUTION" - echo "VENDOR_RELEASE:$release" - fi - - case $VENDOR_DISTRIBUTION in - darwin) - case $release in - 10.6*) - VENDOR_RELEASE='snow_leopard' - ;; - 10.7*) - VENDOR_RELEASE='mountain' - ;; - mountain) - VENDOR_RELEASE='mountain' - ;; - 10.8.*) - echo "mountain_lion" - VENDOR_RELEASE='mountain_lion' - ;; - 10.9) - echo "mavericks" - VENDOR_RELEASE='mavericks' - ;; - 10.9.*) - echo "mavericks" - VENDOR_RELEASE='mavericks' - ;; - *) - echo $release - VENDOR_RELEASE='unknown' - ;; - esac - ;; - fedora) - VENDOR_RELEASE="$release" - if [[ "x$VENDOR_RELEASE" == '18' ]]; then - VENDOR_RELEASE='sphericalcow' - fi - ;; - rhel) - VENDOR_RELEASE="$release" - ;; - debian) - VENDOR_RELEASE="$release" - ;; - ubuntu) - VENDOR_RELEASE="$release" - if [[ "x$VENDOR_RELEASE" == 'x12.04' ]]; then - VENDOR_RELEASE="precise" - elif [[ "x$VENDOR_RELEASE" == 'x12.10' ]]; then - VENDOR_RELEASE="quantal" - elif [[ "x$VENDOR_RELEASE" == 'x13.04' ]]; then - VENDOR_RELEASE="raring" - fi - ;; - opensuse) - VENDOR_RELEASE="$release" - ;; - arch) - VENDOR_RELEASE="" - ;; - unknown) - die "attempt to set VENDOR_RELEASE without setting VENDOR_DISTRIBUTION" - ;; - *) - die "attempt to set VENDOR_RELEASE with an invalid VENDOR_DISTRIBUTION=$VENDOR_DISTRIBUTION" - ;; - esac -} - - -# Valid values are: apple, redhat, centos, canonical, oracle, suse -set_VENDOR () -{ - local vendor="$(echo "$1" | tr '[:upper:]' '[:lower:]')" - - case $vendor in - apple) - VENDOR='apple' - ;; - redhat) - VENDOR='redhat' - ;; - fedora) - VENDOR='redhat' - ;; - redhat-release-server-*) - VENDOR='redhat' - ;; - enterprise-release-*) - VENDOR='oracle' - ;; - centos) - VENDOR='centos' - ;; - canonical) - VENDOR='canonical' - ;; - ubuntu) - VENDOR='canonical' - ;; - debian) - VENDOR='debian' - ;; - opensuse) - VENDOR='suse' - ;; - suse) - VENDOR='suse' - ;; - arch) - VENDOR='arch' - ;; - *) - die "An attempt was made to set an invalid VENDOR=$vendor" - ;; - esac - - set_VENDOR_DISTRIBUTION "$2" - set_VENDOR_RELEASE "$3" - - # Set which vendor/versions we trust for autoreconf - case $VENDOR_DISTRIBUTION in - fedora) - if [[ "x$VENDOR_RELEASE" == 'x18' ]]; then - AUTORECONF_REBUILD_HOST=true - elif [[ "x$VENDOR_RELEASE" == 'xsphericalcow' ]]; then - AUTORECONF_REBUILD_HOST=true - elif [[ "x$VENDOR_RELEASE" == 'x19' ]]; then - AUTORECONF_REBUILD_HOST=true - fi - ;; - canonical) - if [[ "x$VENDOR_RELEASE" == 'xprecise' ]]; then - AUTORECONF_REBUILD_HOST=true - elif [[ "x$VENDOR_RELEASE" == 'xquantal' ]]; then - AUTORECONF_REBUILD_HOST=true - fi - ;; - esac - -} - -determine_target_platform () -{ - UNAME_MACHINE_ARCH="$(uname -m 2>/dev/null)" || UNAME_MACHINE_ARCH=unknown - UNAME_KERNEL="$(uname -s 2>/dev/null)" || UNAME_SYSTEM=unknown - UNAME_KERNEL_RELEASE="$(uname -r 2>/dev/null)" || UNAME_KERNEL_RELEASE=unknown - - if [[ -x '/usr/bin/sw_vers' ]]; then - local _VERSION="$(/usr/bin/sw_vers -productVersion)" - set_VENDOR 'apple' 'darwin' $_VERSION - elif [[ $(uname) == 'Darwin' ]]; then - set_VENDOR 'apple' 'darwin' 'mountain' - elif [[ -f '/etc/fedora-release' ]]; then - local fedora_version="$(awk ' { print $3 } ' < /etc/fedora-release)" - set_VENDOR 'redhat' 'fedora' $fedora_version - elif [[ -f '/etc/centos-release' ]]; then - local centos_version="$(awk ' { print $7 } ' < /etc/centos-release)" - set_VENDOR 'centos' 'rhel' $centos_version - elif [[ -f '/etc/SuSE-release' ]]; then - local suse_distribution="$(head -1 /etc/SuSE-release | awk ' { print $1 } ')" - local suse_version="$(head -1 /etc/SuSE-release | awk ' { print $2 } ')" - set_VENDOR 'suse' $suse_distribution $suse_version - elif [[ -f '/etc/redhat-release' ]]; then - local rhel_version="$(awk ' { print $7 } ' < /etc/redhat-release)" - local _vendor="$(rpm -qf /etc/redhat-release)" - set_VENDOR $_vendor 'rhel' $rhel_version - elif [[ -f '/etc/os-release' ]]; then - source '/etc/os-release' - set_VENDOR $ID $ID $VERSION_ID - elif [[ -x '/usr/bin/lsb_release' ]]; then - local _ID="$(/usr/bin/lsb_release -s -i)" - local _VERSION="$(/usr/bin/lsb_release -s -r)" - set_VENDOR $_ID $_ID $_VERSION - elif [[ -f '/etc/lsb-release' ]]; then - source '/etc/lsb-release' - set_VENDOR 'canonical' $DISTRIB_ID $DISTRIB_CODENAME - fi - - rebuild_host_os -} - -run_configure () -{ - # We will run autoreconf if we are required - run_autoreconf_if_required - - # We always begin at the root of our build - if [ ! $? ]; then - die "Programmer error, we entered run_configure with a stacked directory" - fi - - if ! command_exists "$CONFIGURE"; then - die "$CONFIGURE does not exist" - fi - - local BUILD_DIR="$1" - if [[ -n "$BUILD_DIR" ]]; then - rm -r -f $BUILD_DIR - mkdir -p $BUILD_DIR - fi - - # Arguments for configure - local BUILD_CONFIGURE_ARG='' - - # If debug is set we enable both debug and asssert, otherwise we see if this is a VCS checkout and if so enable assert - # Set ENV ASSERT in order to enable assert. - # If we are doing a valgrind run, we always compile with assert disabled - if $valgrind_run; then - BUILD_CONFIGURE_ARG="--enable-assert=no $BUILD_CONFIGURE_ARG" - else - if $debug; then - BUILD_CONFIGURE_ARG="--enable-debug --enable-assert $BUILD_CONFIGURE_ARG" - elif [[ -n "$VCS_CHECKOUT" ]]; then - BUILD_CONFIGURE_ARG="--enable-assert $BUILD_CONFIGURE_ARG" - fi - fi - - if [[ -n "$CONFIGURE_ARG" ]]; then - BUILD_CONFIGURE_ARG="$CONFIGURE_ARG $BUILD_CONFIGURE_ARG" - fi - - if [[ -n "$PREFIX_ARG" ]]; then - BUILD_CONFIGURE_ARG="$PREFIX_ARG $BUILD_CONFIGURE_ARG" - fi - - ret=1; - # If we are executing on OSX use CLANG, otherwise only use it if we find it in the ENV - case $HOST_OS in - rhel-5*) - command_exists 'gcc44' || die "Could not locate gcc44" - run CC=gcc44 CXX=gcc44 $top_srcdir/configure "$BUILD_CONFIGURE_ARG" || die "Cannot execute CC=gcc44 CXX=gcc44 configure $BUILD_CONFIGURE_ARG" - ret=$? - ;; - *) - run $CONFIGURE "$BUILD_CONFIGURE_ARG" - ret=$? - ;; - esac - - if [ $ret -ne 0 ]; then - die "Could not execute $CONFIGURE $BUILD_CONFIGURE_ARG" - fi - - if [ ! -f 'Makefile' ]; then - die "Programmer error, configure was run but no Makefile existed after $CONFIGURE was run" - fi -} - -setup_gdb_command () -{ - GDB_TMPFILE=$(mktemp /tmp/gdb.XXXXXXXXXX) - echo 'set logging overwrite on' > "$GDB_TMPFILE" - echo 'set logging on' >> "$GDB_TMPFILE" - echo 'set environment LIBTEST_IN_GDB=1' >> "$GDB_TMPFILE" - echo 'run' >> "$GDB_TMPFILE" - echo 'thread apply all bt' >> "$GDB_TMPFILE" - echo 'quit' >> "$GDB_TMPFILE" - GDB_COMMAND="gdb -f -batch -x $GDB_TMPFILE" -} - -setup_valgrind_command () -{ - VALGRIND_PROGRAM="$(type -p valgrind)" - if [[ -n "$VALGRIND_PROGRAM" ]]; then - VALGRIND_COMMAND="$VALGRIND_PROGRAM --error-exitcode=1 --leak-check=yes --malloc-fill=A5 --free-fill=DE --xml=yes --xml-file=\"valgrind-%p.xml\"" - fi -} - -save_BUILD () -{ - if [[ -n "$OLD_CONFIGURE" ]]; then - die "OLD_CONFIGURE($OLD_CONFIGURE) was set on push, programmer error!" - fi - - if [[ -n "$OLD_CONFIGURE_ARG" ]]; then - die "OLD_CONFIGURE_ARG($OLD_CONFIGURE_ARG) was set on push, programmer error!" - fi - - if [[ -n "$OLD_PREFIX" ]]; then - die "OLD_PREFIX($OLD_PREFIX) was set on push, programmer error!" - fi - - if [[ -n "$OLD_MAKE" ]]; then - die "OLD_MAKE($OLD_MAKE) was set on push, programmer error!" - fi - - if [[ -n "$OLD_LOG_COMPILER" ]]; then - die "OLD_LOG_COMPILER($OLD_LOG_COMPILER) was set on push, programmer error!" - fi - - if [[ -n "$CONFIGURE" ]]; then - OLD_CONFIGURE=$CONFIGURE - fi - - if [[ -n "$CONFIGURE_ARG" ]]; then - OLD_CONFIGURE_ARG=$CONFIGURE_ARG - fi - - if [[ -n "$MAKE" ]]; then - OLD_MAKE=$MAKE - fi - - if [[ -n "$LOG_COMPILER" ]]; then - OLD_LOG_COMPILER=$LOG_COMPILER - fi -} - -restore_BUILD () -{ - if [[ -n "$OLD_CONFIGURE" ]]; then - CONFIGURE=$OLD_CONFIGURE - fi - - if [[ -n "$OLD_CONFIGURE_ARG" ]]; then - CONFIGURE_ARG=$OLD_CONFIGURE_ARG - fi - - if [[ -n "$OLD_PREFIX" ]]; then - PREFIX_ARG=$OLD_PREFIX - fi - - if [[ -n "$OLD_MAKE" ]]; then - MAKE=$OLD_MAKE - fi - - if [[ -n "$OLD_LOG_COMPILER" ]]; then - LOG_COMPILER=$OLD_LOG_COMPILER - fi - - OLD_CONFIGURE= - OLD_CONFIGURE_ARG= - OLD_PREFIX= - OLD_MAKE= - OLD_LOG_COMPILER= - - export -n CC CXX -} - -make_valgrind () -{ - # If the env VALGRIND_COMMAND is set then we assume it is valid - local valgrind_was_set=false - if [[ -z "$VALGRIND_COMMAND" ]]; then - setup_valgrind_command - if [[ -n "$VALGRIND_COMMAND" ]]; then - valgrind_was_set=true - fi - else - valgrind_was_set=true - fi - - # If valgrind_was_set is set to no we bail - if ! $valgrind_was_set; then - echo 'valgrind was not present' - return 1 - fi - - save_BUILD - - valgrind_run=true - - # If we are required to run configure, do so now - run_configure - - # If we don't have a configure, then most likely we will be missing libtool - assert_file 'configure' - if [[ -x 'libtool' ]]; then - LOG_COMPILER="./libtool --mode=execute $VALGRIND_COMMAND" - else - LOG_COMPILER="$VALGRIND_COMMAND" - fi - - make_target 'all' - make_target 'check' - ret=$? - - valgrind_run=false - - restore_BUILD - - if [ "$ret" -ne 0 ]; then - return 1 - fi -} - -make_install_system () -{ - local INSTALL_LOCATION="$(mktemp -d /tmp/XXXXXXXXXX)" - - save_BUILD - PREFIX_ARG="--prefix=$INSTALL_LOCATION" - - if [ ! -d $INSTALL_LOCATION ] ; then - die "ASSERT temp directory not found '$INSTALL_LOCATION'" - fi - - run_configure #install_buid_dir - - make_target 'install' - - make_target 'installcheck' - - make_target 'uninstall' - - rm -r -f $INSTALL_LOCATION - make 'distclean' - - if [ -f 'Makefile' ]; then - die "ASSERT Makefile should not exist" - fi - - restore_BUILD -} - -make_darwin_malloc () -{ - run_configure_if_required - - old_MallocGuardEdges=$MallocGuardEdges - MallocGuardEdges=1 - old_MallocErrorAbort=$MallocErrorAbort - MallocErrorAbort=1 - old_MallocScribble=$MallocScribble - MallocScribble=1 - - make_check - - MallocGuardEdges=$old_MallocGuardEdges - MallocErrorAbort=$old_MallocErrorAbort - MallocScribble=$old_MallocScribble -} - -# This will reset our environment, and make sure built files are available. -make_for_snapshot () -{ - # Lets make sure we have a clean environment - assert_no_file 'Makefile' - assert_no_file 'configure' - assert_no_directory 'autom4te.cache' - - run_configure - make_target 'all' - make_target 'distclean' - - # We should have a configure, but no Makefile at the end of this exercise - assert_no_file 'Makefile' - assert_exec_file 'configure' -} - -check_mingw () -{ - command_exists 'mingw64-configure' - ret=$? - if [ "$ret" -ne 0 ]; then - return 1 - fi - - command_exists 'mingw64-make' - ret=$? - if [ "$ret" -ne 0 ]; then - return 1 - fi - - return 0 -} - -check_clang () -{ - command_exists 'clang' - ret=$? - if [ "$ret" -ne 0 ]; then - return 1 - fi - - return 0 -} - -check_clang_analyzer () -{ - command_exists 'scan-build' - ret=$? - if [ "$ret" -ne 0 ]; then - return 1 - fi - - return 0 -} - -make_skeleton () -{ - run_configure - ret=$? - - if [ $ret -eq 0 ]; then - assert_file 'Makefile' - - make_target 'all' 'warn' - ret=$? - if [ $ret -ne 0 ]; then - warn "$MAKE failed" - else - if [[ -n "$DISPLAY" ]]; then - if command_exists 'wine'; then - LOG_COMPILER='wine' - fi - fi - - if [[ -n "$LOG_COMPILER" ]]; then - make_target 'check' 'warn' || warn "$MAKE check failed" - ret=$? - fi - fi - - if $jenkins_build_environment; then - make_target 'clean' 'warn' - fi - fi - - return $ret -} - -make_for_mingw () -{ - if ! check_mingw; then - return 1 - fi - - # Make sure it is clean - if [ -f Makefile -o -f configure ]; then - make_maintainer_clean - fi - - run_autoreconf - - save_BUILD - - CONFIGURE='mingw64-configure' - MAKE='mingw64-make' - CONFIGURE_ARGS='--enable-static --disable-shared' - - make_skeleton - ret=$? - - restore_BUILD - - return $ret -} - -make_for_clang () -{ - if ! check_clang; then - return 1 - fi - - # Make sure it is clean - if [ -f Makefile -o -f configure ]; then - make_maintainer_clean - fi - - run_autoreconf - - save_BUILD - - CC=clang CXX=clang++ - export CC CXX - - make_skeleton - ret=$? - - make_target 'check' - - restore_BUILD - - return $ret -} - -make_for_clang_analyzer () -{ - if ! check_clang; then - return 1 - fi - - if ! check_clang_analyzer; then - die 'clang-analyzer was not found' - fi - - # Make sure it is clean - if [ -f Makefile -o -f configure ]; then - make_maintainer_clean - fi - - run_autoreconf - - save_BUILD - - CC=clang CXX=clang++ - export CC CXX - CONFIGURE='scan-build ./configure' - CONFIGURE_ARGS='--enable-debug' - - run_configure - - scan-build -o clang-html make -j4 -k - - restore_BUILD -} - -# If we are locally testing, we should make sure the environment is setup correctly -check_for_jenkins () -{ - if ! $jenkins_build_environment; then - echo "Not inside of jenkins, simulating environment" - - if [ -f 'configure' ]; then - make_maintainer_clean - fi - - if $BOOTSTRAP_SNAPSHOT; then - make_for_snapshot - fi - fi -} - -make_universe () -{ - use_banner 'make maintainer-clean' - make_maintainer_clean - - use_banner 'snapshot' - make_for_snapshot - - use_banner 'valgrind' - make_valgrind - - use_banner 'gdb' - make_gdb - - use_banner 'rpm' - make_rpm - - use_banner 'clang' - make_for_clang - - use_banner 'clang analyzer' - make_for_clang_analyzer - - use_banner 'mingw' - check_mingw - if [ $? -eq 0 ]; then - make_for_mingw - fi - - use_banner 'make distcheck' - make_distcheck - - use_banner 'make install' - make_install_system -} - -check_snapshot () -{ - if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then - assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed' - fi -} - -make_for_continuus_integration () -{ - # Setup the environment if we are local - check_for_jenkins - - # No matter then evironment, we should not have a Makefile at this point - assert_no_file 'Makefile' - - # Platforms which require bootstrap should have some setup done before we hit this stage. - # If we are building locally, skip this step, unless we are just testing locally. - if $BOOTSTRAP_SNAPSHOT; then - if $BOOTSTRAP_SNAPSHOT; then - assert_file 'configure' - fi - - check_snapshot - else - # If we didn't require a snapshot, then we should not have a configure - assert_no_file 'configure' - - run_autoreconf - fi - - assert_no_file 'Makefile' 'Programmer error, Makefile existed where build state should have been clean' - - case $HOST_OS in - *) - make_jenkins_default - ;; - esac - - make_maintainer_clean -} - -# The point to this test is to test bootstrap.sh itself -self_test () -{ - # We start off with a clean env - make_maintainer_clean - -# eval "./bootstrap.sh jenkins" || die "failed 'jenkins'" -# eval "./bootstrap.sh all" || die "failed 'all'" -# eval "./bootstrap.sh gdb" || die "failed 'gdb'" -# eval "./bootstrap.sh maintainer-clean" || die "failed 'maintainer-clean'" -} - -make_install_html () -{ - run_configure_if_required - assert_file 'configure' - - make_target 'install-html' -} - -make_gdb () -{ - save_BUILD - - if command_exists 'gdb'; then - run_configure_if_required - - # Set ENV GDB_COMMAND - if [[ -z "$GDB_COMMAND" ]]; then - setup_gdb_command - fi - - # If we don't have a configure, then most likely we will be missing libtool - assert_file 'configure' - if [[ -f 'libtool' ]]; then - LOG_COMPILER="./libtool --mode=execute $GDB_COMMAND" - else - LOG_COMPILER="$GDB_COMMAND" - fi - - make_target 'check' - - if [ -f 'gdb.txt' ]; then - rm 'gdb.txt' - fi - - if [ -f '.gdb_history' ]; then - rm '.gdb_history' - fi - - if $jenkins_build_environment; then - make_target 'clean' - fi - else - echo 'gdb was not present' - return 1 - fi - - restore_BUILD -} - -# $1 target to compile -# $2 to die, or not to die, based on contents -make_target () -{ - if [ -z "$1" ]; then - die "Programmer error, no target provided for make" - fi - - if [ ! -f 'Makefile' ]; then - die "Programmer error, make was called before configure" - run_configure - fi - - if [ -n "$LOG_COMPILER" ]; then - if $verbose; then - echo "LOG_COMPILER=$LOG_COMPILER" - fi - fi - - if [ -z "$MAKE" ]; then - die "MAKE was not set" - fi - - # $2 represents error or warn - run "$MAKE" "$1" - ret=$? - - if [ $ret -ne 0 ]; then - if [ -n "$2" ]; then - warn "Failed to execute $MAKE $1: $ret" - elif [ $ret -eq 2 ]; then - die "Failed to execute $MAKE $1" - else - die "Failed to execute $MAKE $1: $ret" - fi - fi - - return $ret -} - -make_distcheck () -{ - make_target 'distcheck' -} - -make_rpm () -{ - if command_exists 'rpmbuild'; then - if [ -f 'rpm.am' -o -d 'rpm' ]; then - run_configure_if_required - make_target 'dist-rpm' - - if $jenkins_build_environment; then - mkdir artifacts - mv *.tar.gz *.rpm artifacts - - make_target 'maintainer-clean' - mv artifacts/* . - rmdir artifacts - fi - - fi - fi -} - -make_maintainer_clean () -{ - run_configure_if_required - make_target 'maintainer-clean' 'no_error' - - # Lets make sure we really cleaned up the environment - assert_no_file 'Makefile' - assert_no_file 'configure' - assert_no_directory 'autom4te.cache' -} - -make_distclean () -{ - run_configure_if_required - make_target 'distclean' 'no_error' - - # Lets make sure we really cleaned up the environment - assert_no_file 'Makefile' - assert_file 'configure' -} - -make_check () -{ - make_target 'check' -} - -make_jenkins_default () -{ - run_configure - make_target 'all' -} - -make_default () -{ - run_configure_if_required - make_target 'all' -} - -run_configure_if_required () -{ - run_autoreconf_if_required - - if [ ! -f 'Makefile' ]; then - run_configure - fi - - assert_file 'Makefile' 'configure did not produce a Makefile' -} - -run_make_maintainer_clean_if_possible () -{ - if [ -f 'Makefile' ]; then - make_maintainer_clean - fi -} - -run_autoreconf_if_required () -{ - if [ ! -x 'configure' ]; then - run_autoreconf - fi - - assert_exec_file 'configure' - bash -n configure -} - -run_autoreconf () -{ - if [[ -z "$AUTORECONF" ]]; then - die "Programmer error, tried to call run_autoreconf () but AUTORECONF was not set" - fi - - if $use_libtool; then - assert $BOOTSTRAP_LIBTOOLIZE - if $jenkins_build_environment; then - run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE" - else - run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE" - fi - fi - - run "$AUTORECONF" "$AUTORECONF_ARGS" || die "Cannot execute $AUTORECONF" - - eval 'bash -n configure' || die "autoreconf generated a malformed configure" -} - -run () -{ - if $verbose; then - echo "\`$@' $ARGS" - fi - - if [ -z "$1" ]; then - return 127; - fi - - eval "$@" "$ARGS" -} - -parse_command_line_options () -{ - local SHORTOPTS=':apcmt:dvh' - - nassert OPT_TARGET - - while getopts "$SHORTOPTS" opt; do - case $opt in - a) #--autoreconf - AUTORECONF_OPTION=true - OPT_TARGET+='autoreconf' - ;; - p) #--print-env - print_setup_opt=true - ;; - c) # --configure - CONFIGURE_OPTION=true - OPT_TARGET+='configure' - ;; - m) # maintainer-clean - CLEAN_OPTION=true - ;; - o) # target - CONFIGURE_ARG="$OPTARG" - ;; - t) # target - TARGET_OPTION=true - TARGET_OPTION_ARG="$OPTARG" - OPT_TARGET+="$OPTARG" - ;; - d) # debug - opt_debug=true - enable_debug - ;; - h) # help - echo "bootstrap.sh [options] optional_target ..." - echo " -a # Just run autoreconf"; - echo " -p # Print ENV"; - echo " -c # Just run configure"; - echo " -m # Just run maintainer-clean"; - echo " -o # Specify configure arguments"; - echo " -t # Make target"; - echo " -d # Enable debug"; - echo " -h # Show help"; - echo " -v # Be more verbose in output"; - exit - ;; - v) # verbose - opt_verbose=true - verbose=true - ;; - :) - echo "Option -$OPTARG requires an argument." >&2 - exit 1 - ;; - *) - echo "$0: error - unrecognized option $1" 1>&2 - exit 1 - ;; - esac - done - - shift $((OPTIND-1)) - - if [ -n "$1" ]; then - OPT_TARGET="$@" - fi -} - -determine_vcs () -{ - if [[ -d '.git' ]]; then - VCS_CHECKOUT=git - elif [[ -d '.bzr' ]]; then - VCS_CHECKOUT=bzr - elif [[ -d '.svn' ]]; then - VCS_CHECKOUT=svn - elif [[ -d '.hg' ]]; then - VCS_CHECKOUT=hg - else - VCS_CHECKOUT= - fi - - if [[ -n "$VCS_CHECKOUT" ]]; then - verbose=true - fi -} - -require_libtoolise () -{ - grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \ - && use_libtool=true - grep '^[ ]*LT_INIT' configure.ac >/dev/null \ - && use_libtool=true -} - -autoreconf_setup () -{ - # Set ENV MAKE in order to override "make" - if [[ -z "$MAKE" ]]; then - if command_exists 'gmake'; then - MAKE="$(type -p gmake)" - else - if command_exists 'make'; then - MAKE="$(type -p make)" - fi - fi - - if [ "$VCS_CHECKOUT" ]; then - if $debug; then - MAKE="$MAKE --warn-undefined-variables" - fi - fi - - if $debug; then - MAKE="$MAKE -d" - fi - fi - - if [[ -z "$GNU_BUILD_FLAGS" ]]; then - if $jenkins_build_environment; then - GNU_BUILD_FLAGS="--install" - else - GNU_BUILD_FLAGS="--install --force" - fi - fi - - if $verbose; then - GNU_BUILD_FLAGS="$GNU_BUILD_FLAGS --verbose" - fi - - if [ -z "$ACLOCAL_PATH" ]; then - ACLOCAL_PATH="/usr/local/share/aclocal $ACLOCAL_PATH" - fi - - if [[ -z "$WARNINGS" ]]; then - if [[ -n "$VCS_CHECKOUT" ]]; then - WARNINGS="all,error" - else - WARNINGS="all" - fi - fi - - if $use_libtool; then - if [[ -n "$LIBTOOLIZE" ]]; then - BOOTSTRAP_LIBTOOLIZE="$(type -p $LIBTOOLIZE)" - - if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then - echo "Couldn't find user supplied libtoolize, it is required" - return 1 - fi - else - # If we are using OSX, we first check to see glibtoolize is available - if [[ "$VENDOR_DISTRIBUTION" == "darwin" ]]; then - BOOTSTRAP_LIBTOOLIZE="$(type -p glibtoolize)" - - if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then - echo "Couldn't find glibtoolize, it is required on OSX" - return 1 - fi - else - BOOTSTRAP_LIBTOOLIZE="$(type -p libtoolize)" - - if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then - echo "Couldn't find libtoolize, it is required" - return 1 - fi - fi - fi - - if $verbose; then - LIBTOOLIZE_OPTIONS="--verbose $BOOTSTRAP_LIBTOOLIZE_OPTIONS" - fi - - if $debug; then - LIBTOOLIZE_OPTIONS="--debug $BOOTSTRAP_LIBTOOLIZE_OPTIONS" - fi - - # Here we set LIBTOOLIZE to true since we are going to invoke it via BOOTSTRAP_LIBTOOLIZE - LIBTOOLIZE=true - fi - - # Test the ENV AUTOMAKE if it exists - if [[ -n "$AUTOMAKE" ]]; then - run "$AUTOMAKE" '--help' &> /dev/null || die "Failed to run AUTOMAKE:$AUTOMAKE" - fi - - # Test the ENV AUTOCONF if it exists - if [[ -n "$AUTOCONF" ]]; then - run "$AUTOCONF" '--help' &> /dev/null || die "Failed to run AUTOCONF:$AUTOCONF" - fi - - # Test the ENV AUTOHEADER if it exists - if [[ -n "$AUTOHEADER" ]]; then - run "$AUTOHEADER" '--help' &> /dev/null || die "Failed to run AUTOHEADER:$AUTOHEADER" - fi - - # Test the ENV AUTOM4TE if it exists - if [[ -n "$AUTOM4TE" ]]; then - run "$AUTOM4TE" '--help' &> /dev/null || die "Failed to run AUTOM4TE:$AUTOM4TE" - fi - - # Test the ENV AUTOHEADER if it exists, if not we add one and add --install - if [[ -z "$ACLOCAL" ]]; then - ACLOCAL="aclocal --install" - fi - run "$ACLOCAL" '--help' &> /dev/null || die "Failed to run ACLOCAL:$ACLOCAL" - - if [[ -z "$AUTORECONF" ]]; then - AUTORECONF="$(type -p autoreconf)" - - if [[ -z "$AUTORECONF" ]]; then - die "Couldn't find autoreconf" - fi - - if [[ -n "$GNU_BUILD_FLAGS" ]]; then - AUTORECONF_ARGS="$GNU_BUILD_FLAGS" - fi - fi - - run "$AUTORECONF" '--help' &> /dev/null || die "Failed to run AUTORECONF:$AUTORECONF" -} - -print_setup () -{ - local saved_debug_status=$debug - if $debug; then - disable_debug - fi - - echo '----------------------------------------------' - echo 'BOOTSTRAP ENV' - echo "AUTORECONF=$AUTORECONF" - echo "HOST_OS=$HOST_OS" - echo "VENDOR=$VENDOR" - echo "VENDOR_DISTRIBUTION=$VENDOR_DISTRIBUTION" - echo "VENDOR_RELEASE=$VENDOR_RELEASE" - - echo "getopt()" - if $AUTORECONF_OPTION; then - echo "--autoreconf" - fi - - if $CLEAN_OPTION; then - echo "--clean" - fi - - if $CONFIGURE_OPTION; then - echo "--configure" - fi - - if $opt_debug; then - echo "--debug" - fi - - if $print_setup_opt; then - echo "--print-env" - fi - - if $TARGET_OPTION; then - echo "--target=$TARGET_OPTION_ARG" - fi - - if $opt_verbose; then - echo "--verbose" - fi - - if [[ -n "$MAKE" ]]; then - echo "MAKE=$MAKE" - fi - - if [[ -n "$BOOTSTRAP_TARGET" ]]; then - echo "BOOTSTRAP_TARGET=$BOOTSTRAP_TARGET" - fi - - if [[ -n "$PREFIX" ]]; then - echo "PREFIX=$PREFIX" - fi - - if [[ -n "$LOG_COMPILER" ]]; then - echo "LOG_COMPILER=$LOG_COMPILER" - fi - - if [[ -n "$VCS_CHECKOUT" ]]; then - echo "VCS_CHECKOUT=$VCS_CHECKOUT" - fi - - if $debug; then - echo "debug=true" - fi - - if [[ -n "$WARNINGS" ]]; then - echo "WARNINGS=$WARNINGS" - fi - - if $saved_debug_status; then - echo "DEBUG=true" - fi - - echo '----------------------------------------------' - - if $saved_debug_status; then - enable_debug - fi -} - -make_clean_option () -{ - run_configure_if_required - - make_maintainer_clean - - if [[ "$VCS_CHECKOUT" == 'git' ]]; then - run "$VCS_CHECKOUT" status --ignored - elif [[ -n "$VCS_CHECKOUT" ]]; then - run "$VCS_CHECKOUT" status - fi -} - -make_for_autoreconf () -{ - if [ -f 'Makefile' ]; then - make_maintainer_clean - fi - - run_autoreconf - - assert_no_file 'Makefile' -} - -check_make_target() -{ - local ret=0 - case $1 in - 'self') - ;; - 'rpm') - ;; - 'gdb') - ;; - 'clean_op') - ;; - 'autoreconf') - ;; - 'install-system') - ;; - 'configure') - ;; - 'distcheck') - ;; - 'check') - ;; - 'snapshot') - ;; - 'mingw') - ;; - 'universe') - ;; - 'valgrind') - ;; - 'jenkins') - ;; - 'distclean') - ;; - 'maintainer-clean') - ;; - 'install') - ;; - 'all') - ;; - 'make_default') - ;; - 'clang') - ;; - 'clang-analyzer') - ;; - test-*) - ;; - valgrind-*) - ;; - gdb-*) - ;; - 'dist') - ;; - *) - echo "Matched default" - ret=1 - ;; - esac - - return $ret -} - -execute_job () -{ - # We should always have a target by this point - assert BOOTSTRAP_TARGET - - determine_target_platform - - determine_vcs - - # Set up whatever we need to do to use autoreconf later - use_libtool=false - require_libtoolise - if ! autoreconf_setup; then - return 1 - fi - - if $print_setup_opt -o $debug; then - echo - print_setup - echo - - # Exit if all we were looking for were the currently used options - if $print_setup_opt; then - exit - fi - fi - - # Use OLD_LOG_COMPILER for tracking the state of the variable - local OLD_LOG_COMPILER= - - # Set ENV PREFIX in order to set --prefix for ./configure - if [[ -n "$PREFIX" ]]; then - PREFIX_ARG="--prefix=$PREFIX" - fi - - if $CLEAN_OPTION; then - make_maintainer_clean - fi - - local BOOTSTRAP_TARGET_ARRAY - BOOTSTRAP_TARGET_ARRAY=( $BOOTSTRAP_TARGET ) - - for target in "${BOOTSTRAP_TARGET_ARRAY[@]}" - do - # If we are running inside of Jenkins, we want to only run some of the possible tests - if $jenkins_build_environment; then - check_make_target $target - ret=$? - if [ $ret -ne 0 ]; then - warn "Unknown BOOTSTRAP_TARGET option: $target" - target="jenkins" - fi - fi - - if $jenkins_build_environment; then - use_banner $target - fi - - local snapshot_run=false - local valgrind_run=false - - case $target in - 'self') - self_test - ;; - 'gdb') - make_gdb - ;; - 'install-html') - make_install_html - ;; - 'clean_op') - make_clean_option - ;; - 'autoreconf') - make_for_autoreconf - ;; - 'install-system') - make_install_system - ;; - 'configure') - run_configure - ;; - 'make_default') - make_default - ;; - 'clang') - make_distclean - if ! check_clang; then - die "clang was not found" - fi - - if ! make_for_clang; then - die "Failed to build clang: $?" - fi - ;; - 'clang-analyzer') - make_distclean - if ! check_clang_analyzer; then - die "clang-analyzer was not found" - fi - if ! check_clang; then - die "clang was not found" - fi - - if ! make_for_clang_analyzer; then - die "Failed to build clang-analyzer: $?" - fi - ;; - 'mingw') - make_distclean - if ! make_for_mingw; then - die "Failed to build mingw: $?" - fi - ;; - 'snapshot') - make_for_snapshot - snapshot_run=true - check_snapshot - ;; - 'rpm') - make_rpm - ;; - 'darwin_malloc') - make_darwin_malloc - ;; - 'valgrind') - make_valgrind - ;; - 'universe') - make_universe - ;; - 'jenkins') - make_for_continuus_integration - ;; - *) - run_configure_if_required - make_target "$target" - ;; - esac - done -} - -main () -{ - # Are we running inside of Jenkins? - if [[ -n "$JENKINS_HOME" ]]; then - declare -r jenkins_build_environment=true - else - declare -r jenkins_build_environment=false - fi - - # Variables we export - declare -x VCS_CHECKOUT= - - # Variables we control globally - local -a BOOTSTRAP_TARGET= - local CONFIGURE= - local use_libtool=false - local verbose=false - - #getop variables - local opt_debug=false - local opt_verbose=false - - if [[ -n "$VERBOSE" ]]; then - verbose=true - fi - - # Options for getopt - local AUTORECONF_OPTION=false - local CLEAN_OPTION=false - local CONFIGURE_OPTION=false - local print_setup_opt=false - local TARGET_OPTION=false - local TARGET_OPTION_ARG= - - local OLD_CONFIGURE= - local OLD_CONFIGURE_ARG= - local OLD_PREFIX= - local OLD_MAKE= - local OLD_LOG_COMPILER= - - # If we call autoreconf on the platform or not - local AUTORECONF_REBUILD_HOST=false - local AUTORECONF_REBUILD=false - - local -r top_srcdir="$(pwd)" - - # Default configure - if [ -z "$CONFIGURE" ]; then - CONFIGURE="$top_srcdir/configure" - fi - - - # Variables for determine_target_platform () and rebuild_host_os () - # UNAME_MACHINE_ARCH= uname -m - # VENDOR= apple, redhat, centos, canonical - # VENDOR_RELEASE= - # RHEL{rhel,Tikanga,Santiago} - # Ubuntu{ubuntu,Lucid,Maverick,Natty,Oneiric,Precise,Quantal} - # Fedora{fedora,Verne,Beefy} - # OSX{osx,lion,snow,mountain} - # VENDOR_DISTRIBUTION= darwin,fedora,rhel,ubuntu - # UNAME_KERNEL= Linux, Darwin,... - # UNAME_KERNEL_RELEASE= Linux, Darwin,... - local UNAME_MACHINE_ARCH=unknown - local VENDOR=unknown - local VENDOR_RELEASE=unknown - local VENDOR_DISTRIBUTION=unknown - local UNAME_KERNEL=unknown - local UNAME_KERNEL_RELEASE=unknown - local HOST_OS= - - rebuild_host_os no_output - - local OPT_TARGET= - parse_command_line_options "$@" - - nassert BOOTSTRAP_TARGET - - if [ -n "$OPT_TARGET" ]; then - BOOTSTRAP_TARGET="$OPT_TARGET" - fi - - if [ -z "$BOOTSTRAP_TARGET" ]; then - BOOTSTRAP_TARGET="make_default" - fi - - # We should always have a target by this point - assert BOOTSTRAP_TARGET - - execute_job - local ret=$? - - jobs -l - wait - - exit $ret -} - -set_branch () -{ - if [ -z "$BRANCH" ]; then - if [ -z "$CI_PROJECT_TEAM" ]; then - die "Variable CI_PROJECT_TEAM has not been set" - fi - if [ -z "$PROJECT" ]; then - die "Variable PROJECT has not been set" - fi - if [ -z "$BUILD_TAG" ]; then - die "Variable BUILD_TAG has not been set" - fi - - BRANCH="lp:~$CI_PROJECT_TEAM/$PROJECT/$BUILD_TAG" - export BRANCH - fi - - if [ -z "$BRANCH" ]; then - die "Missing values required to build BRANCH variable." - fi -} - -merge () -{ - if [ -z "$VCS_CHECKOUT" ]; then - die "Merges require VCS_CHECKOUT." - fi - - set_branch - - if [[ "$VCS_CHECKOUT" == 'bzr' ]]; then - if test -n "$BRANCH_TO_MERGE"; then - bzr merge $BRANCH_TO_MERGE - bzr commit --message="Merge $BRANCH_TO_MERGE Build: $BUILD_TAG" --unchanged - fi - - bzr push "$BRANCH" - elif [[ -n "$VCS_CHECKOUT" ]]; then - die "Merge attempt occured, current VCS setup does not support this" - fi -} - -enable_debug () -{ - if ! $debug; then - local caller_loc="$(caller)" - if [[ -n "$1" ]]; then - echo "$caller_loc Enabling debug: $1" - else - echo "$caller_loc Enabling debug" - fi - set -x - debug=true - fi -} - -usage () -{ - cat << EOF - Usage: $program_name [OPTION].. - - Bootstrap this package from the checked-out sources, and optionally walk through CI run. - - Options: - -EOF -} - -disable_debug () -{ - set +x - debug=false -} - -check_shell () -{ - if [ -x '/usr/local/bin/shellcheck' ]; then - /usr/local/bin/shellcheck "$1" - local ret=$? - - if [ "$ret" -ne 0 ]; then - die "$1 failed shellcheck" - fi - fi -} - -bootstrap () -{ - check_shell 'bootstrap.sh' - local env_debug_enabled=false - local debug=false - - export ACLOCAL - export AUTOCONF - export AUTOHEADER - export AUTOM4TE - export AUTOMAKE - export AUTORECONF - export CONFIGURE_ARG - export DEBUG - export GNU_BUILD_FLAGS - export LIBTOOLIZE - export LIBTOOLIZE_OPTIONS - export MAKE - export PREFIX_ARG - export LOG_COMPILER - export VERBOSE - export WARNINGS - - case $OSTYPE in - darwin*) - export MallocGuardEdges - export MallocErrorAbort - export MallocScribble - ;; - esac - - # We check for DEBUG twice, once before we source the config file, and once afterward - if [[ -n "$DEBUG" ]]; then - env_debug_enabled=true - fi - - # Variables which only can be set by .bootstrap - BOOTSTRAP_SNAPSHOT=false - BOOTSTRAP_SNAPSHOT_CHECK= - - if [ -f '.bootstrap' ]; then - source '.bootstrap' - fi - - # We do this in order to protect the case where DEBUG that came from the ENV (i.e. it overrides what is found in .bootstrap - if $env_debug_enabled; then - enable_debug - elif [[ -n "$DEBUG" ]]; then - enable_debug "Enabling DEBUG from '.bootstrap'" - fi - - if $env_debug_enabled; then - print_setup - fi - - - main "$@" -} - -# Script begins here -declare -r program_name="$0" -bootstrap "$@" diff --git a/clients/include.am b/clients/include.am deleted file mode 100644 index c3e0fabe..00000000 --- a/clients/include.am +++ /dev/null @@ -1,146 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -CLIENTS_LDADDS= -CLIENTS_LDADDS+= clients/libutilities.la -CLIENTS_LDADDS+= libmemcached/libmemcached.la - -bin_PROGRAMS+= clients/memcapable -bin_PROGRAMS+= clients/memcat -bin_PROGRAMS+= clients/memcp -bin_PROGRAMS+= clients/memdump -bin_PROGRAMS+= clients/memerror -bin_PROGRAMS+= clients/memexist -bin_PROGRAMS+= clients/memtouch -bin_PROGRAMS+= clients/memflush -bin_PROGRAMS+= clients/memparse -bin_PROGRAMS+= clients/memping -bin_PROGRAMS+= clients/memrm -bin_PROGRAMS+= clients/memslap -bin_PROGRAMS+= clients/memstat - -if BUILD_MEMASLAP -if HAVE_LIBEVENT -if !BUILD_WIN32_WRAPPERS - bin_PROGRAMS+= clients/memaslap -endif -endif -endif - -noinst_HEADERS+= clients/client_options.h -noinst_HEADERS+= clients/execute.h -noinst_HEADERS+= clients/generator.h -noinst_HEADERS+= clients/ms_atomic.h -noinst_HEADERS+= clients/ms_conn.h -noinst_HEADERS+= clients/ms_memslap.h -noinst_HEADERS+= clients/ms_setting.h -noinst_HEADERS+= clients/ms_sigsegv.h -noinst_HEADERS+= clients/ms_stats.h -noinst_HEADERS+= clients/ms_task.h -noinst_HEADERS+= clients/ms_thread.h -noinst_HEADERS+= clients/utilities.h - -noinst_LTLIBRARIES+= clients/libutilities.la -clients_libutilities_la_SOURCES= clients/utilities.cc - -clients_memcat_SOURCES= clients/memcat.cc -clients_memcat_LDADD= $(CLIENTS_LDADDS) - -clients_memparse_SOURCES= clients/memparse.cc -clients_memparse_LDADD= $(CLIENTS_LDADDS) - -clients_memcp_SOURCES= clients/memcp.cc -clients_memcp_LDADD= $(CLIENTS_LDADDS) - -clients_memdump_SOURCES= clients/memdump.cc -clients_memdump_LDADD= $(CLIENTS_LDADDS) - -clients_memstat_SOURCES= clients/memstat.cc -clients_memstat_LDADD= $(CLIENTS_LDADDS) - -clients_memrm_SOURCES= clients/memrm.cc -clients_memrm_LDADD= $(CLIENTS_LDADDS) - -clients_memexist_SOURCES= clients/memexist.cc -clients_memexist_LDADD= $(CLIENTS_LDADDS) - -clients_memtouch_SOURCES= clients/memtouch.cc -clients_memtouch_LDADD= $(CLIENTS_LDADDS) - -clients_memflush_SOURCES= clients/memflush.cc -clients_memflush_LDADD= $(CLIENTS_LDADDS) - -clients_memping_SOURCES= clients/memping.cc -clients_memping_LDADD= $(CLIENTS_LDADDS) libmemcached/libmemcachedutil.la - -clients_memerror_SOURCES= clients/memerror.cc -clients_memerror_LDADD= $(CLIENTS_LDADDS) - -clients_memslap_SOURCES = clients/memslap.cc -clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc -clients_memslap_CXXFLAGS= @PTHREAD_CFLAGS@ -clients_memslap_LDADD= $(CLIENTS_LDADDS) -clients_memslap_LDADD+= @PTHREAD_LIBS@ - -clients_memaslap_SOURCES= -clients_memaslap_SOURCES+= clients/memaslap.c -clients_memaslap_SOURCES+= clients/ms_conn.c -clients_memaslap_SOURCES+= clients/ms_setting.c -clients_memaslap_SOURCES+= clients/ms_sigsegv.c -clients_memaslap_SOURCES+= clients/ms_stats.c -clients_memaslap_SOURCES+= clients/ms_task.c -clients_memaslap_SOURCES+= clients/ms_thread.c - -clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc -clients_memaslap_LDADD= -clients_memaslap_LDADD+= @LIBEVENT_LIB@ -clients_memaslap_LDADD+= $(CLIENTS_LDADDS) - -clients_memcapable_CXXFLAGS= @PTHREAD_CFLAGS@ -clients_memcapable_SOURCES= -clients_memcapable_SOURCES+= clients/memcapable.cc -clients_memcapable_SOURCES+= libmemcached/byteorder.cc -clients_memcapable_LDADD= $(CLIENTS_LDADDS) -clients_memcapable_LDADD+= @PTHREAD_LIBS@ - -$(TESTS): | mem.testdata -mem.testdata: - date > $@ - -TESTS += clients/memcapable.sh -TESTS += clients/memcp.sh -TESTS += clients/memcat.sh -TESTS += clients/memdump.sh -TESTS += clients/memerror.sh -TESTS += clients/memexist.sh -TESTS += clients/memparse.sh -TESTS += clients/memping.sh -TESTS += clients/memrm.sh -TESTS += clients/memslap.sh -TESTS += clients/memstat.sh -TESTS += clients/memtouch.sh -TESTS += clients/memflush.sh - -test-start-server: - clients/memflush --servers=localhost - clients/memcp --servers=localhost /etc/services - clients/memcat --servers=localhost services - clients/memrm --servers=localhost /etc/services - clients/memstat --servers=localhost - clients/memslap --servers=localhost - clients/memslap --servers=localhost --concurrency=10 - clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 - clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 - clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get - clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set - clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking - -client-valgrind: - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set - libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 265ae899..00000000 --- a/configure.ac +++ /dev/null @@ -1,420 +0,0 @@ -# configure.ac -*- autoconf -*- vim: filetype=config -# -# LibmemcacheD -# Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/ -# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye -# All rights reserved. -# -# Use and distribution licensed under the BSD license. See -# the COPYING file in this directory for full text. - -m4_include([version.m4]) - -AC_PREREQ([2.61]) -AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/]) - -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) - -# Setup the compilers early on -AC_PROG_CC([cc gcc clang]) -AC_PROG_CXX([c++ g++ clang++]) - -AC_CANONICAL_HOST -AC_ARG_PROGRAM -AC_USE_SYSTEM_EXTENSIONS - -AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-ustar]) - -AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS. -AC_SUBST([AUTOHEADER_FILE],[mem_config.h]) -AC_CONFIG_SRCDIR([libmemcached/memcached.cc]) - -#shared library versioning -MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0 -MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0 -MEMCACHED_LIBRARY_VERSION=12:0:0 -# | | | -# +------+ | +---+ -# | | | -# current:revision:age -# | | | -# | | +- increment if interfaces have been added -# | | set to zero if interfaces have been removed or changed -# | +- increment if source code has changed -# | set to zero if current is incremented -# +- increment if interfaces have been added, removed or changed -AC_SUBST([MEMCACHED_UTIL_LIBRARY_VERSION]) -AC_SUBST([MEMCACHED_PROTOCAL_LIBRARY_VERSION]) -AC_SUBST([MEMCACHED_LIBRARY_VERSION]) - -AX_HEX_VERSION([LIBMEMCACHED],[$VERSION]) -AX_HEX_VERSION([LIBHASHKIT],[1.0.0]) -AC_SUBST([RPM_RELEASE],[1]) - -m4_include([libhashkit/include.m4]) - -LT_PREREQ([2.2]) -LT_INIT([dlopen]) -LT_LANG([C++]) -LT_LIB_M - -AC_SUBST([lt_cv_dlopen_libs]) - - -AC_PROG_CC_C99 -AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])]) - -AC_LANG_PUSH([C++]) -AX_CHECK_COMPILE_FLAG([-std=gnu++14], [ - AX_APPEND_COMPILE_FLAGS(["-std=gnu++14"]) -], [ - AX_CHECK_COMPILE_FLAG([-std=c++14], [ - AX_APPEND_COMPILE_FLAGS(["-std=c++14"]) - ], [ - AX_CHECK_COMPILE_FLAG([-std=gnu++11], [ - AX_APPEND_COMPILE_FLAGS(["-std=gnu++11"]) - ], [ - AX_CHECK_COMPILE_FLAG([-std=c++11], [ - AX_APPEND_COMPILE_FLAGS(["-std=c++11"]) - ], [ - AX_CHECK_COMPILE_FLAG([-std=gnu++0x], [ - AX_APPEND_COMPILE_FLAGS(["-std=gnu++0x"]) - ], [ - AX_APPEND_COMPILE_FLAGS(["-std=c++0x"]) - ]) - ]) - ]) - ]) -]) -AC_LANG_POP([C++]) - - -AC_LANG_PUSH([C]) -AX_COMPILER_VENDOR -AX_COMPILER_VERSION -AC_LANG_POP([C]) -AC_LANG_PUSH([C++]) -AX_COMPILER_VENDOR -AX_COMPILER_VERSION -AC_LANG_POP([C++]) - -AX_ASSERT - -AX_PLATFORM -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_DEFUN([LIBMEMCACHED_PROTOCOL], - [AC_ARG_ENABLE([libmemcachedprotocol], - [AS_HELP_STRING([--enable-libmemcachedprotocol], - [Enable libmemcachedprotocol])], - [ax_enable_libmemcachedprotocol=yes], - [ax_enable_libmemcachedprotocol=no]) - - AM_CONDITIONAL([BUILD_LIBMEMCACHED_PROTOCOL],[test "$ax_enable_libmemcachedprotocol" = "yes"]) - - AC_MSG_CHECKING([for libmemcachedprotocol]) - AC_MSG_RESULT([$ax_enable_libmemcachedprotocol]) - ]) -LIBMEMCACHED_PROTOCOL - -# Adding support for libtest -m4_include([libtest/yatl.m4]) - -CHECK_FOR_GEARMAND -CHECK_FOR_LIBGEARMAND - -AM_CONDITIONAL([BUILDING_LIBMEMCACHED],[true]) -AM_CONDITIONAL([HAVE_LIBMEMCACHED],[false]) -AM_CONDITIONAL([HAVE_LIBDRIZZLE],[false]) -AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Enables libmemcached Support]) - -AM_CONDITIONAL([BUILDING_GEARMAN],[false]) - -# Specialty checks -AX_CXX_CINTTYPES -CONFIG_EXTRA -DETECT_BYTEORDER -SETSOCKOPT_SANITY -ENABLE_HSIEH_HASH -ENABLE_MURMUR_HASH -ENABLE_FNV64_HASH -ENABLE_MEMASLAP -PROTOCOL_BINARY_TEST -ENABLE_DEPRECATED - -# Checks for programs. -AC_CHECK_PROGS([DPKG_GENSYMBOLS],[dpkg-gensymbols]) -AC_CHECK_PROGS([LEX],['flex'],[:]) -AC_CHECK_PROGS([PERL],[perl]) -AC_CHECK_PROGS([VALGRIND],['valgrind']) -AC_CHECK_PROGS([WINE],['wine']) -AC_CHECK_PROGS([YACC],['bison --warnings=all'],[:]) -AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck]) -AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree]) -AC_CHECK_PROGS([RPM],[rpm]) -AC_PROG_AWK -AC_PROG_MKDIR_P -AC_PROG_SED -AX_PROG_MEMCACHED -AX_PROG_SPHINX_BUILD(,[AC_MSG_WARN([sphinx-build version 1.0 or greater is required to build man pages])]) -AX_WITH_PROG([LCOV],[lcov]) -AX_WITH_PROG([LCOV_GENHTML],[genhtml]) -AC_DEFINE([HAVE_MEMCACHED_SASL_BINARY],[0],[If Memcached binary with sasl support is available]) - -# Checks for libraries. -AC_SEARCH_LIBS([getopt_long],[gnugetopt]) -AC_SEARCH_LIBS([gethostbyname],[nsl]) - -# Checks for header files. -AC_CHECK_HEADERS_ONCE([arpa/inet.h]) -AC_CHECK_HEADERS_ONCE([errno.h]) -AC_CHECK_HEADERS_ONCE([execinfo.h]) -AC_CHECK_HEADERS_ONCE([fcntl.h]) -AC_CHECK_HEADERS_ONCE([features.h]) -AC_CHECK_HEADERS_ONCE([fnmatch.h]) -AC_CHECK_HEADERS_ONCE([inttypes.h]) -AC_CHECK_HEADERS_ONCE([libintl.h]) -AC_CHECK_HEADERS_ONCE([limits.h]) -AC_CHECK_HEADERS_ONCE([linux/sysctl.h]) -AC_CHECK_HEADERS_ONCE([mach/mach.h]) -AC_CHECK_HEADERS_ONCE([malloc.h]) -AC_CHECK_HEADERS_ONCE([math.h]) -AC_CHECK_HEADERS_ONCE([netdb.h]) -AC_CHECK_HEADERS_ONCE([netinet/in.h]) -AC_CHECK_HEADERS_ONCE([netinet/tcp.h]) -AC_CHECK_HEADERS_ONCE([poll.h]) -AC_CHECK_HEADERS_ONCE([pthread.h]) -AC_CHECK_HEADERS_ONCE([spawn.h]) -AC_CHECK_HEADERS_ONCE([stdarg.h]) -AC_CHECK_HEADERS_ONCE([stddef.h]) -AC_CHECK_HEADERS_ONCE([stdio.h]) -AC_CHECK_HEADERS_ONCE([stdlib.h]) -AC_CHECK_HEADERS_ONCE([sys/socket.h]) -AC_CHECK_HEADERS_ONCE([sys/sysctl.h]) -AC_CHECK_HEADERS_ONCE([sys/time.h]) -AC_CHECK_HEADERS_ONCE([sys/types.h]) -AC_CHECK_HEADERS_ONCE([sys/un.h]) -AC_CHECK_HEADERS_ONCE([sys/wait.h]) -AC_CHECK_HEADERS_ONCE([syslog.h]) -AC_CHECK_HEADERS_ONCE([time.h]) -AC_CHECK_HEADERS_ONCE([unistd.h]) - -# Windows only -AC_CHECK_HEADERS_ONCE([winsock2.h]) -AC_CHECK_HEADERS_ONCE([ws2tcpip.h]) - -# Checks for typedefs, structures, and compiler characteristics. - -# Checks for library functions. - -AC_CHECK_FUNCS([alarm]) -AC_CHECK_FUNCS([atexit]) -AC_CHECK_FUNCS([clock_gettime]) -AC_CHECK_FUNCS([dup2]) -AC_CHECK_FUNCS([fcntl]) -AC_CHECK_FUNCS([floor]) -AC_CHECK_FUNCS([getcwd]) -AC_CHECK_FUNCS([getline]) -AC_CHECK_FUNCS([gettimeofday]) -AC_CHECK_FUNCS([inet_ntoa]) -AC_CHECK_FUNCS([memchr]) -AC_CHECK_FUNCS([memmove]) -AC_CHECK_FUNCS([memset]) -AC_CHECK_FUNCS([pipe2]) -AC_CHECK_FUNCS([putenv]) -AC_CHECK_FUNCS([select]) -AC_CHECK_FUNCS([setenv]) -AC_CHECK_FUNCS([sigignore]) -AC_CHECK_FUNCS([socket]) -AC_CHECK_FUNCS([sqrt]) -AC_CHECK_FUNCS([strcasecmp]) -AC_CHECK_FUNCS([strchr]) -AC_CHECK_FUNCS([strdup]) -AC_CHECK_FUNCS([strerror]) -AC_CHECK_FUNCS([strstr]) -AC_CHECK_FUNCS([strtol]) -AC_CHECK_FUNCS([strtoul]) -AC_CHECK_FUNCS([strtoull]) -AC_FUNC_ALLOCA -AC_FUNC_ERROR_AT_LINE -AC_FUNC_FORK -AC_FUNC_STRERROR_R - -AC_CHECK_HEADER([umem.h], - [AC_DEFINE([HAVE_UMEM_H],[1],[Define this if you have umem.h]) - build_cache=no], - [build_cache=yes]) - -AM_CONDITIONAL([BUILD_CACHE],[test "x$build_cache" = "xyes"]) - -AC_CHECK_TYPES([in_port_t],,,[[ - #ifdef HAVE_SYS_TYPES_H - # include - #endif - #ifdef HAVE_NETINET_IN_H - # include - #endif - #ifdef HAVE_NETDB_H - # include - #endif]]) -AC_CHECK_TYPES([ptrdiff_t]) -AC_HEADER_STDBOOL -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_INT64_T -AC_TYPE_INT8_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SSIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T - -AC_C_BIGENDIAN -AC_C_CONST -AC_C_INLINE -AC_C_VOLATILE -AC_C_RESTRICT - -AX_CXX_GCC_ABI_DEMANGLE - -AX_LIBEVENT - -AC_CHECK_LIB([rt],[clock_gettime], - [AC_SUBST([RT_LIB],[-lrt]) - AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have clock_gettime])], - [AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])]) - - -AC_CHECK_HEADERS([atomic.h]) -AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"], - [AC_CHECK_FUNCS([atomic_add_64]) - AC_CHECK_FUNCS([atomic_add_32]) - AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"], - [AC_DEFINE([USE_ATOMIC_H],[1],[Define to true if you want to use functions from atomic.h])])]) - -AC_DEFINE([HAVE_LIBDRIZZLE],[0],[Support for libdrizzle]) -AC_DEFINE([HAVE_DRIZZLED_BINARY],[0],[Support for DrizzleD]) -AC_DEFINE([DRIZZLED_BINARY],[0],[Support for DrizzleD]) -AC_DEFINE([GEARMAND_BLOBSLAP_WORKER],[0],[Support for Gearman Blobslap worker]) -AC_DEFINE([HAVE_LIBPQ],[0],[Support for Postgres]) -AC_DEFINE([HAVE_LIBCURL],[0],[Support for libcurl]) - -# Check for the requirements for running memcached with less privileges -# than the default privilege set. On Solaris we need setppriv and priv.h -# If you want to add support for other platforms you should check for -# your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add -# the source file containing the implementation into memcached_SOURCE -# in Makefile.am -AC_CHECK_FUNCS([setppriv], - [AC_CHECK_HEADER([priv.h], - [AC_DEFINE([HAVE_DROP_PRIVILEGES], - [1], - [Define this if you have an implementation of drop_privileges()]) - build_solaris_privs=yes]) - ]) - -AM_CONDITIONAL([BUILD_POLL],[test "x$ac_cv_header_poll_h" = "xno"]) -AM_CONDITIONAL([BUILD_WIN32_WRAPPERS],[test "x$ac_cv_header_winsock2_h" = "xyes"]) -AS_IF([test "x$ac_cv_header_winsock2_h" = "xyes"], - [AM_LDFLAGS="$AM_LDFLAGS -lws2_32" - AM_CFLAGS="$AM_CFLAGS $NO_WERROR" - AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR" - ]) -SOCKET_SEND_FLAGS - -AX_UUID_GENERATE_TIME_SAFE - -AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL], - [AC_LANG_PUSH([C++]) - AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])]) - AX_PTHREAD_TIMEDJOIN_NP - AC_LANG_POP([C++]) - - # The sasl functions should only be visible if we build with sasl support - # - AX_SASL_OPTION - AS_IF([test "x$ac_enable_sasl" = xyes], - [LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 1"], - [LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0"]) - AC_SUBST([LIBMEMCACHED_WITH_SASL_SUPPORT]) - ]) -CHECK_FOR_PTHREAD_AND_SASL - -# backtrace(), others require shared builds -AC_DEFUN([__ENABLE_SHARED], - [AC_REQUIRE([AX_PLATFORM]) - AS_IF([test "x${TARGET_WINDOWS}" = "xtrue"],[enable_shared=no]) - AS_IF([test "x$enable_shared" = "xyes"], - [AC_DEFINE([HAVE_SHARED_ENABLED],[1],[Enable code which requires shared library support. Like backtrace().])])]) -AM_CONDITIONAL([SHARED_ENABLED],[test "x$enable_shared" = "xyes"]) - -PANDORA_ENABLE_DTRACE -HAVE_GCC_ATOMICS -AX_ENDIAN -AX_ASSERT -AX_HARDEN_COMPILER_FLAGS - -# override sompe flags specific to libmemcached -AX_APPEND_COMPILE_FLAGS([-Wno-long-long]) -AC_LANG_PUSH([C++]) -AX_APPEND_COMPILE_FLAGS([-Wno-long-long -Wno-old-style-cast]) -AC_LANG_POP([C++]) - -AC_ARG_ENABLE([warnings-as-errors], AS_HELP_STRING([--enable-warnings-as-errors], - [Build with -Werror enabled]), , [enable_warnings_as_errors=no]) -AC_CACHE_CHECK([if all warnings should produce an error], [ac_cv_warnings_as_errors], [ - AS_IF([test "x$enable_warnings_as_errors" = "xyes"], [ - ac_cv_warnings_as_errors=yes - ], [ - ac_cv_warnings_as_errors=no - ]) -]) - -AX_AM_JOBSERVER([yes]) - -AC_CONFIG_FILES([Makefile - docs/source/conf.py - libmemcached-1.0/configure.h - support/libmemcached.pc - support/libmemcached.spec - support/example.cnf - ]) -AC_OUTPUT - -echo "---" -echo "Configuration summary for $PACKAGE_NAME version $VERSION" -echo "" -echo " * Installation prefix: $prefix" -echo " * System type: $host_vendor-$host_os" -echo " * Host CPU: $host_cpu" -echo " * C Compiler: $ax_cv_c_compiler_vendor $ax_cv_c_compiler_version" -echo " * C Flags: $CFLAGS" -echo " * C++ Compiler: $ax_cv_cxx_compiler_vendor $ax_cv_cxx_compiler_version" -echo " * C++ Flags: $CXXFLAGS" -echo " * CPP Flags: $CPPFLAGS" -echo " * LIB Flags: $LIB" -echo " * Assertions enabled: $ax_enable_assert" -echo " * Debug enabled: $ax_enable_debug" -echo " * Shared: $enable_shared" -echo " * Warnings as failure: $ac_cv_warnings_as_errors" -echo " * SASL support: $ac_enable_sasl" -echo " * make -j: $enable_jobserver" -echo " * VCS checkout: $ac_cv_vcs_checkout" -echo "" -echo "---" - -case "$host_os" in - *freebsd*) - echo "*****" - echo "*" - echo "* NOTE: You are on FreeBSD. BSD make will not work." - echo "*" - echo "* use 'gmake' To build libmemcached" - echo "*" - echo "*****" - ;; -esac - diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 9ce1fa72..00000000 --- a/docs/Makefile +++ /dev/null @@ -1,200 +0,0 @@ -# Makefile for Sphinx documentation - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = build - -# Custom rules used by top level make -MANGOAL:= $(BUILDDIR)/man/.dirstamp -HTMLGOAL:= $(BUILDDIR)/html/.dirstamp - -.PHONY: all distclean distcheck maintainer-clean check test -all: $(MANGOAL) $(HTMLGOAL) - -maintainer-clean distclean: clean - -distcheck check distdir: - -RST_FILES= $(shell find source -type f -name '*.rst') - -.DEFAULT_GOAL:= all - -.NOTPARALLEL: - -SOURCES= -SOURCES+= $(RST_FILES) -SOURCES+= source/conf.py -SOURCES+= Makefile - -$(MANGOAL): $(SOURCES) - @$(MAKE) $(AM_MAKEFLAGS) man - @touch $@ - -$(HTMLGOAL): $(SOURCES) - @$(MAKE) $(AM_MAKEFLAGS) html - @touch $@ - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source - -.PHONY: help clean dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - @$(RM) -r $(BUILDDIR)/* - -html: $(SOURCES) - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/gearmand.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/gearmand.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/gearmand" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/gearmand" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: $(SOURCES) - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - @$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/example/include.am b/example/include.am deleted file mode 100644 index c58a5ffb..00000000 --- a/example/include.am +++ /dev/null @@ -1,26 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -if HAVE_LIBEVENT -noinst_PROGRAMS+= example/memcached_light -endif - -noinst_HEADERS+= example/byteorder.h -noinst_HEADERS+= example/memcached_light.h -noinst_HEADERS+= example/storage.h - -example_memcached_light_SOURCES= -example_memcached_light_LDADD= -example_memcached_light_LDFLAGS= - -example_memcached_light_SOURCES+= example/byteorder.cc -example_memcached_light_SOURCES+= example/interface_v0.cc -example_memcached_light_SOURCES+= example/interface_v1.cc -example_memcached_light_SOURCES+= example/memcached_light.cc -example_memcached_light_SOURCES+= example/storage.cc -example_memcached_light_SOURCES+= util/daemon.cc -example_memcached_light_SOURCES+= util/pidfile.cc - -example_memcached_light_LDADD+= libmemcached/libmemcachedprotocol.la -example_memcached_light_LDADD+= @LIBEVENT_LIB@ diff --git a/libhashkit-1.0/include.am b/libhashkit-1.0/include.am deleted file mode 100644 index 6e60d745..00000000 --- a/libhashkit-1.0/include.am +++ /dev/null @@ -1,21 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root -# - -EXTRA_DIST+= libhashkit-1.0/configure.h.in -BUILT_SOURCES+= libhashkit-1.0/configure.h - -nobase_include_HEADERS+= libhashkit-1.0/algorithm.h -nobase_include_HEADERS+= libhashkit-1.0/behavior.h -nobase_include_HEADERS+= libhashkit-1.0/configure.h -nobase_include_HEADERS+= libhashkit-1.0/digest.h -nobase_include_HEADERS+= libhashkit-1.0/function.h -nobase_include_HEADERS+= libhashkit-1.0/has.h -nobase_include_HEADERS+= libhashkit-1.0/hashkit.h -nobase_include_HEADERS+= libhashkit-1.0/hashkit.hpp -nobase_include_HEADERS+= libhashkit-1.0/strerror.h -nobase_include_HEADERS+= libhashkit-1.0/string.h -nobase_include_HEADERS+= libhashkit-1.0/str_algorithm.h -nobase_include_HEADERS+= libhashkit-1.0/types.h -nobase_include_HEADERS+= libhashkit-1.0/visibility.h diff --git a/libhashkit/include.am b/libhashkit/include.am deleted file mode 100644 index cfbacddc..00000000 --- a/libhashkit/include.am +++ /dev/null @@ -1,69 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root -# -# HashKit -# Copyright (C) 2009 Brian Aker -# All rights reserved. -# -# Use and distribution licensed under the BSD license. See -# the COPYING file in the parent directory for full text. - -lib_LTLIBRARIES+= libhashkit/libhashkit.la - -noinst_HEADERS+= libhashkit/aes.h -noinst_HEADERS+= libhashkit/algorithm.h -noinst_HEADERS+= libhashkit/murmur3.h -noinst_HEADERS+= libhashkit/common.h -noinst_HEADERS+= libhashkit/is.h -noinst_HEADERS+= libhashkit/rijndael.hpp -noinst_HEADERS+= libhashkit/string.h - - -nobase_include_HEADERS+= libhashkit/hashkit.h - -libhashkit_libhashkit_la_LIBADD= -libhashkit_libhashkit_la_SOURCES= -libhashkit_libhashkit_la_CXXFLAGS= -libhashkit_libhashkit_la_CFLAGS= - -libhashkit_libhashkit_la_SOURCES+= libhashkit/aes.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/algorithm.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/behavior.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/crc32.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/digest.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/encrypt.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/fnv_32.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/fnv_64.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/function.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/has.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/hashkit.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/jenkins.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/ketama.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/md5.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur3.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur3_api.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/one_at_a_time.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/rijndael.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/str_algorithm.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/strerror.cc -libhashkit_libhashkit_la_SOURCES+= libhashkit/string.cc - -if INCLUDE_HSIEH_SRC -libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.cc -else -libhashkit_libhashkit_la_SOURCES+= libhashkit/nohsieh.cc -endif - -libhashkit_libhashkit_la_CXXFLAGS+= -DBUILDING_HASHKIT -libhashkit_libhashkit_la_CFLAGS+= -DBUILDING_HASHKIT - -libhashkit_libhashkit_la_LDFLAGS= -version-info $(HASHKIT_LIBRARY_VERSION) - -# library used for testing -noinst_LTLIBRARIES+= libhashkit/libhashkitinc.la - -libhashkit_libhashkitinc_la_SOURCES= ${libhashkit_libhashkit_la_SOURCES} -libhashkit_libhashkitinc_la_CFLAGS= ${libhashkit_libhashkit_la_CFLAGS} -libhashkit_libhashkitinc_la_CXXFLAGS= ${libhashkit_libhashkit_la_CXXFLAGS} diff --git a/libhashkit/include.m4 b/libhashkit/include.m4 deleted file mode 100644 index 257e5bcf..00000000 --- a/libhashkit/include.m4 +++ /dev/null @@ -1,10 +0,0 @@ -dnl Copyright (C) 2012 Data Differential, LLC. -dnl This file is free software; Data Differential, LLC. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -HASHKIT_LIBRARY_VERSION=2:0:0 -AC_SUBST(HASHKIT_LIBRARY_VERSION) - -AC_CONFIG_FILES([libhashkit/hashkitcon.h]) -AC_CONFIG_FILES([libhashkit-1.0/configure.h]) diff --git a/libmemcached-1.0/include.am b/libmemcached-1.0/include.am deleted file mode 100644 index 19e48289..00000000 --- a/libmemcached-1.0/include.am +++ /dev/null @@ -1,56 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -EXTRA_DIST+= libmemcached-1.0/configure.h.in -BUILT_SOURCES+= libmemcached-1.0/configure.h - -include libmemcached-1.0/struct/include.am -include libmemcached-1.0/types/include.am - -# Tests for this version of the interface -include libmemcached-1.0/t/include.am - -nobase_include_HEADERS+= libmemcached-1.0/alloc.h -nobase_include_HEADERS+= libmemcached-1.0/allocators.h -nobase_include_HEADERS+= libmemcached-1.0/analyze.h -nobase_include_HEADERS+= libmemcached-1.0/auto.h -nobase_include_HEADERS+= libmemcached-1.0/basic_string.h -nobase_include_HEADERS+= libmemcached-1.0/behavior.h -nobase_include_HEADERS+= libmemcached-1.0/callback.h -nobase_include_HEADERS+= libmemcached-1.0/callbacks.h -nobase_include_HEADERS+= libmemcached-1.0/configure.h -nobase_include_HEADERS+= libmemcached-1.0/defaults.h -nobase_include_HEADERS+= libmemcached-1.0/delete.h -nobase_include_HEADERS+= libmemcached-1.0/deprecated_types.h -nobase_include_HEADERS+= libmemcached-1.0/dump.h -nobase_include_HEADERS+= libmemcached-1.0/encoding_key.h -nobase_include_HEADERS+= libmemcached-1.0/error.h -nobase_include_HEADERS+= libmemcached-1.0/exception.hpp -nobase_include_HEADERS+= libmemcached-1.0/exist.h -nobase_include_HEADERS+= libmemcached-1.0/fetch.h -nobase_include_HEADERS+= libmemcached-1.0/flush.h -nobase_include_HEADERS+= libmemcached-1.0/flush_buffers.h -nobase_include_HEADERS+= libmemcached-1.0/get.h -nobase_include_HEADERS+= libmemcached-1.0/hash.h -nobase_include_HEADERS+= libmemcached-1.0/limits.h -nobase_include_HEADERS+= libmemcached-1.0/memcached.h -nobase_include_HEADERS+= libmemcached-1.0/memcached.hpp -nobase_include_HEADERS+= libmemcached-1.0/options.h -nobase_include_HEADERS+= libmemcached-1.0/parse.h -nobase_include_HEADERS+= libmemcached-1.0/platform.h -nobase_include_HEADERS+= libmemcached-1.0/quit.h -nobase_include_HEADERS+= libmemcached-1.0/result.h -nobase_include_HEADERS+= libmemcached-1.0/return.h -nobase_include_HEADERS+= libmemcached-1.0/sasl.h -nobase_include_HEADERS+= libmemcached-1.0/server.h -nobase_include_HEADERS+= libmemcached-1.0/server_list.h -nobase_include_HEADERS+= libmemcached-1.0/stats.h -nobase_include_HEADERS+= libmemcached-1.0/storage.h -nobase_include_HEADERS+= libmemcached-1.0/strerror.h -nobase_include_HEADERS+= libmemcached-1.0/touch.h -nobase_include_HEADERS+= libmemcached-1.0/triggers.h -nobase_include_HEADERS+= libmemcached-1.0/types.h -nobase_include_HEADERS+= libmemcached-1.0/verbosity.h -nobase_include_HEADERS+= libmemcached-1.0/version.h -nobase_include_HEADERS+= libmemcached-1.0/visibility.h diff --git a/libmemcached-1.0/struct/include.am b/libmemcached-1.0/struct/include.am deleted file mode 100644 index fc2d9223..00000000 --- a/libmemcached-1.0/struct/include.am +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -nobase_include_HEADERS+= libmemcached-1.0/struct/allocator.h -nobase_include_HEADERS+= libmemcached-1.0/struct/analysis.h -nobase_include_HEADERS+= libmemcached-1.0/struct/callback.h -nobase_include_HEADERS+= libmemcached-1.0/struct/memcached.h -nobase_include_HEADERS+= libmemcached-1.0/struct/result.h -nobase_include_HEADERS+= libmemcached-1.0/struct/sasl.h -nobase_include_HEADERS+= libmemcached-1.0/struct/server.h -nobase_include_HEADERS+= libmemcached-1.0/struct/stat.h -nobase_include_HEADERS+= libmemcached-1.0/struct/string.h diff --git a/libmemcached-1.0/t/include.am b/libmemcached-1.0/t/include.am deleted file mode 100644 index 2a6c512b..00000000 --- a/libmemcached-1.0/t/include.am +++ /dev/null @@ -1,32 +0,0 @@ -# vim:ft=automake -# Copyright (C) 2011 Data Differential -# All rights reserved. -# -# Use and distribution licensed under the BSD license. See -# the COPYING file in the parent directory for full text. -# -# included from Top Level Makefile.am -# All paths should be given relative to the root - -LIBMEMCACHED_1_0_TEST_PATH= libmemcached-1.0/t - -if SHARED_ENABLED -# Test linking with C application -libmemcached_1_0_t_c_test_SOURCES= libmemcached-1.0/t/c_test.c -libmemcached_1_0_t_c_test_LDADD= libmemcached/libmemcached.la -check_PROGRAMS+= libmemcached-1.0/t/c_test -noinst_PROGRAMS+= libmemcached-1.0/t/c_test - -# Test linking with C application/SASL include -libmemcached_1_0_t_c_sasl_test_SOURCES= libmemcached-1.0/t/c_sasl_test.c -libmemcached_1_0_t_c_sasl_test_LDADD= libmemcached/libmemcached.la -check_PROGRAMS+= libmemcached-1.0/t/c_sasl_test -noinst_PROGRAMS+= libmemcached-1.0/t/c_sasl_test -else -endif - -# Test linking with C++ application -libmemcached_1_0_t_cc_test_SOURCES= libmemcached-1.0/t/cc_test.cc -libmemcached_1_0_t_cc_test_LDADD= libmemcached/libmemcached.la -check_PROGRAMS+= libmemcached-1.0/t/cc_test -noinst_PROGRAMS+= libmemcached-1.0/t/cc_test diff --git a/libmemcached-1.0/types/include.am b/libmemcached-1.0/types/include.am deleted file mode 100644 index fa330469..00000000 --- a/libmemcached-1.0/types/include.am +++ /dev/null @@ -1,8 +0,0 @@ -# vim:ft=automake - -nobase_include_HEADERS+= libmemcached-1.0/types/behavior.h -nobase_include_HEADERS+= libmemcached-1.0/types/callback.h -nobase_include_HEADERS+= libmemcached-1.0/types/connection.h -nobase_include_HEADERS+= libmemcached-1.0/types/hash.h -nobase_include_HEADERS+= libmemcached-1.0/types/return.h -nobase_include_HEADERS+= libmemcached-1.0/types/server_distribution.h diff --git a/libmemcached/csl/include.am b/libmemcached/csl/include.am deleted file mode 100644 index 68489911..00000000 --- a/libmemcached/csl/include.am +++ /dev/null @@ -1,39 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -DISTCLEANFILES+= libmemcached/csl/parser.output - -noinst_HEADERS+= libmemcached/csl/common.h -noinst_HEADERS+= libmemcached/csl/context.h -noinst_HEADERS+= libmemcached/csl/parser.h -noinst_HEADERS+= libmemcached/csl/scanner.h -noinst_HEADERS+= libmemcached/csl/server.h -noinst_HEADERS+= libmemcached/csl/symbol.h - -libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/context.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/parser.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/csl/scanner.cc - -EXTRA_DIST+= libmemcached/csl/parser.yy -EXTRA_DIST+= libmemcached/csl/scanner.l - -MAINTAINERCLEANFILES+= libmemcached/csl/parser.h -MAINTAINERCLEANFILES+= libmemcached/csl/parser.cc -MAINTAINERCLEANFILES+= libmemcached/csl/scanner.h -MAINTAINERCLEANFILES+= libmemcached/csl/scanner.cc - -BUILT_SOURCES+= libmemcached/csl/parser.cc -BUILT_SOURCES+= libmemcached/csl/parser.h -BUILT_SOURCES+= libmemcached/csl/scanner.cc -BUILT_SOURCES+= libmemcached/csl/scanner.h - -libmemcached/csl/parser.h: libmemcached/csl/parser.cc - -libmemcached/csl/parser.cc: libmemcached/csl/parser.yy libmemcached/csl/scanner.l libmemcached/csl/scanner.h - $(AM_V_YACC)$(am__skipyacc) $(YACC) $(YLFLAGS) $(AM_YFLAGS) -o $@ $< - -libmemcached/csl/scanner.h: libmemcached/csl/scanner.cc - -libmemcached/csl/scanner.cc: libmemcached/csl/scanner.l libmemcached/csl/parser.yy - $(AM_V_GEN)$(LEX) $< diff --git a/libmemcached/include.am b/libmemcached/include.am deleted file mode 100644 index 1eccc369..00000000 --- a/libmemcached/include.am +++ /dev/null @@ -1,155 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -libmemcached_libmemcached_la_SOURCES= - -include libmemcached/csl/include.am - -EXTRA_DIST+= libmemcached/libmemcached_probes.d -EXTRA_DIST+= libmemcached/memcached/README.txt - -nobase_include_HEADERS+= libmemcached/memcached.h -nobase_include_HEADERS+= libmemcached/memcached.hpp -nobase_include_HEADERS+= libmemcached/util.h - -noinst_HEADERS+= libmemcached/array.h -noinst_HEADERS+= libmemcached/assert.hpp -noinst_HEADERS+= libmemcached/backtrace.hpp -noinst_HEADERS+= libmemcached/behavior.hpp -noinst_HEADERS+= libmemcached/byteorder.h -noinst_HEADERS+= libmemcached/common.h -noinst_HEADERS+= libmemcached/connect.hpp -noinst_HEADERS+= libmemcached/continuum.hpp -noinst_HEADERS+= libmemcached/do.hpp -noinst_HEADERS+= libmemcached/encoding_key.h -noinst_HEADERS+= libmemcached/error.hpp -noinst_HEADERS+= libmemcached/flag.hpp -noinst_HEADERS+= libmemcached/initialize_query.h -noinst_HEADERS+= libmemcached/instance.hpp -noinst_HEADERS+= libmemcached/internal.h -noinst_HEADERS+= libmemcached/io.h -noinst_HEADERS+= libmemcached/io.hpp -noinst_HEADERS+= libmemcached/is.h -noinst_HEADERS+= libmemcached/key.hpp -noinst_HEADERS+= libmemcached/libmemcached_probes.h -noinst_HEADERS+= libmemcached/memcached/protocol_binary.h -noinst_HEADERS+= libmemcached/memcached/vbucket.h -noinst_HEADERS+= libmemcached/memory.h -noinst_HEADERS+= libmemcached/namespace.h -noinst_HEADERS+= libmemcached/options.hpp -noinst_HEADERS+= libmemcached/poll.h -noinst_HEADERS+= libmemcached/response.h -noinst_HEADERS+= libmemcached/result.h -noinst_HEADERS+= libmemcached/sasl.hpp -noinst_HEADERS+= libmemcached/server.hpp -noinst_HEADERS+= libmemcached/server_instance.h -noinst_HEADERS+= libmemcached/socket.hpp -noinst_HEADERS+= libmemcached/string.hpp -noinst_HEADERS+= libmemcached/udp.hpp -noinst_HEADERS+= libmemcached/version.hpp -noinst_HEADERS+= libmemcached/virtual_bucket.h -noinst_HEADERS+= libmemcached/watchpoint.h -noinst_HEADERS+= libmemcached/windows.hpp - -lib_LTLIBRARIES+= libmemcached/libmemcached.la -EXTRA_libmemcached_libmemcached_la_DEPENDENCIES= -libmemcached_libmemcached_la_LIBADD= -libmemcached_libmemcached_la_LDFLAGS= -libmemcached_libmemcached_la_CFLAGS= -libmemcached_libmemcached_la_CXXFLAGS= - -libmemcached_libmemcached_la_CFLAGS+= -DBUILDING_LIBMEMCACHED -libmemcached_libmemcached_la_CXXFLAGS+= -DBUILDING_LIBMEMCACHED - -if BUILD_WIN32 -libmemcached_libmemcached_la_CFLAGS+= -DBUILDING_HASHKIT -libmemcached_libmemcached_la_CXXFLAGS+= -DBUILDING_HASHKIT -libmemcached_libmemcached_la_LIBADD+= -lmingw32 -libmemcached_libmemcached_la_LIBADD+= -lws2_32 -endif - -libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc -libmemcached_libmemcached_la_SOURCES+= ${libhashkit_libhashkit_la_SOURCES} -libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/allocators.hpp -libmemcached_libmemcached_la_SOURCES+= libmemcached/analyze.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/array.c -libmemcached_libmemcached_la_SOURCES+= libmemcached/auto.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/backtrace.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/byteorder.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/callback.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/connect.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/delete.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/do.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/dump.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/error.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/exist.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/fetch.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/flag.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/flush.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/flush_buffers.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/get.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/hash.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/hash.hpp -libmemcached_libmemcached_la_SOURCES+= libmemcached/hosts.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/initialize_query.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/io.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/key.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/memcached.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/encoding_key.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/poll.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp -libmemcached_libmemcached_la_SOURCES+= libmemcached/response.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/result.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/sasl.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/server.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/server_list.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/server_list.hpp -libmemcached_libmemcached_la_SOURCES+= libmemcached/stats.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/storage.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc -libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c - -libmemcached/options.cc: libmemcached/csl/parser.h - -libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION} -libmemcached_libmemcached_la_LIBADD+= @lt_cv_dlopen_libs@ - -if HAVE_SASL -libmemcached_libmemcached_la_CFLAGS+= @PTHREAD_CFLAGS@ -libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@ -libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@ -libmemcached_libmemcached_la_LIBADD+= @SASL_LIB@ -endif - -if HAVE_DTRACE -BUILT_SOURCES+= libmemcached/dtrace_probes.h -CLEANFILES+= libmemcached/dtrace_probes.h -CLEANFILES+= libmemcached/libmemcached_probes.o - -EXTRA_libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o -libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o -libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d -endif - -SUFFIXES+= .d - -libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d - $(DTRACE) $(DTRACEFLAGS) -h -o ${top_srcdir}/libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d - -libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} - -.d.o: - $(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am deleted file mode 100644 index f71472e3..00000000 --- a/libmemcachedinternal/include.am +++ /dev/null @@ -1,27 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -# This noinst lib contains things we want to be ABI private but still want to -# either use in client programs or be able to test in test cases These symbols -# will not be exposed in the shipped .so -noinst_LTLIBRARIES+= libmemcachedinternal/libmemcachedinternal.la - -if HAVE_DTRACE -else -libmemcachedinternal_libmemcachedinternal_la_SOURCES= $(libmemcached_libmemcached_la_SOURCES) -libmemcachedinternal_libmemcachedinternal_la_CFLAGS= \ - ${AM_CFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHEDINTERNAL -libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS= \ - ${AM_CPPFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHEDINTERNAL -libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS= \ - ${AM_CXXFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHEDINTERNAL -libmemcachedinternal_libmemcachedinternal_la_LIBADD= $(libmemcached_libmemcached_la_LIBADD) -EXTRA_libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(EXTRA_libmemcached_libmemcached_la_DEPENDENCIES) -endif diff --git a/libmemcachedinternal/util/include.am b/libmemcachedinternal/util/include.am deleted file mode 100644 index f5ac3cb0..00000000 --- a/libmemcachedinternal/util/include.am +++ /dev/null @@ -1,17 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -# This noinst lib contains things we want to be ABI private but still want to -# either use in client programs or be able to test in test cases These symbols -# will not be exposed in the shipped .so -noinst_LTLIBRARIES+= libmemcachedinternal/libmemcachedutilinternal.la - -libmemcachedinternal_libmemcachedutilinternal_la_SOURCES= $(libmemcached_libmemcachedutil_la_SOURCES) -libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS= \ - ${AM_CXXFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHEDINTERNAL -libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= @PTHREAD_CFLAGS@ -libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la -libmemcachedinternal_libmemcachedutilinternal_la_LIBADD+= @PTHREAD_LIBS@ diff --git a/libmemcachedprotocol-0.0/include.am b/libmemcachedprotocol-0.0/include.am deleted file mode 100644 index 3683c0f1..00000000 --- a/libmemcachedprotocol-0.0/include.am +++ /dev/null @@ -1,9 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -nobase_include_HEADERS+= \ - libmemcachedprotocol-0.0/binary.h \ - libmemcachedprotocol-0.0/callback.h \ - libmemcachedprotocol-0.0/handler.h \ - libmemcachedprotocol-0.0/vbucket.h diff --git a/libmemcachedprotocol/include.am b/libmemcachedprotocol/include.am deleted file mode 100644 index 6a004598..00000000 --- a/libmemcachedprotocol/include.am +++ /dev/null @@ -1,36 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - - -lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la - -noinst_HEADERS+= libmemcachedprotocol/ascii_handler.h -noinst_HEADERS+= libmemcachedprotocol/binary_handler.h -noinst_HEADERS+= libmemcachedprotocol/cache.h -noinst_HEADERS+= libmemcachedprotocol/common.h - -libmemcached_libmemcachedprotocol_la_SOURCES= -libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcached/byteorder.cc -libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/ascii_handler.c -libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/binary_handler.c -libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/cache.c -libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/handler.c -libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/pedantic.c - -libmemcached_libmemcachedprotocol_la_CFLAGS= -libmemcached_libmemcachedprotocol_la_CFLAGS+= ${AM_CFLAGS} -libmemcached_libmemcachedprotocol_la_CFLAGS+= ${NO_CONVERSION} -libmemcached_libmemcachedprotocol_la_CFLAGS+= -DBUILDING_LIBMEMCACHED -libmemcached_libmemcachedprotocol_la_CFLAGS+= @PTHREAD_CFLAGS@ - -libmemcached_libmemcachedprotocol_la_CXXFLAGS= -libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${AM_CXXFLAGS} -libmemcached_libmemcachedprotocol_la_CXXFLAGS+= -DBUILDING_LIBMEMCACHED -libmemcached_libmemcachedprotocol_la_CXXFLAGS+= @PTHREAD_CFLAGS@ - -libmemcached_libmemcachedprotocol_la_LIBADD= -libmemcached_libmemcachedprotocol_la_LIBADD+= @LIBEVENT_LIB@ -libmemcached_libmemcachedprotocol_la_LIBADD+= @PTHREAD_LIBS@ -libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -libmemcached_libmemcachedprotocol_la_LDFLAGS+= -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION} diff --git a/libmemcachedutil-1.0/include.am b/libmemcachedutil-1.0/include.am deleted file mode 100644 index 39a15937..00000000 --- a/libmemcachedutil-1.0/include.am +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - - -nobase_include_HEADERS+= \ - libmemcachedutil-1.0/flush.h \ - libmemcachedutil-1.0/ostream.hpp \ - libmemcachedutil-1.0/pid.h \ - libmemcachedutil-1.0/ping.h \ - libmemcachedutil-1.0/pool.h \ - libmemcachedutil-1.0/util.h \ - libmemcachedutil-1.0/version.h diff --git a/libmemcachedutil/include.am b/libmemcachedutil/include.am deleted file mode 100644 index c105ee6e..00000000 --- a/libmemcachedutil/include.am +++ /dev/null @@ -1,26 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la - -noinst_HEADERS+= libmemcachedutil/common.h - -libmemcached_libmemcachedutil_la_SOURCES= \ - libmemcached/backtrace.cc \ - libmemcachedutil/flush.cc \ - libmemcachedutil/pid.cc \ - libmemcachedutil/ping.cc \ - libmemcachedutil/pool.cc \ - libmemcachedutil/version.cc -libmemcached_libmemcachedutil_la_LIBADD= -libmemcached_libmemcachedutil_la_LDFLAGS= -libmemcached_libmemcachedutil_la_CXXFLAGS= -libmemcached_libmemcachedutil_la_CXXFLAGS+= \ - ${AM_CXXFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHED -libmemcached_libmemcachedutil_la_CXXFLAGS+= @PTHREAD_CFLAGS@ -libmemcached_libmemcachedutil_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION} -libmemcached_libmemcachedutil_la_LIBADD+= libmemcached/libmemcached.la -libmemcached_libmemcachedutil_la_LIBADD+= @PTHREAD_LIBS@ diff --git a/libtest/include.am b/libtest/include.am deleted file mode 100644 index a16154b0..00000000 --- a/libtest/include.am +++ /dev/null @@ -1,261 +0,0 @@ -# vim:ft=automake -# -# included from Top Level Makefile.am -# All paths should be given relative to the root -# - -LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute -VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=memcheck --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE -SGCHECK_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1 -VALGRIND_COMMAND= LOG_COMPILER="valgrind" $(VALGRIND_EXEC_COMMAND) -HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 --read-var-info=yes -DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd --free-is-write=yes --error-exitcode=1 -SGCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1 -MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif -GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb -PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1 -PAHOLE_COMMAND= $(LIBTOOL_COMMAND) --mode=execute pahole -VALGRIND_SUPRESSION= $(LIBTOOL_COMMAND) valgrind --leak-check=full --show-reachable=yes --error-limit=no --gen-suppressions=all --log-file=minimalraw.log - -export LIBTOOL_COMMAND -export VALGRIND_COMMAND -export HELGRIND_COMMAND -export DRD_COMMAND -export SGCHECK_COMMAND -export GDB_COMMAND - -valgrind: - @echo make check LOG_COMPILER="\"$(VALGRIND_EXEC_COMMAND)\"" - -sgcheck: - @echo make check LOG_COMPILER="\"$(SGCHECK_EXEC_COMMAND)\"" - -valgrind-supressions: - @echo make check LOG_COMPILER="\"$(VALGRIND_SUPRESSION)\"" - -gdb: - @echo make check LOG_COMPILER="\"$(GDB_COMMAND)\"" - -helgrind: - @echo make check LOG_COMPILER="\"$(HELGRIND_COMMAND)\"" - -drd: - @echo make check LOG_COMPILER="\"$(DRD_COMMAND)\"" - -EXTRA_DIST+= libtest/run.gdb -EXTRA_DIST+= libtest/version.h - -BUILT_SOURCES+= libtest/version.h - -.PHONY: clean-libtest-check -clean-libtest-check: - -rm -rf tmp_chroot - -noinst_HEADERS+= libtest/client.hpp -noinst_HEADERS+= libtest/formatter.hpp -noinst_HEADERS+= libtest/timer.hpp -noinst_HEADERS+= libtest/alarm.h -noinst_HEADERS+= libtest/binaries.h -noinst_HEADERS+= libtest/cpu.hpp -noinst_HEADERS+= libtest/blobslap_worker.h -noinst_HEADERS+= libtest/callbacks.h -noinst_HEADERS+= libtest/dns.hpp -noinst_HEADERS+= libtest/cmdline.h -noinst_HEADERS+= libtest/collection.h -noinst_HEADERS+= libtest/common.h -noinst_HEADERS+= libtest/comparison.hpp -noinst_HEADERS+= libtest/core.h -noinst_HEADERS+= libtest/dream.h -noinst_HEADERS+= libtest/error.h -noinst_HEADERS+= libtest/exception.hpp -noinst_HEADERS+= libtest/exception/disconnected.hpp -noinst_HEADERS+= libtest/exception/fatal.hpp -noinst_HEADERS+= libtest/framework.h -noinst_HEADERS+= libtest/gearmand.h -noinst_HEADERS+= libtest/drizzled.h -noinst_HEADERS+= libtest/get.h -noinst_HEADERS+= libtest/has.hpp -noinst_HEADERS+= libtest/http.hpp -noinst_HEADERS+= libtest/is_pid.hpp -noinst_HEADERS+= libtest/is_local.hpp -noinst_HEADERS+= libtest/killpid.h -noinst_HEADERS+= libtest/libtool.hpp -noinst_HEADERS+= libtest/memcached.h -noinst_HEADERS+= libtest/memcached.hpp -noinst_HEADERS+= libtest/poll_error.hpp -noinst_HEADERS+= libtest/port.h -noinst_HEADERS+= libtest/result.hpp -noinst_HEADERS+= libtest/result/base.hpp -noinst_HEADERS+= libtest/result/fail.hpp -noinst_HEADERS+= libtest/result/skip.hpp -noinst_HEADERS+= libtest/result/success.hpp -noinst_HEADERS+= libtest/runner.h -noinst_HEADERS+= libtest/server.h -noinst_HEADERS+= libtest/server_container.h -noinst_HEADERS+= libtest/signal.h -noinst_HEADERS+= libtest/socket.hpp -noinst_HEADERS+= libtest/stream.h -noinst_HEADERS+= libtest/strerror.h -noinst_HEADERS+= libtest/string.hpp -noinst_HEADERS+= libtest/test.h -noinst_HEADERS+= libtest/test.hpp -noinst_HEADERS+= libtest/thread.hpp -noinst_HEADERS+= libtest/tmpfile.hpp -noinst_HEADERS+= libtest/lite.h -noinst_HEADERS+= libtest/valgrind.h -noinst_HEADERS+= libtest/vchar.hpp -noinst_HEADERS+= libtest/version.h -noinst_HEADERS+= libtest/visibility.h -noinst_HEADERS+= libtest/wait.h -noinst_HEADERS+= libtest/yatl.h - -check_LTLIBRARIES+= libtest/libtest.la - -libtest_libtest_la_CXXFLAGS= -EXTRA_libtest_libtest_la_DEPENDENCIES= -libtest_libtest_la_LIBADD= -libtest_libtest_la_SOURCES= - -libtest_libtest_la_SOURCES+= libtest/alarm.cc -libtest_libtest_la_SOURCES+= libtest/binaries.cc -libtest_libtest_la_SOURCES+= libtest/cmdline.cc -libtest_libtest_la_SOURCES+= libtest/collection.cc -libtest_libtest_la_SOURCES+= libtest/comparison.cc -libtest_libtest_la_SOURCES+= libtest/core.cc -libtest_libtest_la_SOURCES+= libtest/cpu.cc -libtest_libtest_la_SOURCES+= libtest/dns.cc -libtest_libtest_la_SOURCES+= libtest/dream.cc -libtest_libtest_la_SOURCES+= libtest/drizzled.cc -libtest_libtest_la_SOURCES+= libtest/exception.cc -libtest_libtest_la_SOURCES+= libtest/exception/fatal.cc -libtest_libtest_la_SOURCES+= libtest/formatter.cc -libtest_libtest_la_SOURCES+= libtest/client.cc -libtest_libtest_la_SOURCES+= libtest/framework.cc -libtest_libtest_la_SOURCES+= libtest/has.cc -libtest_libtest_la_SOURCES+= libtest/http.cc -libtest_libtest_la_SOURCES+= libtest/is_local.cc -libtest_libtest_la_SOURCES+= libtest/killpid.cc -libtest_libtest_la_SOURCES+= libtest/libtool.cc -libtest_libtest_la_SOURCES+= libtest/main.cc -libtest_libtest_la_SOURCES+= libtest/port.cc -libtest_libtest_la_SOURCES+= libtest/result.cc -libtest_libtest_la_SOURCES+= libtest/runner.cc -libtest_libtest_la_SOURCES+= libtest/server.cc -libtest_libtest_la_SOURCES+= libtest/server_container.cc -libtest_libtest_la_SOURCES+= libtest/signal.cc -libtest_libtest_la_SOURCES+= libtest/socket.cc -libtest_libtest_la_SOURCES+= libtest/strerror.cc -libtest_libtest_la_SOURCES+= libtest/timer.cc -libtest_libtest_la_SOURCES+= libtest/tmpfile.cc -libtest_libtest_la_SOURCES+= libtest/vchar.cc - -libtest_libtest_la_CXXFLAGS+= -DBUILDING_LIBTEST -libtest_libtest_la_CXXFLAGS+= @PTHREAD_CFLAGS@ -libtest_libtest_la_CXXFLAGS+= -DLIBTEST_TEMP="\"tmp_chroot\"" -libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS) - -libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@ -libtest_libtest_la_LIBADD+= $(CURL_LIBS) -libtest_libtest_la_LIBADD+= @RT_LIB@ - -EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort -EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait - -# Declare unittest so that we can append to it -libtest_unittest_CXXFLAGS= -libtest_unittest_LDADD= -libtest_libtest_la_LDFLAGS= - -# We are either building in tree, or with -libtest_libtest_la_SOURCES+= libtest/memcached.cc - -if HAVE_LIBDRIZZLE -libtest_libtest_la_LDFLAGS+= @LIBDRIZZLE_LDFLAGS@ -libtest_libtest_la_LIBADD+= @LIBDRIZZLE_LIB@ -endif - -libtest_libtest_la_SOURCES+= libtest/gearmand.cc - -if BUILDING_GEARMAN -libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc -endif - -TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle - -BUILT_SOURCES+= $(TMP_DIR) -BUILT_SOURCES+= tmp_chroot/support - -tmp_chroot/support: | tmp_chroot - @cp -R support tmp_chroot - -tmp_chroot: - @$(mkdir_p) $@ - -$(TMP_DIR): - @$(mkdir_p) $(TMP_DIR) - -libtest_unittest_LDADD+= libtest/libtest.la -libtest_unittest_SOURCES= libtest/unittest.cc -check_PROGRAMS+= libtest/unittest -noinst_PROGRAMS+= libtest/unittest -test-unittest: libtest/unittest - @libtest/unittest - -valgrind-unittest: libtest/unittest - @$(VALGRIND_COMMAND) libtest/unittest - -gdb-unittest: libtest/unittest - @$(GDB_COMMAND) libtest/unittest - -helgrind-unittest: libtest/unittest - @$(HELGRIND_COMMAND) libtest/unittest - -drd-unittest: libtest/unittest - @$(DRD_COMMAND) libtest/unittest - -sgcheck-unittest: libtest/unittest - echo $(SGCHECK_COMMAND) - @$(SGCHECK_COMMAND) libtest/unittest - -libtest_skiptest_LDADD= libtest/libtest.la -libtest_skiptest_SOURCES= libtest/skiptest.cc -check_PROGRAMS+= libtest/skiptest -noinst_PROGRAMS+= libtest/skiptest - -test-skiptest: libtest/skiptest - @libtest/skiptest - -valgrind-skiptest: libtest/skiptest - @$(VALGRIND_COMMAND) libtest/skiptest - -helgrind-skiptest: libtest/skiptest - @$(HELGRIND_COMMAND) libtest/skiptest - -drd-skiptest: libtest/skiptest - @$(DRD_COMMAND) libtest/skiptest - -libtest_wait_SOURCES= -libtest_wait_SOURCES+= libtest/wait.cc -libtest_wait_SOURCES+= libtest/dream.cc -noinst_PROGRAMS+= libtest/wait - -libtest_core_count_SOURCES= -libtest_core_count_SOURCES+= libtest/cpu.cc -libtest_core_count_SOURCES+= libtest/core_count.cc -noinst_PROGRAMS+= libtest/core-count - -libtest_abort_SOURCES= libtest/abort.cc -noinst_PROGRAMS+= libtest/abort - -libtest_backtrace_SOURCES= -libtest_backtrace_LDADD= -libtest_backtrace_SOURCES+= libtest/backtrace_test.cc -libtest_backtrace_SOURCES+= libmemcached/backtrace.cc -libtest_backtrace_LDADD+= @lt_cv_dlopen_libs@ -noinst_PROGRAMS+= libtest/backtrace -test-backtrace: libtest/backtrace - @libtest/backtrace - -gdb-backtrace: libtest/backtrace - @$(GDB_COMMAND) libtest/backtrace - diff --git a/libtest/m4/ax_lib_mysql.m4 b/libtest/m4/ax_lib_mysql.m4 deleted file mode 100644 index 53888bd0..00000000 --- a/libtest/m4/ax_lib_mysql.m4 +++ /dev/null @@ -1,151 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_lib_mysql.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_LIB_MYSQL([MINIMUM-VERSION]) -# -# DESCRIPTION -# -# This macro provides tests of availability of MySQL client library of -# particular version or newer. -# -# AX_LIB_MYSQL macro takes only one argument which is optional. If there -# is no required version passed, then macro does not run version test. -# -# The --with-mysql option takes one of three possible values: -# -# no - do not check for MySQL client library -# -# yes - do check for MySQL library in standard locations (mysql_config -# should be in the PATH) -# -# path - complete path to mysql_config utility, use this option if -# mysql_config can't be found in the PATH -# -# This macro calls: -# -# AC_SUBST(MYSQL_INCLUDE) -# AC_SUBST(MYSQL_CFLAGS) -# AC_SUBST(MYSQL_LDFLAGS) -# AC_SUBST(MYSQL_VERSION) -# -# And sets: -# -# HAVE_MYSQL -# -# LICENSE -# -# Copyright (c) 2008 Mateusz Loskot -# -# 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 13 - -AC_DEFUN([AX_LIB_MYSQL], -[ - AC_ARG_WITH([mysql], - AS_HELP_STRING([--with-mysql=@<:@ARG@:>@], - [use MySQL client library @<:@default=yes@:>@, optionally specify path to mysql_config] - ), - [ - if test "$withval" = "no"; then - want_mysql="no" - elif test "$withval" = "yes"; then - want_mysql="yes" - else - want_mysql="yes" - MYSQL_CONFIG="$withval" - fi - ], - [want_mysql="yes"] - ) - AC_ARG_VAR([MYSQL_CONFIG], [Full path to mysql_config program]) - - MYSQL_INCLUDE="" - MYSQL_CFLAGS="" - MYSQL_LDFLAGS="" - MYSQL_VERSION="" - - dnl - dnl Check MySQL libraries - dnl - - if test "$want_mysql" = "yes"; then - - if test -z "$MYSQL_CONFIG" ; then - AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mysql_config5], [no]) - fi - - if test "$MYSQL_CONFIG" != "no"; then - MYSQL_INCLUDE="`$MYSQL_CONFIG --include`" - MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" - MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" - - MYSQL_VERSION=`$MYSQL_CONFIG --version` - - found_mysql="yes" - else - found_mysql="no" - fi - fi - - dnl - dnl Check if required version of MySQL is available - dnl - - - mysql_version_req=ifelse([$1], [], [], [$1]) - - if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then - - AC_MSG_CHECKING([if MySQL version is >= $mysql_version_req]) - - dnl Decompose required version string of MySQL - dnl and calculate its number representation - mysql_version_req_major=`expr $mysql_version_req : '\([[0-9]]*\)'` - mysql_version_req_minor=`expr $mysql_version_req : '[[0-9]]*\.\([[0-9]]*\)'` - mysql_version_req_micro=`expr $mysql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$mysql_version_req_micro" = "x"; then - mysql_version_req_micro="0" - fi - - mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \ - \+ $mysql_version_req_minor \* 1000 \ - \+ $mysql_version_req_micro` - - dnl Decompose version string of installed MySQL - dnl and calculate its number representation - mysql_version_major=`expr $MYSQL_VERSION : '\([[0-9]]*\)'` - mysql_version_minor=`expr $MYSQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` - mysql_version_micro=`expr $MYSQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$mysql_version_micro" = "x"; then - mysql_version_micro="0" - fi - - mysql_version_number=`expr $mysql_version_major \* 1000000 \ - \+ $mysql_version_minor \* 1000 \ - \+ $mysql_version_micro` - - mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number` - if test "$mysql_version_check" = "1"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - fi - - if test "$found_mysql" = "yes" ; then - AC_DEFINE([HAVE_MYSQL], [1], - [Define to 1 if MySQL libraries are available]) - fi - - AC_SUBST([MYSQL_VERSION]) - AC_SUBST([MYSQL_INCLUDE]) - AC_SUBST([MYSQL_CFLAGS]) - AC_SUBST([MYSQL_LDFLAGS]) -]) diff --git a/libtest/m4/ax_prog_mysqld.m4 b/libtest/m4/ax_prog_mysqld.m4 deleted file mode 100644 index 7ecd3669..00000000 --- a/libtest/m4/ax_prog_mysqld.m4 +++ /dev/null @@ -1,58 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_mysqld.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_MYSQLD -# -# DESCRIPTION -# -# Check for the program 'mysqld' let script continue if exists & works -# pops up error message if not. -# -# Besides checking existence, this macro also set these environment -# variables upon completion: -# -# MYSQLD = which mysqld -# -# LICENSE -# -# Copyright (c) 2008 Gleen Salmon -# -# 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 2 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 6 - -AU_ALIAS([AC_PROG_MYSQLD], [AX_PROG_MYSQLD]) -AC_DEFUN([AX_PROG_MYSQLD],[ -AC_REQUIRE([AC_EXEEXT])dnl -AC_PATH_PROG(MYSQLD, mysqld$EXEEXT, nocommand) -if test "$MYSQLD" = nocommand; then - AC_MSG_WARN([mysqld not found in $PATH]) -fi;dnl -]) diff --git a/libtest/m4/mysql.m4 b/libtest/m4/mysql.m4 deleted file mode 100644 index 5775f0d3..00000000 --- a/libtest/m4/mysql.m4 +++ /dev/null @@ -1,24 +0,0 @@ -m4_include([libtest/m4/ax_lib_mysql.m4]) -m4_include([libtest/m4/ax_prog_mysqld.m4]) - -#serial 1 - - AC_DEFUN([YATL_MYSQL], [ - AC_REQUIRE([AX_PROG_MYSQLD]) - - AX_LIB_MYSQL([5.0]) - AM_CONDITIONAL(HAVE_LIBMYSQL, test "x${found_mysql}" = "xyes") - AS_IF([test "x${found_mysql}" = "xyes"],[ - AC_DEFINE([HAVE_LIBMYSQL_BUILD], [1], [Define to 1 if MySQL libraries are available]) - ],[ - AC_DEFINE([HAVE_LIBMYSQL_BUILD], [0], [Define to 1 if MySQL libraries are available]) - ]) - - AS_IF([test -f "$ac_cv_path_MYSQLD"],[ - AC_DEFINE([HAVE_MYSQLD_BUILD], [1], [Define to 1 if MySQLD binary is available]) - AC_DEFINE_UNQUOTED([MYSQLD_BINARY], "$ac_cv_path_MYSQLD", [Name of the mysqld binary used in make test]) - ],[ - AC_DEFINE([HAVE_MYSQLD_BUILD], [0], [Define to 1 if MySQLD binary is available]) - AC_DEFINE([MYSQLD_BINARY], [0], [Name of the mysqld binary used in make test]) - ]) - ]) diff --git a/libtest/yatl.m4 b/libtest/yatl.m4 deleted file mode 100644 index 0e88425d..00000000 --- a/libtest/yatl.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl Copyright (C) 2012 Data Differential, LLC. -dnl This file is free software; Data Differential, LLC. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_SUBST([LIBTEST_VERSION],[1.0]) -AC_CONFIG_FILES([libtest/version.h]) - -m4_include([libtest/m4/mysql.m4]) - -YATL_MYSQL - -AC_CONFIG_FILES([libtest/yatlcon.h]) diff --git a/m4/README.md b/m4/README.md deleted file mode 100644 index 008389bb..00000000 --- a/m4/README.md +++ /dev/null @@ -1,4 +0,0 @@ -https://github.com/TangentOrg/ddm4 - -Common m4 files that I use. - -Brian Aker, brian@tangent.org diff --git a/m4/ac_cxx_compile_stdcxx_0x.m4 b/m4/ac_cxx_compile_stdcxx_0x.m4 deleted file mode 100644 index ada41729..00000000 --- a/m4/ac_cxx_compile_stdcxx_0x.m4 +++ /dev/null @@ -1,103 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html -# =========================================================================== -# -# SYNOPSIS -# -# AC_CXX_COMPILE_STDCXX_0X -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++0x -# standard. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# -# 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. - -AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [ - AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, - ac_cv_cxx_compile_cxx0x_native, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = c;],, - ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no) - AC_LANG_RESTORE - ]) - - AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, - ac_cv_cxx_compile_cxx0x_cxx, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++0x" - AC_TRY_COMPILE([ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = c;],, - ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no) - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, - ac_cv_cxx_compile_cxx0x_gxx, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=gnu++0x" - AC_TRY_COMPILE([ - template - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - typedef check> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check check_type; - check_type c; - check_type&& cr = c;],, - ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no) - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - if test "$ac_cv_cxx_compile_cxx0x_native" = yes || - test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || - test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then - AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) - fi -]) diff --git a/m4/ax_add_am_macro.m4 b/m4/ax_add_am_macro.m4 deleted file mode 100644 index 3962002b..00000000 --- a/m4/ax_add_am_macro.m4 +++ /dev/null @@ -1,29 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_ADD_AM_MACRO([RULE]) -# -# DESCRIPTION -# -# Adds the specified rule to $AMINCLUDE. This macro will only work -# properly with implementations of Make which allow include statements. -# See also AX_ADD_AM_MACRO_STATIC. -# -# LICENSE -# -# Copyright (c) 2009 Tom Howard -# -# 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 10 - -AC_DEFUN([AX_ADD_AM_MACRO],[ - AC_REQUIRE([AX_AM_MACROS]) - AX_APPEND_TO_FILE([$AMINCLUDE],[$1]) -]) diff --git a/m4/ax_am_jobserver.m4 b/m4/ax_am_jobserver.m4 deleted file mode 100644 index dfbcdbb2..00000000 --- a/m4/ax_am_jobserver.m4 +++ /dev/null @@ -1,55 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_am_jobserver.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_AM_JOBSERVER([default_value]) -# -# DESCRIPTION -# -# Enables the use of make's jobserver for the purpose of parallel building -# by passing the -j option to make. -# -# The option --enable-jobserver is added to configure which can accept a -# yes, no, or an integer. The integer is the number of separate jobs to -# allow. If 'yes' is given, then the is assumed to be one more than the -# number of CPUs (determined through AX_COUNT_CPUS). If the value of no is -# given, then the jobserver is disabled. The default value is given by the -# first argument of the macro, or 'yes' if the argument is omitted. -# -# This macro makes use of AX_AM_MACROS, so you must add the following line -# -# @INC_AMINCLUDE@ -# -# to your Makefile.am files. -# -# LICENSE -# -# Copyright (c) 2008 Michael Paul Bailey -# -# 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 8 - -AC_DEFUN([AX_AM_JOBSERVER], [ - AC_REQUIRE([AX_COUNT_CPUS]) - AC_REQUIRE([AX_AM_MACROS]) - AC_ARG_ENABLE( jobserver, - [ --enable-jobserver@<:@=no/yes/@%:@@:>@ default=m4_ifval([$1],[$1],[yes]) - Enable up to @%:@ make jobs - yes: enable one more than CPU count - ],, [enable_jobserver=m4_ifval([$1],[$1],[yes])]) - if test "x$enable_jobserver" = "xyes"; then - enable_jobserver=$CPU_COUNT - ((enable_jobserver++)) - fi - m4_pattern_allow(AM_MAKEFLAGS) - if test "x$enable_jobserver" != "xno"; then - AC_MSG_NOTICE([added jobserver support to make for $enable_jobserver jobs]) - AX_ADD_AM_MACRO( AM_MAKEFLAGS += -j$enable_jobserver ) - fi -]) diff --git a/m4/ax_am_macros.m4 b/m4/ax_am_macros.m4 deleted file mode 100644 index 36c3ab6a..00000000 --- a/m4/ax_am_macros.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_am_macros.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_AM_MACROS -# -# DESCRIPTION -# -# Adds support for macros that create Make rules. You must manually add -# the following line -# -# @INC_AMINCLUDE@ -# -# to your Makefile.in (or Makefile.am if you use Automake) files. -# -# LICENSE -# -# Copyright (c) 2009 Tom Howard -# -# 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 11 - -AC_DEFUN([AX_AM_MACROS], -[ -AC_MSG_NOTICE([adding automake macro support]) -AMINCLUDE="aminclude.am" -AC_SUBST(AMINCLUDE) -AC_MSG_NOTICE([creating $AMINCLUDE]) -AMINCLUDE_TIME=`LC_ALL=C date` -AX_PRINT_TO_FILE([$AMINCLUDE],[[ -# generated automatically by configure from AX_AUTOMAKE_MACROS -# on $AMINCLUDE_TIME - -]]) - -INC_AMINCLUDE="include \$(top_builddir)/$AMINCLUDE" -AC_SUBST(INC_AMINCLUDE) -]) diff --git a/m4/ax_append_compile_flags.m4 b/m4/ax_append_compile_flags.m4 deleted file mode 100644 index 9c856356..00000000 --- a/m4/ax_append_compile_flags.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# ============================================================================ -# https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the compiler works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. During the check the flag is always added to the -# current language's flags. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and -# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with -# AX_APPEND_LINK_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans -# -# 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 - -AC_DEFUN([AX_APPEND_COMPILE_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4]) -done -])dnl AX_APPEND_COMPILE_FLAGS diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4 deleted file mode 100644 index dd6d8b61..00000000 --- a/m4/ax_append_flag.m4 +++ /dev/null @@ -1,50 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) -# -# DESCRIPTION -# -# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space -# added in between. -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains -# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly -# FLAG. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 8 - -AC_DEFUN([AX_APPEND_FLAG], -[dnl -AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF -AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) -AS_VAR_SET_IF(FLAGS,[ - AS_CASE([" AS_VAR_GET(FLAGS) "], - [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], - [ - AS_VAR_APPEND(FLAGS,[" $1"]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) - ], - [ - AS_VAR_SET(FLAGS,[$1]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) -AS_VAR_POPDEF([FLAGS])dnl -])dnl AX_APPEND_FLAG diff --git a/m4/ax_append_link_flags.m4 b/m4/ax_append_link_flags.m4 deleted file mode 100644 index 99b9fa5b..00000000 --- a/m4/ax_append_link_flags.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the linker works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is -# used. During the check the flag is always added to the linker's flags. -# -# If EXTRA-FLAGS is defined, it is added to the linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG. -# Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans -# -# 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 - -AC_DEFUN([AX_APPEND_LINK_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4]) -done -])dnl AX_APPEND_LINK_FLAGS diff --git a/m4/ax_append_to_file.m4 b/m4/ax_append_to_file.m4 deleted file mode 100644 index 6de3aa3f..00000000 --- a/m4/ax_append_to_file.m4 +++ /dev/null @@ -1,27 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_to_file.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_TO_FILE([FILE],[DATA]) -# -# DESCRIPTION -# -# Appends the specified data to the specified file. -# -# LICENSE -# -# Copyright (c) 2008 Tom Howard -# -# 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 10 - -AC_DEFUN([AX_APPEND_TO_FILE],[ -AC_REQUIRE([AX_FILE_ESCAPES]) -printf "%s\n" "$2" >> "$1" -]) diff --git a/m4/ax_assert.m4 b/m4/ax_assert.m4 deleted file mode 100644 index 0fa2b1c9..00000000 --- a/m4/ax_assert.m4 +++ /dev/null @@ -1,66 +0,0 @@ -# =========================================================================== -# https://github.com/BrianAker/ddm4/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_ASSERT() -# -# DESCRIPTION -# -# --enable-assert -# -# LICENSE -# -# Copyright (C) 2012 Brian Aker -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#serial 6 - -AC_DEFUN([AX_ASSERT], - [AC_PREREQ([2.63])dnl - AC_REQUIRE([AX_DEBUG]) - AC_REQUIRE([AX_VCS_CHECKOUT]) - AC_ARG_ENABLE([assert], - [AS_HELP_STRING([--enable-assert], - [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])], - [ax_enable_assert=$enableval], - [ax_enable_assert=$ac_cv_vcs_checkout]) - - AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" ], - [ax_enable_assert="yes"], - [ax_enable_assert="no" - AC_DEFINE(NDEBUG,[1],[Define to 1 to disable assert'ing code.])]) - - AC_MSG_CHECKING([for assert]) - AC_MSG_RESULT([$ax_enable_assert]) - ]) - diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 deleted file mode 100644 index bd753b34..00000000 --- a/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,53 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/m4/ax_check_library.m4 b/m4/ax_check_library.m4 deleted file mode 100644 index dd27ff41..00000000 --- a/m4/ax_check_library.m4 +++ /dev/null @@ -1,95 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_library.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_LIBRARY(VARIABLE-PREFIX, HEADER-FILE, LIBRARY-FILE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) -# -# DESCRIPTION -# -# Provides a generic test for a given library, similar in concept to the -# PKG_CHECK_MODULES macro used by pkg-config. -# -# Most simplest libraries can be checked against simply through the -# presence of a header file and a library to link to. This macro allows to -# wrap around the test so that it doesn't have to be recreated each time. -# -# Rather than define --with-$LIBRARY arguments, it uses variables in the -# same way that PKG_CHECK_MODULES does. It doesn't, though, use the same -# names, since you shouldn't provide a value for LIBS or CFLAGS but rather -# for LDFLAGS and CPPFLAGS, to tell the linker and compiler where to find -# libraries and headers respectively. -# -# If the library is find, HAVE_PREFIX is defined, and in all cases -# PREFIX_LDFLAGS and PREFIX_CPPFLAGS are substituted. -# -# Example: -# -# AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event], [], -# [AC_MSG_ERROR([Unable to find libevent])]) -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# Copyright (c) 2010 Diego Elio Petteno` -# -# 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 7 - -AC_DEFUN([AX_CHECK_LIBRARY], - [AC_ARG_VAR($1[_CPPFLAGS],[C preprocessor flags for ]$1[ headers]) - AC_ARG_VAR($1[_LDFLAGS],[linker flags for ]$1[ libraries]) - - AC_CACHE_VAL(AS_TR_SH([ax_cv_have_]$1), - [AX_SAVE_FLAGS - - AS_IF([test "x$]$1[_CPPFLAGS" != "x"], - [CPPFLAGS="$CPPFLAGS $]$1[_CPPFLAGS"]) - - AS_IF([test "x$]$1[_LDFLAGS" != "x"], - [LDFLAGS="$LDFLAGS $]$1[_LDFLAGS"]) - - AC_CHECK_HEADER($2, [ - AC_CHECK_LIB($3, [main], - [AS_TR_SH([ax_cv_have_]$1)=yes], - [AS_TR_SH([ax_cv_have_]$1)=no]) - ], [AS_TR_SH([ax_cv_have_]$1)=no]) - - AX_RESTORE_FLAGS - ]) - - AS_IF([test "$]AS_TR_SH([ax_cv_have_]$1)[" = "yes"], - [AC_DEFINE([HAVE_]$1, [1], [Define to 1 if ]$1[ is found]) - AC_SUBST($1[_CPPFLAGS]) - AC_SUBST($1[_LDFLAGS]) - AC_SUBST($1[_LIB],[-l]$3) - ifelse([$4], , :, [$4])], - [ifelse([$5], , :, [$5])]) - ]) diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4 deleted file mode 100644 index 03a30ce4..00000000 --- a/m4/ax_check_link_flag.m4 +++ /dev/null @@ -1,53 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the linker or gives an error. -# (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_LINK_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 - -AC_DEFUN([AX_CHECK_LINK_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl -AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ - ax_check_save_flags=$LDFLAGS - LDFLAGS="$LDFLAGS $4 $1" - AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - LDFLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_LINK_FLAGS diff --git a/m4/ax_compiler_vendor.m4 b/m4/ax_compiler_vendor.m4 deleted file mode 100644 index 29970c2a..00000000 --- a/m4/ax_compiler_vendor.m4 +++ /dev/null @@ -1,88 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VENDOR -# -# DESCRIPTION -# -# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, -# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, -# watcom, etc. The vendor is returned in the cache variable -# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# Copyright (c) 2008 Matteo Frigo -# -# 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 17 - -AC_DEFUN([AX_COMPILER_VENDOR], -[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, - dnl Please add if possible support to ax_compiler_version.m4 - [# note: don't check for gcc first since some other compilers define __GNUC__ - vendors="intel: __ICC,__ECC,__INTEL_COMPILER - ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__ - pathscale: __PATHCC__,__PATHSCALE__ - clang: __clang__ - cray: _CRAYC - fujitsu: __FUJITSU - sdcc: SDCC, __SDCC - gnu: __GNUC__ - sun: __SUNPRO_C,__SUNPRO_CC - hp: __HP_cc,__HP_aCC - dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER - borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ - comeau: __COMO__ - kai: __KCC - lcc: __LCC__ - sgi: __sgi,sgi - microsoft: _MSC_VER - metrowerks: __MWERKS__ - watcom: __WATCOMC__ - portland: __PGI - tcc: __TINYC__ - unknown: UNKNOWN" - for ventest in $vendors; do - case $ventest in - *:) vendor=$ventest; continue ;; - *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; - esac - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ - #if !($vencpp) - thisisanerror; - #endif - ])], [break]) - done - ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1` - ]) -]) diff --git a/m4/ax_compiler_version.m4 b/m4/ax_compiler_version.m4 deleted file mode 100644 index 0581d1bc..00000000 --- a/m4/ax_compiler_version.m4 +++ /dev/null @@ -1,529 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VERSION -# -# DESCRIPTION -# -# This macro retrieves the compiler version and returns it in the cache -# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version -# for C++. -# -# Version is returned as epoch:major.minor.patchversion -# -# Epoch is used in order to have an increasing version number in case of -# marketing change. -# -# Epoch use: * borland compiler use chronologically 0turboc for turboc -# era, -# -# 1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era, -# 3borlancpp for return of BORLANDC++ (after version 5.5), -# 4cppbuilder for cppbuilder with year version, -# and 5xe for XE era. -# -# An empty string is returned otherwise. -# -# LICENSE -# -# Copyright (c) 2014 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 12 - -# for intel -AC_DEFUN([_AX_COMPILER_VERSION_INTEL], - [ dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__INTEL_COMPILER/100],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__INTEL_COMPILER%100)/10],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [(__INTEL_COMPILER%10)],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for IBM -AC_DEFUN([_AX_COMPILER_VERSION_IBM], - [ dnl - dnl check between z/OS C/C++ and XL C/C++ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([], - [ - #if defined(__COMPILER_VER__) - choke me; - #endif - ])], - [ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__xlC__/100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__xlC__%100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__xlC_ver__/0x100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, - [__xlC_ver__%0x100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" - ], - [ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__xlC__%1000],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__xlC__/10000)%10],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__xlC__/100000)%10],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) -]) - -# for pathscale -AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __PATHCC__,, - AC_MSG_FAILURE([[[$0]] unknown pathscale major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __PATHCC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__PATHCC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for clang -AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __clang_major__,, - AC_MSG_FAILURE([[[$0]] unknown clang major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __clang_minor__,, - AC_MSG_FAILURE([[[$0]] unknown clang minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__clang_patchlevel__],,0) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for crayc -AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - _RELEASE,, - AC_MSG_FAILURE([[[$0]] unknown crayc release])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _RELEASE_MINOR,, - AC_MSG_FAILURE([[[$0]] unknown crayc minor])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# for fujitsu -AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ - AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, - __FCC_VERSION,, - AC_MSG_FAILURE([[[$0]]unknown fujitsu release])) - ]) - -# for GNU -AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __GNUC__,, - AC_MSG_FAILURE([[[$0]] unknown gcc major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __GNUC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown gcc minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__GNUC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# For sun -AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ - m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], - [ - #if defined(__SUNPRO_CC) - __SUNPRO_CC - #else - __SUNPRO_C - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, - !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, - AC_MSG_FAILURE([[[$0]] unknown sun release version])) - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, - AC_MSG_FAILURE([[[$0]] unknown sun major version])) - ], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, - AC_MSG_FAILURE([[[$0]] unknown sun minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, - AC_MSG_FAILURE([[[$0]] unknown sun major version])) - ]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" -]) - -AC_DEFUN([_AX_COMPILER_VERSION_HP],[ - m4_define([_AX_COMPILER_VERSION_HP_NUMBER], - [ - #if defined(__HP_cc) - __HP_cc - #else - __HP_aCC - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, - !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, - AC_MSG_FAILURE([[[$0]] unknown hp release version])) - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], - [dnl By default output last version with this behavior. - dnl it is so old - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" - ], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - (_AX_COMPILER_VERSION_HP_NUMBER % 100),, - AC_MSG_FAILURE([[[$0]] unknown hp release version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, - AC_MSG_FAILURE([[[$0]] unknown hp minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, - AC_MSG_FAILURE([[[$0]] unknown hp major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) -]) - -AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl - m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], - [ - #if defined(__DECC_VER) - __DECC_VER - #else - __DECCXX_VER - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, - AC_MSG_FAILURE([[[$0]] unknown dec release version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, - AC_MSG_FAILURE([[[$0]] unknown dec minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, - AC_MSG_FAILURE([[[$0]] unknown dec major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# borland -AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl - m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], - [ - #if defined(__TURBOC__) - __TURBOC__ - #else - choke me - #endif - ]) - m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], - [ - #if defined(__BORLANDC__) - __BORLANDC__ - #else - __CODEGEARC__ - #endif - ]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM(, - _AX_COMPILER_VERSION_TURBOC_NUMBER)], - [dnl TURBOC - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, - _AX_COMPILER_VERSION_TURBOC_NUMBER,, - AC_MSG_FAILURE([[[$0]] unknown turboc version])) - AS_IF( - [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], - [dnl compute normal version - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, - AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, - AC_MSG_FAILURE([[[$0]] unknown turboc major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], - [dnl special version - AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], - [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], - [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], - [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], - [ - AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" - ]) - ]) - ], - # borlandc - [ - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, - _AX_COMPILER_VERSION_BORLANDC_NUMBER,, - AC_MSG_FAILURE([[[$0]] unknown borlandc version])) - AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], - dnl BORLANDC++ before 5.5 - [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], - [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], - [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], - [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], - [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], - [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], - [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], - dnl C++ Builder era - [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], - [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], - dnl BORLANDC++ after 5.5 - [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], - [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], - [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], - dnl C++ Builder with year number - [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], - [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], - [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], - [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], - dnl XE version - [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], - [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], - [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], - [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], - [ - AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) - ]) - ]) - ]) - -# COMO -AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], - [ dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__COMO_VERSION__%100],, - AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__COMO_VERSION__/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# KAI -AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__KCC_VERSION%100],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__KCC_VERSION/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__KCC_VERSION/1000)%10],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -dnl LCC -dnl LCC does not output version... - -# SGI -AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ - m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], - [ - #if defined(_COMPILER_VERSION) - _COMPILER_VERSION - #else - _SGI_COMPILER_VERSION - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [_AX_COMPILER_VERSION_SGI_NUMBER%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# microsoft -AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _MSC_VER%100,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_MSC_VER/100)%100,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) - dnl could be overridden - _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 - _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 - # special case for version 6 - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%1000,, - _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) - # for version 7 - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%1000,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) - ]) - # for version > 8 - AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%10000,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) - ]) - AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, - _MSC_BUILD,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) - ]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" - ]) - -# for metrowerks -AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - __MWERKS__%0x100,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (__MWERKS__/0x100)%0x10,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (__MWERKS__/0x1000)%0x10,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for watcom -AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __WATCOMC__%100,, - AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (__WATCOMC__/100)%100,, - AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# for PGI -AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __PGIC__,, - AC_MSG_FAILURE([[[$0]] unknown pgi major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __PGIC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown pgi minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__PGIC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# tcc -AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+\([0-9.]\+\).*/\1/g'`] - ]) - -# for GNU -AC_DEFUN([_AX_COMPILER_VERSION_SDCC],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - /* avoid parse error with comments */ - #if(defined(__SDCC_VERSION_MAJOR)) - __SDCC_VERSION_MAJOR - #else - SDCC/100 - #endif - ,, - AC_MSG_FAILURE([[[$0]] unknown sdcc major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - /* avoid parse error with comments */ - #if(defined(__SDCC_VERSION_MINOR)) - __SDCC_VERSION_MINOR - #else - (SDCC%100)/10 - #endif - ,, - AC_MSG_FAILURE([[[$0]] unknown sdcc minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [ - /* avoid parse error with comments */ - #if(defined(__SDCC_VERSION_PATCH)) - __SDCC_VERSION_PATCH - #elsif(defined(_SDCC_VERSION_PATCHLEVEL)) - __SDCC_VERSION_PATCHLEVEL - #else - SDCC%10 - #endif - ],, - AC_MSG_FAILURE([[[$0]] unknown sdcc patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# main entry point -AC_DEFUN([AX_COMPILER_VERSION],[dnl - AC_REQUIRE([AX_COMPILER_VENDOR]) - AC_REQUIRE([AC_PROG_SED]) - AC_CACHE_CHECK([for _AC_LANG compiler version], - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, - [ dnl - AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor], - [intel],[_AX_COMPILER_VERSION_INTEL], - [ibm],[_AX_COMPILER_VERSION_IBM], - [pathscale],[_AX_COMPILER_VERSION_PATHSCALE], - [clang],[_AX_COMPILER_VERSION_CLANG], - [cray],[_AX_COMPILER_VERSION_CRAY], - [fujitsu],[_AX_COMPILER_VERSION_FUJITSU], - [gnu],[_AX_COMPILER_VERSION_GNU], - [sun],[_AX_COMPILER_VERSION_SUN], - [hp],[_AX_COMPILER_VERSION_HP], - [dec],[_AX_COMPILER_VERSION_DEC], - [borland],[_AX_COMPILER_VERSION_BORLAND], - [comeau],[_AX_COMPILER_VERSION_COMEAU], - [kai],[_AX_COMPILER_VERSION_KAI], - [sgi],[_AX_COMPILER_VERSION_SGI], - [microsoft],[_AX_COMPILER_VERSION_MICROSOFT], - [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], - [watcom],[_AX_COMPILER_VERSION_WATCOM], - [portland],[_AX_COMPILER_VERSION_PORTLAND], - [tcc],[_AX_COMPILER_VERSION_TCC], - [sdcc],[_AX_COMPILER_VERSION_SDCC], - [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) - ]) -]) diff --git a/m4/ax_count_cpus.m4 b/m4/ax_count_cpus.m4 deleted file mode 100644 index 5db89255..00000000 --- a/m4/ax_count_cpus.m4 +++ /dev/null @@ -1,101 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_count_cpus.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COUNT_CPUS([ACTION-IF-DETECTED],[ACTION-IF-NOT-DETECTED]) -# -# DESCRIPTION -# -# Attempt to count the number of logical processor cores (including -# virtual and HT cores) currently available to use on the machine and -# place detected value in CPU_COUNT variable. -# -# On successful detection, ACTION-IF-DETECTED is executed if present. If -# the detection fails, then ACTION-IF-NOT-DETECTED is triggered. The -# default ACTION-IF-NOT-DETECTED is to set CPU_COUNT to 1. -# -# LICENSE -# -# Copyright (c) 2014,2016 Karlson2k (Evgeny Grin) -# Copyright (c) 2012 Brian Aker -# Copyright (c) 2008 Michael Paul Bailey -# Copyright (c) 2008 Christophe Tournayre -# -# 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 22 - - AC_DEFUN([AX_COUNT_CPUS],[dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_EGREP])dnl - AC_MSG_CHECKING([the number of available CPUs]) - CPU_COUNT="0" - - # Try generic methods - - # 'getconf' is POSIX utility, but '_NPROCESSORS_ONLN' and - # 'NPROCESSORS_ONLN' are platform-specific - command -v getconf >/dev/null 2>&1 && \ - CPU_COUNT=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null` || CPU_COUNT="0" - AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v nproc >/dev/null 2>&1]],[[: # empty]],[dnl - # 'nproc' is part of GNU Coreutils and is widely available - CPU_COUNT=`OMP_NUM_THREADS='' nproc 2>/dev/null` || CPU_COUNT=`nproc 2>/dev/null` || CPU_COUNT="0" - ])dnl - - AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl - # Try platform-specific preferred methods - AS_CASE([[$host_os]],dnl - [[*linux*]],[[CPU_COUNT=`lscpu -p 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+,' -c` || CPU_COUNT="0"]],dnl - [[*darwin*]],[[CPU_COUNT=`sysctl -n hw.logicalcpu 2>/dev/null` || CPU_COUNT="0"]],dnl - [[freebsd*]],[[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n kern.smp.cpus 2>/dev/null` || CPU_COUNT="0"]],dnl - [[netbsd*]], [[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n hw.ncpuonline 2>/dev/null` || CPU_COUNT="0"]],dnl - [[solaris*]],[[command -v psrinfo >/dev/null 2>&1 && CPU_COUNT=`psrinfo 2>/dev/null | $EGREP -e '^@<:@0-9@:>@.*on-line' -c 2>/dev/null` || CPU_COUNT="0"]],dnl - [[mingw*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl - [[msys*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl - [[cygwin*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]]dnl - )dnl - ])dnl - - AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v sysctl >/dev/null 2>&1]],[[: # empty]],[dnl - # Try less preferred generic method - # 'hw.ncpu' exist on many platforms, but not on GNU/Linux - CPU_COUNT=`sysctl -n hw.ncpu 2>/dev/null` || CPU_COUNT="0" - ])dnl - - AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl - # Try platform-specific fallback methods - # They can be less accurate and slower then preferred methods - AS_CASE([[$host_os]],dnl - [[*linux*]],[[CPU_COUNT=`$EGREP -e '^processor' -c /proc/cpuinfo 2>/dev/null` || CPU_COUNT="0"]],dnl - [[*darwin*]],[[CPU_COUNT=`system_profiler SPHardwareDataType 2>/dev/null | $EGREP -i -e 'number of cores:'|cut -d : -f 2 -s|tr -d ' '` || CPU_COUNT="0"]],dnl - [[freebsd*]],[[CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+: '|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl - [[netbsd*]], [[CPU_COUNT=`command -v cpuctl >/dev/null 2>&1 && cpuctl list 2>/dev/null| $EGREP -e '^@<:@0-9@:>@+ .* online ' -c` || \ - CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+ at'|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl - [[solaris*]],[[command -v kstat >/dev/null 2>&1 && CPU_COUNT=`kstat -m cpu_info -s state -p 2>/dev/null | $EGREP -c -e 'on-line'` || \ - CPU_COUNT=`kstat -m cpu_info 2>/dev/null | $EGREP -c -e 'module: cpu_info'` || CPU_COUNT="0"]],dnl - [[mingw*]],[AS_IF([[CPU_COUNT=`reg query 'HKLM\\Hardware\\Description\\System\\CentralProcessor' 2>/dev/null | $EGREP -e '\\\\@<:@0-9@:>@+$' -c`]],dnl - [[: # empty]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]])],dnl - [[msys*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]],dnl - [[cygwin*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]]dnl - )dnl - ])dnl - - AS_IF([[test "x$CPU_COUNT" != "x0" && test "$CPU_COUNT" -gt 0 2>/dev/null]],[dnl - AC_MSG_RESULT([[$CPU_COUNT]]) - m4_ifvaln([$1],[$1],)dnl - ],[dnl - m4_ifval([$2],[dnl - AS_UNSET([[CPU_COUNT]]) - AC_MSG_RESULT([[unable to detect]]) - $2 - ], [dnl - CPU_COUNT="1" - AC_MSG_RESULT([[unable to detect (assuming 1)]]) - ])dnl - ])dnl - ])dnl diff --git a/m4/ax_cxx_gcc_abi_demangle.m4 b/m4/ax_cxx_gcc_abi_demangle.m4 deleted file mode 100644 index 072d5db8..00000000 --- a/m4/ax_cxx_gcc_abi_demangle.m4 +++ /dev/null @@ -1,62 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_cxx_gcc_abi_demangle.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_GCC_ABI_DEMANGLE -# -# DESCRIPTION -# -# If the compiler supports GCC C++ ABI name demangling (has header -# cxxabi.h and abi::__cxa_demangle() function), define -# HAVE_GCC_ABI_DEMANGLE -# -# Adapted from AX_CXX_RTTI by Luc Maisonobe -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# Copyright (c) 2008 Neil Ferguson -# -# 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 10 - -AC_DEFUN([AX_CXX_GCC_ABI_DEMANGLE], - [AC_PREREQ([2.63])dnl - AC_CACHE_CHECK([whether the compiler supports GCC C++ ABI name demangling], - [ax_cv_cxx_gcc_abi_demangle], - [AC_LANG_PUSH([C++]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include -#include -#include -#include - template - class A {};]], - [[A instance; -#if defined(_WIN32) - return EXIT_FAILURE; -#endif - int status = 0; - char* c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status); - - std::string name(c_name); - ::free(c_name); - - if (name.compare("A") != 0) - { - return EXIT_FAILURE; - }]])], - [ax_cv_cxx_gcc_abi_demangle=yes], - [ax_cv_cxx_gcc_abi_demangle=no], - [ax_cv_cxx_gcc_abi_demangle=no]) - AC_LANG_POP]) - AC_MSG_CHECKING([checking for cxx_gcc_abi_demangle]) - AC_MSG_RESULT(["$ax_cv_cxx_gcc_abi_demangle"]) - AS_IF([test "x$ax_cv_cxx_gcc_abi_demangle" = xyes], - [AC_DEFINE([HAVE_GCC_ABI_DEMANGLE],[1],[define if the compiler supports GCC C++ ABI name demangling])]) - ]) diff --git a/m4/ax_cxx_header_stdcxx_98.m4 b/m4/ax_cxx_header_stdcxx_98.m4 deleted file mode 100644 index 82e04c58..00000000 --- a/m4/ax_cxx_header_stdcxx_98.m4 +++ /dev/null @@ -1,91 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_cxx_header_stdcxx_98.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_HEADER_STDCXX_98 -# -# DESCRIPTION -# -# Check for complete library coverage of the C++1998/2003 standard. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# -# 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 - -AU_ALIAS([AC_CXX_HEADER_STDCXX_98], [AX_CXX_HEADER_STDCXX_98]) -AC_DEFUN([AX_CXX_HEADER_STDCXX_98], [ - AC_CACHE_CHECK([for ISO C++ 98 include files], [ax_cv_cxx_stdcxx_98], [ - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - ], [ - int x - ]), [ax_cv_cxx_stdcxx_98=yes ], [ax_cv_cxx_stdcxx_98=no ] - ]) - - AC_LANG_POP - - ]) - - if test "$ax_cv_cxx_stdcxx_98" = yes; then - AC_DEFINE(STDCXX_98_HEADERS,,[Define if ISO C++ 1998 header files are present. ]) - fi -]) diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4 deleted file mode 100644 index 17152e79..00000000 --- a/m4/ax_debug.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# =========================================================================== -# https://github.com/BrianAker/ddm4/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_DEBUG() -# -# DESCRIPTION -# -# --enable-debug -# -# LICENSE -# -# Copyright (C) 2012-2014 Brian Aker -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#serial 8 - -AC_DEFUN([AX_DEBUG], - [AC_PREREQ([2.63])dnl - AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], - [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], - [ax_enable_debug=$enableval], - [ax_enable_debug=no]) - - AS_IF([test "x$ax_enable_debug" = xyes], - [AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) - AX_ADD_AM_MACRO([AM_YFLAGS += --debug]) - AX_ADD_AM_MACRO([AM_CPPFLAGS += -D_GLIBCXX_DEBUG])], - [AC_SUBST([MCHECK]) - AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])]) - - AC_MSG_CHECKING([for debug]) - AC_MSG_RESULT([$ax_enable_debug]) - AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])]) diff --git a/m4/ax_dlopen.m4 b/m4/ax_dlopen.m4 deleted file mode 100644 index 514c578a..00000000 --- a/m4/ax_dlopen.m4 +++ /dev/null @@ -1,10 +0,0 @@ -#serial 2 - -AC_DEFUN([AX_DLOPEN], - [AS_IF([test "x$enable_shared" = xyes], - [AX_CHECK_LIBRARY([DL],[dlfcn.h],[dl], - [AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen]) - AC_CHECK_LIB([dl],[dlopen],[AC_DEFINE([HAVE_DLOPEN],[1],[Have dlopen])]) - AC_CHECK_LIB([dl],[dladdr],[AC_DEFINE([HAVE_DLADDR],[1],[Have dladdr])])])]) - ]) - diff --git a/m4/ax_endian.m4 b/m4/ax_endian.m4 deleted file mode 100644 index 0dfbcd52..00000000 --- a/m4/ax_endian.m4 +++ /dev/null @@ -1,35 +0,0 @@ -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_ENDIAN() -# -# DESCRIPTION -# -# Generate to defines describing endian. -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# -# 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 1 - -AC_DEFUN([AX_ENDIAN],[ - AC_C_BIGENDIAN([ - AC_DEFINE([WORDS_BIGENDIAN],[1],[machine is big-endian]) - AC_DEFINE([ENDIAN_BIG],[1],[machine is big-endian]) - AC_DEFINE([ENDIAN_LITTLE],[0],[machine is little-endian])],[ - ],[ - AC_DEFINE([WORDS_BIGENDIAN],[0],[machine is big-endian]) - AC_DEFINE([ENDIAN_BIG],[0],[machine is big-endian]) - AC_DEFINE([ENDIAN_LITTLE],[1],[machine is little-endian]) - ],[ - AC_MSG_ERROR([unable to determine endian]) - ]) - ]) diff --git a/m4/ax_file_escapes.m4 b/m4/ax_file_escapes.m4 deleted file mode 100644 index a86fdc32..00000000 --- a/m4/ax_file_escapes.m4 +++ /dev/null @@ -1,30 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_FILE_ESCAPES -# -# DESCRIPTION -# -# Writes the specified data to the specified file. -# -# LICENSE -# -# Copyright (c) 2008 Tom Howard -# -# 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 8 - -AC_DEFUN([AX_FILE_ESCAPES],[ -AX_DOLLAR="\$" -AX_SRB="\\135" -AX_SLB="\\133" -AX_BS="\\\\" -AX_DQ="\"" -]) diff --git a/m4/ax_gcc_atomic_builtins.m4 b/m4/ax_gcc_atomic_builtins.m4 deleted file mode 100644 index bc989e08..00000000 --- a/m4/ax_gcc_atomic_builtins.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# serial 1 -# -AC_DEFUN([HAVE_GCC_ATOMICS], - [AC_CACHE_CHECK([whether the compiler provides atomic builtins], - [ax_cv_gcc_atomic_builtins], - [AX_SAVE_FLAGS - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([], - [[ - int foo= -10; int bar= 10; - if (!__sync_fetch_and_add(&foo, bar) || foo) - { - return -1; - } - bar= __sync_lock_test_and_set(&foo, bar); - if (bar || foo != 10) - { - return -1; - } - bar= __sync_val_compare_and_swap(&bar, foo, 15); - if (bar) - { - return -1; - } - ]])], - [ax_cv_gcc_atomic_builtins=yes], - [ax_cv_gcc_atomic_builtins=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - AX_RESTORE_FLAGS - ]) - - AS_IF([test "x$ax_cv_gcc_atomic_builtins" = "xyes"], - [AC_DEFINE([HAVE_GCC_ATOMIC_BUILTINS],[1], - [Define to 1 if compiler provides atomic builtins.]) - ]) - ]) diff --git a/m4/ax_gcc_version.m4 b/m4/ax_gcc_version.m4 deleted file mode 100644 index 0d924741..00000000 --- a/m4/ax_gcc_version.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_gcc_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_GCC_VERSION -# -# DESCRIPTION -# -# This macro retrieves the gcc version and returns it in the GCC_VERSION -# variable if available, an empty string otherwise. -# -# LICENSE -# -# Copyright (c) 2009 Francesco Salvestrini -# -# 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 2 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 8 - -AC_DEFUN([AX_GCC_VERSION], [ - GCC_VERSION="" - AX_GCC_OPTION([-dumpversion],[],[],[ - ax_gcc_version_option=yes - ],[ - ax_gcc_version_option=no - ]) - AS_IF([test "x$GCC" = "xyes"],[ - AS_IF([test "x$ax_gcc_version_option" != "xno"],[ - AC_CACHE_CHECK([gcc version],[ax_cv_gcc_version],[ - ax_cv_gcc_version="`$CC -dumpversion`" - AS_IF([test "x$ax_cv_gcc_version" = "x"],[ - ax_cv_gcc_version="" - ]) - ]) - GCC_VERSION=$ax_cv_gcc_version - ]) - ]) - AC_SUBST([GCC_VERSION]) -]) diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4 deleted file mode 100644 index 8ceeca67..00000000 --- a/m4/ax_harden_compiler_flags.m4 +++ /dev/null @@ -1,354 +0,0 @@ -# vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -# =========================================================================== -# https://github.com/BrianAker/ddm4/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_HARDEN_COMPILER_FLAGS() AX_HARDEN_LINKER_FLAGS() -# -# DESCRIPTION -# -# Any compiler flag that "hardens" or tests code. C99 is assumed. -# -# LICENSE -# -# Copyright (C) 2012-2019 Brian Aker -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Notes: -# We do not test for c99 or c++11, that is out of scope. - -# The Following flags are not checked for -# -Wdeclaration-after-statement is counter to C99 -# _APPEND_COMPILE_FLAGS_ERROR([-pedantic]) - -#serial 17 - -AC_DEFUN([_SET_SANITIZE_FLAGS], - [AS_IF([test "x$MINGW" != xyes],[ - AS_IF([test "x$enable_shared" = "xyes"], - [AS_CASE([$ax_harden_sanitize], - [thread],[ - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])], - [address],[ - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])], - [rest],[ - _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound]) - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr]) - AS_IF([test "$ax_cv_c_compiler_vendor" != "clang"],[ - _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size]) - ]) - ]) - ]) - ]) - ]) - -# Note: Should this be LIBS or LDFLAGS? -AC_DEFUN([_APPEND_LINK_FLAGS_ERROR], - [AX_APPEND_LINK_FLAGS([$1],[LDFLAGS],[-Werror]) - ]) - -AC_DEFUN([_APPEND_COMPILE_FLAGS_ERROR], - [AX_APPEND_COMPILE_FLAGS([$1],,[-Werror]) - ]) - -# Everything above this does the heavy lifting, while what follows does the specifics. - -AC_DEFUN([_HARDEN_LINKER_FLAGS], - [AS_IF([test "$ax_cv_c_compiler_vendor" != "clang"], - [_APPEND_LINK_FLAGS_ERROR(["-z relro" "-z now"]) - AS_IF([test "x$ac_cv_vcs_checkout" = xyes], - [_APPEND_LINK_FLAGS_ERROR([-rdynamic]) -# AX_APPEND_LINK_FLAGS([--coverage])]) - AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],[AX_APPEND_LINK_FLAGS([-Werror])]) - ]) - ]) - -AC_DEFUN([_AX_HARDEN_SANITIZE], - [AC_REQUIRE([AX_DEBUG]) - AC_ARG_WITH([sanitize], - [AS_HELP_STRING([--with-sanitize], - [Enable sanitize flag for compiler if it supports them @<:@default=no@:>@])], - [AS_CASE([$with_sanitize], - [thread],[ - ax_harden_sanitize='thread'], - [address],[ - ax_harden_sanitize='address'], - [ax_harden_sanitize='rest']) - ], - [AS_IF([test "x$ax_enable_debug" = xyes],[ax_harden_sanitize='rest'])]) - ]) - -AC_DEFUN([_HARDEN_CC_COMPILER_FLAGS], - [AC_LANG_PUSH([C])dnl - - AS_IF([test "x$ax_enable_debug" = xyes], - [ - #_APPEND_COMPILE_FLAGS_ERROR([-H]) - _APPEND_COMPILE_FLAGS_ERROR([-g]) - _APPEND_COMPILE_FLAGS_ERROR([-g3]) - _APPEND_COMPILE_FLAGS_ERROR([-fno-eliminate-unused-debug-types]) - _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) - ],[ - _APPEND_COMPILE_FLAGS_ERROR([-g]) - _APPEND_COMPILE_FLAGS_ERROR([-O2]) - ]) - - AS_IF([test "x$ac_cv_vcs_checkout" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check]) -# _APPEND_COMPILE_FLAGS_ERROR([--coverage]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpragmas]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas])], - [_APPEND_COMPILE_FLAGS_ERROR([-Wno-unknown-pragmas]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])]) - - AS_IF([test "$ax_cv_c_compiler_vendor" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])]) - - _APPEND_COMPILE_FLAGS_ERROR([-Wall]) - _APPEND_COMPILE_FLAGS_ERROR([-Wextra]) - _APPEND_COMPILE_FLAGS_ERROR([-Weverything]) - _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail]) -# Anything below this comment please keep sorted. -# _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes]) - _APPEND_COMPILE_FLAGS_ERROR([-Waddress]) - _APPEND_COMPILE_FLAGS_ERROR([-Wvarargs]) - _APPEND_COMPILE_FLAGS_ERROR([-Warray-bounds]) - _APPEND_COMPILE_FLAGS_ERROR([-Wbad-function-cast]) -# Not in use -Wc++-compat - _APPEND_COMPILE_FLAGS_ERROR([-Wchar-subscripts]) - _APPEND_COMPILE_FLAGS_ERROR([-Wcomment]) - _APPEND_COMPILE_FLAGS_ERROR([-Wfloat-equal]) - _APPEND_COMPILE_FLAGS_ERROR([-Wformat-security]) - _APPEND_COMPILE_FLAGS_ERROR([-Wformat=2]) - _APPEND_COMPILE_FLAGS_ERROR([-Wformat-y2k]) - _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-field-initializers]) - AS_IF([test "x$MINGW" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-Wno-missing-noreturn])], - [_APPEND_COMPILE_FLAGS_ERROR([-Wmissing-noreturn])]) - _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-prototypes]) - _APPEND_COMPILE_FLAGS_ERROR([-Wnested-externs]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpointer-arith]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpointer-sign]) - AS_IF([test "x$MINGW" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=const]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=noreturn]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=pure]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-redundant-decls])], - [_APPEND_COMPILE_FLAGS_ERROR([-Wredundant-decls])]) - _APPEND_COMPILE_FLAGS_ERROR([-Wshadow]) - _APPEND_COMPILE_FLAGS_ERROR([-Wshorten-64-to-32]) - _APPEND_COMPILE_FLAGS_ERROR([-Wsign-compare]) - _APPEND_COMPILE_FLAGS_ERROR([-Wstrict-overflow=1]) - _APPEND_COMPILE_FLAGS_ERROR([-Wstrict-prototypes]) - _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum]) - _APPEND_COMPILE_FLAGS_ERROR([-Wundef]) - - _APPEND_COMPILE_FLAGS_ERROR([-Wunused]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-variable]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-parameter]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-local-typedefs]) - _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings]) - _APPEND_COMPILE_FLAGS_ERROR([-fwrapv]) - _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt]) - _APPEND_COMPILE_FLAGS_ERROR([-pipe]) - AS_IF([test "x$MINGW" = xyes], - [], - [_APPEND_COMPILE_FLAGS_ERROR([-fPIE -pie])]) - _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpacked]) - _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) - _APPEND_COMPILE_FLAGS_ERROR([-ftrapv]) - # Stop error when using -pie on library builds - _APPEND_COMPILE_FLAGS_ERROR([-Wno-unused-command-line-argument]) -# GCC 4.5 removed this. -# _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code]) - - _SET_SANITIZE_FLAGS - - AS_IF([test "x$ax_enable_debug" = xno], - [AS_IF([test "x$ac_cv_vcs_checkout" = xyes], - [AS_IF([test "x${host_os}" != "xmingw"], - [AS_IF([test "x$ac_c_gcc_recent" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2]) - #_APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector]) - #_APPEND_COMPILE_FLAGS_ERROR([-fstack-protector --param=ssp-buffer-size=4]) - _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all]) - ])])])]) - - AS_IF([test "x$ac_cv_warnings_as_errors" = xyes], - [AX_APPEND_COMPILE_FLAGS([-Werror])]) - - AC_LANG_POP([C]) - ]) - -AC_DEFUN([_HARDEN_CXX_COMPILER_FLAGS], - [AC_LANG_PUSH([C++]) - AS_IF([test "x$ax_enable_debug" = xyes], - [CXXFLAGS='' - #_APPEND_COMPILE_FLAGS_ERROR([-H]) - _APPEND_COMPILE_FLAGS_ERROR([-g]) - _APPEND_COMPILE_FLAGS_ERROR([-g3]) - _APPEND_COMPILE_FLAGS_ERROR([-fno-inline]) - _APPEND_COMPILE_FLAGS_ERROR([-fno-eliminate-unused-debug-types]) - _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer]) - ],[ - _APPEND_COMPILE_FLAGS_ERROR([-g]) - _APPEND_COMPILE_FLAGS_ERROR([-O2]) - ]) - - AS_IF([test "x$ac_cv_vcs_checkout" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check]) -# _APPEND_COMPILE_FLAGS_ERROR([--coverage]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpragmas]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas])], - [_APPEND_COMPILE_FLAGS_ERROR([-Wno-unknown-pragmas]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])]) - - AS_IF([test "$ax_cv_c_compiler_vendor" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])]) - - _APPEND_COMPILE_FLAGS_ERROR([-Wall]) - _APPEND_COMPILE_FLAGS_ERROR([-Wextra]) - _APPEND_COMPILE_FLAGS_ERROR([-Weverything]) - _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail]) -# Anything below this comment please keep sorted. -# _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes]) - _APPEND_COMPILE_FLAGS_ERROR([-Wvarargs]) - _APPEND_COMPILE_FLAGS_ERROR([-Waddress]) - _APPEND_COMPILE_FLAGS_ERROR([-Warray-bounds]) - _APPEND_COMPILE_FLAGS_ERROR([-Wchar-subscripts]) - _APPEND_COMPILE_FLAGS_ERROR([-Wcomment]) - _APPEND_COMPILE_FLAGS_ERROR([-Wctor-dtor-privacy]) - _APPEND_COMPILE_FLAGS_ERROR([-Wfloat-equal]) - _APPEND_COMPILE_FLAGS_ERROR([-Wformat=2]) - _APPEND_COMPILE_FLAGS_ERROR([-Wformat-y2k]) - _APPEND_COMPILE_FLAGS_ERROR([-Wmaybe-uninitialized]) - _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-field-initializers]) - _APPEND_COMPILE_FLAGS_ERROR([-Wlogical-op]) - _APPEND_COMPILE_FLAGS_ERROR([-Wnon-virtual-dtor]) - _APPEND_COMPILE_FLAGS_ERROR([-Wnormalized=id]) - _APPEND_COMPILE_FLAGS_ERROR([-Woverloaded-virtual]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpointer-arith]) - AS_IF([test "x$MINGW" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=const]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-missing-noreturn]) - _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-noreturn]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=noreturn]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-error=suggest-attribute=noreturn]) - _APPEND_COMPILE_FLAGS_ERROR([-Wno-redundant-decls])], - [_APPEND_COMPILE_FLAGS_ERROR([-Wredundant-decls])]) - _APPEND_COMPILE_FLAGS_ERROR([-Wshadow]) - _APPEND_COMPILE_FLAGS_ERROR([-Wshorten-64-to-32]) - _APPEND_COMPILE_FLAGS_ERROR([-Wsign-compare]) - _APPEND_COMPILE_FLAGS_ERROR([-Wstrict-overflow=1]) - _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum]) - _APPEND_COMPILE_FLAGS_ERROR([-Wtrampolines]) - _APPEND_COMPILE_FLAGS_ERROR([-Wundef]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations]) - _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations]) - _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat]) -# Disabled due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55837 -# _APPEND_COMPILE_FLAGS_ERROR([-Weffc++]) - _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast]) - _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-variable]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-parameter]) - _APPEND_COMPILE_FLAGS_ERROR([-Wunused-local-typedefs]) - _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings]) - _APPEND_COMPILE_FLAGS_ERROR([-Wformat-security]) - _APPEND_COMPILE_FLAGS_ERROR([-fwrapv]) - _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt]) - _APPEND_COMPILE_FLAGS_ERROR([-pipe]) - AS_IF([test "x$MINGW" = xyes], - [], - [_APPEND_COMPILE_FLAGS_ERROR([-fPIE -pie])]) - _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess]) - _APPEND_COMPILE_FLAGS_ERROR([-Wpacked]) - _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -# GCC 4.5 removed this. -# _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code]) - - AS_IF([test "x$ax_enable_debug" = xno], - [AS_IF([test "x$ac_cv_vcs_checkout" = xyes], - [AS_IF([test "x${host_os}" != "xmingw"], - [AS_IF([test "x$ac_c_gcc_recent" = xyes], - [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2]) - #_APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector]) - #_APPEND_COMPILE_FLAGS_ERROR([-fstack-protector --param=ssp-buffer-size=4]) - _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all]) - ])])])]) - - _SET_SANITIZE_FLAGS - - AS_IF([test "x$ac_cv_warnings_as_errors" = xyes], - [AX_APPEND_COMPILE_FLAGS([-Werror])]) - AC_LANG_POP([C++]) - ]) - -# All of the heavy lifting happens in _HARDEN_LINKER_FLAGS, -# _HARDEN_CC_COMPILER_FLAGS, _HARDEN_CXX_COMPILER_FLAGS - AC_DEFUN([AX_HARDEN_COMPILER_FLAGS], - [AC_PREREQ([2.63])dnl - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AX_COMPILER_VERSION]) - AC_REQUIRE([AX_DEBUG]) - AC_REQUIRE([AX_ASSERT]) - _AX_HARDEN_SANITIZE - - AC_REQUIRE([gl_VISIBILITY]) - AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"]) - - _HARDEN_LINKER_FLAGS - _HARDEN_CC_COMPILER_FLAGS - _HARDEN_CXX_COMPILER_FLAGS - ]) - diff --git a/m4/ax_hex_version.m4 b/m4/ax_hex_version.m4 deleted file mode 100644 index 48d3a737..00000000 --- a/m4/ax_hex_version.m4 +++ /dev/null @@ -1,33 +0,0 @@ -# =========================================================================== -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_HEX_VERSION(VARIABLE_NAME, VERSION) -# -# DESCRIPTION -# -# Generate version information in HEX and STRING format. -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# -# 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 3 - -AC_DEFUN([AX_HEX_VERSION], - [AC_PREREQ([2.63])dnl - - string_version_$1=`echo $2 | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` - hex_version_$1=`echo $2 | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "0x%0.2d%0.3d%0.3d", $[]1, $[]2, $[]3}'` - - AC_SUBST([$1_VERSION_STRING],["$string_version_$1"]) - AC_SUBST([$1_VERSION_HEX],["$hex_version_$1"]) - ]) - diff --git a/m4/ax_libevent.m4 b/m4/ax_libevent.m4 deleted file mode 100644 index c576bad5..00000000 --- a/m4/ax_libevent.m4 +++ /dev/null @@ -1,128 +0,0 @@ -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_LIBEVENT([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# AX_LIBEVENT2() -# AX_LIBEVENT2_EVHTTP() -# -# DESCRIPTION -# -# libevent library -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# -# 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 5 - -AC_DEFUN([AX_LIBEVENT], - [AC_PREREQ([2.63])dnl - AC_CACHE_CHECK([test for a working libevent],[ax_cv_libevent], - [AX_SAVE_FLAGS - LIBS="-levent $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#include -#include - ]],[[ - struct event_base *tmp_event= event_init(); - event_base_free(tmp_event); - ]])], - [ax_cv_libevent=yes], - [ax_cv_libevent=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - AX_RESTORE_FLAGS - ]) - - AS_IF([test "x$ax_cv_libevent" = "xyes"], - [AC_SUBST([LIBEVENT_LIB],[-levent]) - AC_DEFINE([HAVE_LIBEVENT],[1],[Define if event_init is present in event.h.])], - [AC_DEFINE([HAVE_LIBEVENT],[0],[Define if event_init is present in event.h.])]) - - AM_CONDITIONAL(HAVE_LIBEVENT, test "x$ax_cv_libevent" = "xyes") -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: - AS_IF([test "x$ax_cv_libevent" = xyes], - [$1], - [$2]) - ]) - -AC_DEFUN([AX_LIBEVENT2], - [AC_REQUIRE([AX_LIBEVENT]) - AC_CACHE_CHECK([test for a working libevent version 2],[ax_cv_libevent2], - [AX_SAVE_FLAGS - LIBS="-levent $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#include -#include - ]],[[ - struct event_base *___event_base= event_base_new(); - event_base_free(___event_base); - ]])], - [ax_cv_libevent2=yes], - [ax_cv_libevent2=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP([C]) - AX_RESTORE_FLAGS - ]) - - AS_IF([test "x$ax_cv_libevent2" = xyes], - [AC_SUBST([LIBEVENT2_LIB],[-levent]) - AC_DEFINE([HAVE_LIBEVENT2],[1],[Define if event_init is present in event2/event.h.])], - [AC_DEFINE([HAVE_LIBEVENT2],[0],[Define if event_init is present in event2/event.h.])]) - - AM_CONDITIONAL([HAVE_LIBEVENT2], [test "x$ax_cv_libevent2" = xyes]) -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: - AS_IF([test "x$ax_cv_libevent2" = xyes], - [$1], - [$2]) - ])dnl AX_LIBEVENT2 - -# -AC_DEFUN([AX_LIBEVENT2_EVHTTP], - [AC_REQUIRE([AX_LIBEVENT2]) - AC_CACHE_CHECK([test for a working libevent2 evhttp interface], [ax_cv_libevent2_evhttp], - [AX_SAVE_FLAGS - LIBS="-levent $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#include -#include -#include - ]],[[ - struct event_base *___event_base= event_base_new(); - struct evhttp *___evhttp= evhttp_new(___event_base); - evhttp_free(___evhttp); - event_base_free(___event_base); - ]])], - [ax_cv_libevent2_evhttp=yes], - [ax_cv_libevent2_evhttp=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP([C]) - AX_RESTORE_FLAGS - ]) - - AS_IF([test "x$ax_cv_libevent2_evhttp" = "xyes"], - [AC_DEFINE([HAVE_LIBEVENT2_EVHTTP],[1],[Define if event_init is present in event2/http.h.])], - [AC_DEFINE([HAVE_LIBEVENT2_EVHTTP],[0],[Define if event_init is present in event2/http.h.])]) - - AM_CONDITIONAL([HAVE_LIBEVENT2_EVHTTP],[test "x$ax_cv_libevent2_evhttp" = xyes]) -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: - AS_IF([test "x$ax_cv_libevent2_evhttp" = xyes], - [$1], - [$2]) - ])dnl AX_LIBEVENT2_EVHTTP diff --git a/m4/ax_libuv.m4 b/m4/ax_libuv.m4 deleted file mode 100644 index 8b2ce13b..00000000 --- a/m4/ax_libuv.m4 +++ /dev/null @@ -1,53 +0,0 @@ -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_LIBUV([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# libuv library -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# Copyright (c) 2014 Andrew Hutchings -# -# 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 1 - -AC_DEFUN([AX_LIBUV], - [AC_PREREQ([2.63])dnl - AC_CACHE_CHECK([test for a working libuv],[ax_cv_libuv], - [AX_SAVE_FLAGS - LIBS="-luv $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include - ]],[[ - uv_loop_t *loop; - loop = uv_loop_new(); - ]])], - [ax_cv_libuv=yes], - [ax_cv_libuv=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - AX_RESTORE_FLAGS - ]) - - AS_IF([test "x$ax_cv_libuv" = "xyes"], - [AC_SUBST([LIBUV_LIB],[-luv]) - AC_DEFINE([HAVE_LIBUV],[1],[Define if uv_loop_new is present in uv.h.])], - [AC_DEFINE([HAVE_LIBUV],[0],[Define if uv_loop_new is present in uv.h.])]) - - AM_CONDITIONAL(HAVE_LIBUV, test "x$ax_cv_libuv" = "xyes") -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: - AS_IF([test "x$ax_cv_libuv" = xyes], - [$1], - [$2]) - ]) diff --git a/m4/ax_memcached.m4 b/m4/ax_memcached.m4 deleted file mode 100644 index c794b509..00000000 --- a/m4/ax_memcached.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -# =========================================================================== -# https://github.com/BrianAker/ddm4/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_MEMCACHED -# -# DESCRIPTION -# -# Check for memcached and list version -# -# LICENSE -# -# Copyright (C) 2013 Brian Aker -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#serial 5 - -AC_DEFUN([AX_PROG_MEMCACHED], - [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown]) - ax_memcached_success= - ax_memcached_version= - AC_MSG_CHECKING([for memcached version]) - AS_IF([test x"$MEMCACHED_BINARY" != xunknown], - [AS_IF([test -x "$MEMCACHED_BINARY"], - [ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` - AS_IF([test -n "$ax_memcached_version"], - [ax_memcached_success='ok' - AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])]) - ]) - ]) - AC_MSG_RESULT(["$ax_memcached_version"]) - - AS_IF([test -n "$ax_memcached_success"], - [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available]) - AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test]) - ], - [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available]) - MEMCACHED_BINARY= - ]) - ]) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 deleted file mode 100644 index ba46a540..00000000 --- a/m4/ax_platform.m4 +++ /dev/null @@ -1,56 +0,0 @@ -# =========================================================================== -# http:// -# =========================================================================== -# -# SYNOPSIS -# -# AX_PLATFORM -# -# DESCRIPTION -# -# Provide target and host defines. -# -# LICENSE -# -# Copyright (c) 2012-2013 Brian Aker -# -# 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 4 -# - AC_DEFUN([AX_PLATFORM], - [AC_REQUIRE([AC_CANONICAL_HOST]) - - AC_DEFINE_UNQUOTED([HOST_VENDOR],["$host_vendor"],[Vendor of Build System]) - AC_DEFINE_UNQUOTED([HOST_OS],["$host_os"], [OS of Build System]) - AC_DEFINE_UNQUOTED([HOST_CPU],["$host_cpu"], [CPU of Build System]) - - AS_CASE([$host_os], - [*mingw*], - [HOST_WINDOWS="true" - AC_DEFINE([HOST_OS_WINDOWS], [1], [Whether we are building for Windows]) - AC_DEFINE([EAI_SYSTEM], [11], [Another magical number]) - AH_BOTTOM([ -#ifndef HAVE_SYS_SOCKET_H -# define SHUT_RD SD_RECEIVE -# define SHUT_WR SD_SEND -# define SHUT_RDWR SD_BOTH -#endif - ])], - [*freebsd*],[AC_DEFINE([HOST_OS_FREEBSD],[1],[Whether we are building for FreeBSD]) - AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers])], - [*solaris*],[AC_DEFINE([HOST_OS_SOLARIS],[1],[Whether we are building for Solaris])], - [*darwin*], - [HOST_OSX="true"], - [*linux*], - [HOST_LINUX="true" - AC_DEFINE([HOST_OS_LINUX],[1],[Whether we build for Linux])]) - - AM_CONDITIONAL([BUILD_WIN32],[test "x${HOST_WINDOWS}" = "xtrue"]) - AM_CONDITIONAL([HOST_OSX],[test "x${HOST_OSX}" = "xtrue"]) - AM_CONDITIONAL([HOST_LINUX],[test "x${HOST_LINUX}" = "xtrue"]) - AM_CONDITIONAL([HOST_FREEBSD],[test "x${HOST_OS_FREEBSD}" = "xtrue"]) - ]) diff --git a/m4/ax_print_to_file.m4 b/m4/ax_print_to_file.m4 deleted file mode 100644 index 8aa71120..00000000 --- a/m4/ax_print_to_file.m4 +++ /dev/null @@ -1,27 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_print_to_file.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PRINT_TO_FILE([FILE],[DATA]) -# -# DESCRIPTION -# -# Writes the specified data to the specified file. -# -# LICENSE -# -# Copyright (c) 2008 Tom Howard -# -# 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 8 - -AC_DEFUN([AX_PRINT_TO_FILE],[ -AC_REQUIRE([AX_FILE_ESCAPES]) -printf "$2" > "$1" -]) diff --git a/m4/ax_printf_strerror.m4 b/m4/ax_printf_strerror.m4 deleted file mode 100644 index 1dc39f79..00000000 --- a/m4/ax_printf_strerror.m4 +++ /dev/null @@ -1,67 +0,0 @@ -# =========================================================================== -# https://github.com/BrianAker/ddm4/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_PRINTF_STRERROR() -# -# DESCRIPTION -# -# Check to see if printf() has %m implemented (i.e. can handle strerror -# internally) -# -# LICENSE -# -# Copyright (C) 2013 Brian Aker All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#serial 2 - -AC_DEFUN([AX_PRINTF_STRERROR], - [AC_PREREQ([2.63])dnl - AC_CACHE_CHECK([printf() has strerror option], - [ax_cv_have_printf_strerror], - [AC_LANG_PUSH([C++]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include - #include - #include - ]], - [[char buffer[1024]; errno=0; snprintf(buffer, sizeof(buffer), "%m"); if (strcmp("Success", buffer) !=0 ) return EXIT_FAILURE;]])], - [ax_cv_have_printf_strerror=yes], - [ax_cv_have_printf_strerror=no], - [ax_cv_have_printf_strerror=no]) - AC_LANG_POP]) - AC_MSG_RESULT(["$ax_cv_have_printf_strerror"]) - AS_IF([test "x$ax_cv_have_printf_strerror" = xyes], - [AC_DEFINE([HAVE_PRINTF_STRERROR],[1],[define if printf supports directly print errno])]) - ]) diff --git a/m4/ax_prog_sphinx_build.m4 b/m4/ax_prog_sphinx_build.m4 deleted file mode 100644 index ff64650b..00000000 --- a/m4/ax_prog_sphinx_build.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# =========================================================================== -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_SPHINX_BUILD([ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) -# -# DESCRIPTION -# -# Look for sphinx-build and make sure it is a recent version of it. -# -# LICENSE -# -# Copyright (c) 2012-2013 Brian Aker -# -# 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 - -AC_DEFUN([AX_PROG_SPHINX_BUILD], - [AX_WITH_PROG([SPHINXBUILD],[sphinx-build],[:]) - AS_IF([test x"SPHINXBUILD" = x":"], - [SPHINXBUILD=], - [AS_IF([test -x "$SPHINXBUILD"], - [AC_MSG_CHECKING([Checking to see if $SPHINXBUILD is recent]) - junk=`$SPHINXBUILD --version &> version_file` - AS_IF([test $? -eq 0], - [ax_sphinx_build_version=`head -1 version_file`], - [junk=`$SPHINXBUILD &> version_file` - ax_sphinx_build_version=`head -1 version_file` - rm version_file - $SPHINXBUILD -Q -C -b man -d conftest.d . . >/dev/null 2>&1 - AS_IF([test $? -eq 0], ,[SPHINXBUILD=]) - rm -rf conftest.d ]) - ]) - rm -f version_file - AC_MSG_RESULT(["$ax_sphinx_build_version"]) - ]) - - AS_IF([test -n "${SPHINXBUILD}"], - [AC_SUBST([SPHINXBUILD]) - ifelse([$1], , :, [$1])], - [ifelse([$2], , :, [$2])]) - ]) diff --git a/m4/ax_prog_valgrind.m4 b/m4/ax_prog_valgrind.m4 deleted file mode 100644 index af12dc36..00000000 --- a/m4/ax_prog_valgrind.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# =========================================================================== -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_VALGRIND([tool],[options],[ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) -# -# DESCRIPTION -# -# Look for valgrind and make sure it is a recent version of it. -# -# LICENSE -# -# Copyright (c) 2012-2013 Brian Aker -# -# 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 1 - -AC_DEFUN([AX_PROG_VALGRIND], - [AX_WITH_PROG([VALGRIND],[valgrind],[:]) - AS_IF([test x"VALGRIND" = x":"], - [VALGRIND=], - [AS_IF([test -x "$VALGRIND"], - [AC_MSG_CHECKING([Checking to see if $VALGRIND is recent]) - junk=`$VALGRIND --version &> version_file` - ax_valgrind_version=`head -1 version_file` - rm version_file - AC_MSG_RESULT([$VALGRIND is version "$ax_valgrind_version"]) - ]) - ]) - - AS_IF([test -n "${VALGRIND}"], - [AC_SUBST([VALGRIND]) - LIBTOOL_COMMAND="\${LIBTOOL} --mode=execute" - AC_SUBST([LIBTOOL_COMMAND]) - AX_ADD_AM_MACRO([[TESTS_ENVIRONMENT=\"\${LIBTOOL_COMMAND} \${VALGRIND} --tool=$1 $2\"]]) - ifelse([$3], , :, [$3])], - [ifelse([$4], , :, [$4])]) - ]) diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 deleted file mode 100644 index 5fbf9fe0..00000000 --- a/m4/ax_pthread.m4 +++ /dev/null @@ -1,485 +0,0 @@ -# =========================================================================== -# https://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 24 - -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 diff --git a/m4/ax_pthread_timedjoin_np.m4 b/m4/ax_pthread_timedjoin_np.m4 deleted file mode 100644 index 39de8fa8..00000000 --- a/m4/ax_pthread_timedjoin_np.m4 +++ /dev/null @@ -1,50 +0,0 @@ -# =========================================================================== -# http:// -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD_TIMEDJOIN_NP() -# -# DESCRIPTION -# -# Check for pthread_timedjoin_np support. -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# -# 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 - -AC_DEFUN([AX_PTHREAD_TIMEDJOIN_NP], - [AC_PREREQ([2.63])dnl - AC_REQUIRE([AX_PTHREAD]) - AC_CACHE_CHECK([check for pthread_timedjoin_np], [ax_cv_pthread_timedjoin_np], - [AX_SAVE_FLAGS - CFLAGS="$PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS" - AC_LANG_PUSH([C]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [ -#include -#include - ],[ - pthread_t thread; - pthread_timedjoin_np(thread, NULL, NULL); - ])], - [ax_cv_pthread_timedjoin_np=yes],[]) - - AC_LANG_POP - AX_RESTORE_FLAGS - ]) - - AS_IF([test "$ax_cv_pthread_timedjoin_np" = yes], - [AC_DEFINE(HAVE_PTHREAD_TIMEDJOIN_NP,[1],[Define if pthread_timedjoin_np is present in pthread.h.])], - [AC_DEFINE(HAVE_PTHREAD_TIMEDJOIN_NP,[0],[Define if pthread_timedjoin_np is present in pthread.h.])]) - ]) diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 deleted file mode 100644 index 17c3eab7..00000000 --- a/m4/ax_require_defined.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger -# -# 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 2 - -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED diff --git a/m4/ax_restore_flags.m4 b/m4/ax_restore_flags.m4 deleted file mode 100644 index 8f2adf27..00000000 --- a/m4/ax_restore_flags.m4 +++ /dev/null @@ -1,52 +0,0 @@ -# =========================================================================== -# https://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 7 - -# 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_sasl.m4 b/m4/ax_sasl.m4 deleted file mode 100644 index 44bb65e3..00000000 --- a/m4/ax_sasl.m4 +++ /dev/null @@ -1,51 +0,0 @@ -# =========================================================================== -# http://www.tangent.org/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_SASL -# AX_SASL_CHECK -# -# DESCRIPTION -# -# Check to see if libsasl is requested and available. -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker -# -# 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 3 - -AC_DEFUN([AX_SASL_OPTION], - [AC_REQUIRE([AX_SASL_CHECK]) - AC_ARG_ENABLE([sasl], - [AS_HELP_STRING([--disable-sasl], [Build with sasl support @<:@default=on@:>@])], - [ac_enable_sasl="$enableval"], - [ac_enable_sasl=yes]) - - AS_IF([test "x${ac_enable_sasl}" = xyes],[ - AC_MSG_CHECKING([checking to see if enabling sasl]) - AS_IF([test "x${ax_sasl_check}" = xyes],[ - ax_sasl_option=yes],[ - AC_MSG_WARN([request to add sasl support failed, please see config.log]) - ac_enable_sasl=no - ax_sasl_option=no]) - AC_MSG_RESULT(["$ax_sasl_option"])],[ - ax_sasl_option=no]) - AM_CONDITIONAL([HAVE_SASL],[test "x${ax_sasl_option}" = xyes]) - ]) - -AC_DEFUN([AX_SASL_CHECK],[ - AX_CHECK_LIBRARY([LIBSASL],[sasl/sasl.h],[sasl2],[ - ax_sasl_check=yes - AC_SUBST([SASL_LIB],[[-lsasl2]])],[ - ax_sasl_check=no]) - AC_MSG_CHECKING([checking to see if sasl works]) - AC_MSG_RESULT(["$ax_sasl_check"]) - ]) diff --git a/m4/ax_save_flags.m4 b/m4/ax_save_flags.m4 deleted file mode 100644 index 5bc7c6c7..00000000 --- a/m4/ax_save_flags.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# =========================================================================== -# https://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 8 - -# 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/m4/ax_switch_flags.m4 b/m4/ax_switch_flags.m4 deleted file mode 100644 index 2939bddc..00000000 --- a/m4/ax_switch_flags.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_switch_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_SWITCH_FLAGS(newnamespace,[oldnamespace]) -# -# DESCRIPTION -# -# Switch common compilation flags from temporary variables between two -# compilation namespace. -# -# 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(beginprogram) -# CPPFLAGS="-Imypackagespath ${CPPFLAGS}" -# AX_SWITCH_FLAGS(mypackage,beginprogram) -# -# LICENSE -# -# Copyright (c) 2009 Filippo Giunchedi -# 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 2 - -AC_DEFUN([AX_SWITCH_FLAGS], [ - AC_REQUIRE(AX_SAVE_FLAGS) - AC_REQUIRE(AX_RESTORE_FLAGS) - AS_IF([test "X$1" = "X"], AC_MSG_ERROR(newnamespace is empty)] - AX_SAVE_FLAGS($1[]) - AX_RESTORE_FLAGS($2[]) -]) diff --git a/m4/ax_uuid.m4 b/m4/ax_uuid.m4 deleted file mode 100644 index 293fdfc5..00000000 --- a/m4/ax_uuid.m4 +++ /dev/null @@ -1,124 +0,0 @@ -# vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -# =========================================================================== -# https://github.com/BrianAker/ddm4 -# =========================================================================== -# -# SYNOPSIS -# -# AX_UUID() -# AX_UUID_GENERATE_TIME() -# AX_UUID_GENERATE_TIME_SAFE() -# -# DESCRIPTION -# -# Check for uuid, uuid_generate_time, and uuid_generate_time_safe support. -# -# LICENSE -# -# Copyright (c) 2012-2013 Brian Aker -# -# 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 - -AC_DEFUN([AX_UUID], - [AC_PREREQ([2.63])dnl - AC_CHECK_HEADER([uuid/uuid.h],[ - - AC_CACHE_CHECK([check to see if -luuid is needed], [ax_cv_libuuid_is_required], - [AC_LANG_PUSH([C]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include ], [ - uuid_t out; - uuid_generate(out); - ])], - [ax_cv_libuuid_is_required=no], - [ax_cv_libuuid_is_required=yes], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - ]) - - AS_IF([test "$ax_cv_libuuid_is_required" = yes], - [AC_CACHE_CHECK([check to see if -luuid is needed], [ax_cv_libuuid_works], - [AX_SAVE_FLAGS - LIBS="-luuid $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include ], [ - uuid_t out; - uuid_generate(out); - ])], - [ax_cv_libuuid_works=yes], - [ax_cv_libuuid_works=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - AX_RESTORE_FLAGS]) - ]) - - AS_IF([test "$ax_cv_libuuid_is_required" = yes], - [AS_IF([test "$ax_cv_libuuid_works" = yes],[ax_libuuid=yes])], - [ax_libuuid=yes]) - ],[ax_libuuid=no]) - - AS_IF([test "x$ax_libuuid" = xyes], - [AC_DEFINE([HAVE_UUID_UUID_H],[1],[Have uuid/uuid.h]) - AS_IF([test "x$ax_cv_libuuid_is_required" = xyes],[ LIBUUID_LIB='-luuid' ])], - [AC_DEFINE([HAVE_UUID_UUID_H],[0],[Have uuid/uuid.h]) - ]) - - AC_SUBST([LIBUUID_LIB]) - AM_CONDITIONAL([HAVE_LIBUUID],[test "x$ax_libuuid" = xyes]) - ]) - - AC_DEFUN([AX_UUID_GENERATE_TIME], - [AC_PREREQ([2.63])dnl - AC_REQUIRE([AX_UUID])dnl - AC_CACHE_CHECK([for uuid_generate_time], - [ax_cv_uuid_generate_time], - [AX_SAVE_FLAGS - LIBS="$LIBUUID_LIB $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ - AC_LANG_PROGRAM([#include ],[ - uuid_t out; - uuid_generate_time(out); - ])], - [ax_cv_uuid_generate_time=yes], - [ax_cv_uuid_generate_time=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - AX_RESTORE_FLAGS - ]) - - AS_IF([test "$ax_cv_uuid_generate_time" = yes], - [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[1],[Define if uuid_generate_time is present in uuid/uuid.h.])], - [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[0],[Define if uuid_generate_time is present in uuid/uuid.h.])]) - ]) - - AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE], - [AC_PREREQ([2.63])dnl - AC_REQUIRE([AX_UUID])dnl - AC_CACHE_CHECK([for uuid_generate_time_safe], - [ax_cv_uuid_generate_time_safe], - [AX_SAVE_FLAGS - LIBS="$LIBUUID_LIB $LIBS" - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ - AC_LANG_PROGRAM([#include ],[ - uuid_t out; - uuid_generate_time_safe(out); - ])], - [ax_cv_uuid_generate_time_safe=yes], - [ax_cv_uuid_generate_time_safe=no], - [AC_MSG_WARN([test program execution failed])]) - AC_LANG_POP - AX_RESTORE_FLAGS - ]) - - AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes], - [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[1],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])], - [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[0],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])]) - ]) diff --git a/m4/ax_vcs_checkout.m4 b/m4/ax_vcs_checkout.m4 deleted file mode 100644 index 8047b65e..00000000 --- a/m4/ax_vcs_checkout.m4 +++ /dev/null @@ -1,75 +0,0 @@ -# =========================================================================== -# http:// -# =========================================================================== -# -# SYNOPSIS -# -# AX_VCS_CHECKOUT -# -# DESCRIPTION -# -# Discover whether or not we are operating with a tree which -# has been checked out of a version control system. -# -# -# LICENSE -# -# Copyright (C) 2012 Brian Aker -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#serial 6 - -AC_DEFUN([AX_VCS_SYSTEM], - [AC_PREREQ([2.63])dnl - AC_CACHE_CHECK([for vcs system], [ac_cv_vcs_system], - [ac_cv_vcs_system="none" - AS_IF([test -d ".bzr"],[ac_cv_vcs_system="bazaar"]) - AS_IF([test -d ".svn"],[ac_cv_vcs_system="svn"]) - AS_IF([test -d ".hg"],[ac_cv_vcs_system="mercurial"]) - AS_IF([test -d ".git"],[ac_cv_vcs_system="git"]) - ]) - AC_DEFINE_UNQUOTED([VCS_SYSTEM],["$ac_cv_vcs_system"],[VCS system]) - ]) - -AC_DEFUN([AX_VCS_CHECKOUT], - [AC_PREREQ([2.63])dnl - AC_REQUIRE([AX_VCS_SYSTEM]) - AC_CACHE_CHECK([for vcs checkout],[ac_cv_vcs_checkout], - [AS_IF([test "x$ac_cv_vcs_system" != "xnone"], - [ac_cv_vcs_checkout=yes], - [ac_cv_vcs_checkout=no]) - ]) - - AM_CONDITIONAL([IS_VCS_CHECKOUT],[test "x$ac_cv_vcs_checkout" = "xyes"]) - AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"], - [AC_DEFINE([VCS_CHECKOUT],[1],[Define if the code was built from VCS.])], - [AC_DEFINE([VCS_CHECKOUT],[0],[Define if the code was built from VCS.])]) - ]) diff --git a/m4/ax_with_prog.m4 b/m4/ax_with_prog.m4 deleted file mode 100644 index b3a881c0..00000000 --- a/m4/ax_with_prog.m4 +++ /dev/null @@ -1,70 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_with_prog.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_WITH_PROG([VARIABLE],[program],[VALUE-IF-NOT-FOUND],[PATH]) -# -# DESCRIPTION -# -# Locates an installed program binary, placing the result in the precious -# variable VARIABLE. Accepts a present VARIABLE, then --with-program, and -# failing that searches for program in the given path (which defaults to -# the system path). If program is found, VARIABLE is set to the full path -# of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND -# if provided, unchanged otherwise. -# -# A typical example could be the following one: -# -# AX_WITH_PROG(PERL,perl) -# -# NOTE: This macro is based upon the original AX_WITH_PYTHON macro from -# Dustin J. Mitchell . -# -# LICENSE -# -# Copyright (c) 2008 Francesco Salvestrini -# Copyright (c) 2008 Dustin J. Mitchell -# -# 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 17 - -AC_DEFUN([AX_WITH_PROG],[ - AC_PREREQ([2.61]) - - pushdef([VARIABLE],$1) - pushdef([EXECUTABLE],$2) - pushdef([VALUE_IF_NOT_FOUND],$3) - pushdef([PATH_PROG],$4) - - AC_ARG_VAR(VARIABLE,Absolute path to EXECUTABLE executable) - - AS_IF(test -z "$VARIABLE",[ - AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) - AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[PATH]]]],absolute path to EXECUTABLE executable), [ - AS_IF([test "$withval" != yes && test "$withval" != no],[ - VARIABLE="$withval" - AC_MSG_RESULT($VARIABLE) - ],[ - VARIABLE="" - AC_MSG_RESULT([no]) - AS_IF([test "$withval" != no], [ - AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) - ]) - ]) - ],[ - AC_MSG_RESULT([no]) - AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) - ]) - ]) - - popdef([PATH_PROG]) - popdef([VALUE_IF_NOT_FOUND]) - popdef([EXECUTABLE]) - popdef([VARIABLE]) -]) diff --git a/m4/byteorder.m4 b/m4/byteorder.m4 deleted file mode 100644 index 7366822b..00000000 --- a/m4/byteorder.m4 +++ /dev/null @@ -1,19 +0,0 @@ -AC_DEFUN([DETECT_BYTEORDER], - [ - AC_REQUIRE([AC_C_BIGENDIAN]) - AC_LANG_PUSH([C++]) - AC_CACHE_CHECK([for htonll], [ac_cv_have_htonll], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [#include -#include -#include - ], [ return htonll(0) ])], - [ ac_cv_have_htonll=yes ], - [ ac_cv_have_htonll=no ]) - ]) - AC_LANG_POP() - AS_IF([test "x$ac_cv_have_htonll" = "xyes"],[ - AC_DEFINE([HAVE_HTONLL], [1], [Have ntohll])]) - - AM_CONDITIONAL([BUILD_BYTEORDER],[test "x$ac_cv_have_htonll" = "xno"]) - ]) diff --git a/m4/config_extra.m4 b/m4/config_extra.m4 deleted file mode 100644 index 2a8a211c..00000000 --- a/m4/config_extra.m4 +++ /dev/null @@ -1,77 +0,0 @@ -# SYNOPSIS -# -# CONFIG_EXTRA -# -# DESCRIPTION -# -# Adds required extras to config.h -# -# LICENSE -# -# Copyright (C) 2014 Andrew Hutchings -# Based on bottom.m4 from libdrizzle -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# -# * The names of its contributors may not be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#serial 1 - -AC_DEFUN([CONFIG_EXTRA], [ - -AH_TOP([ -#pragma once - -/* _SYS_FEATURE_TESTS_H is Solaris, _FEATURES_H is GCC */ -#if defined( _SYS_FEATURE_TESTS_H) || defined(_FEATURES_H) -# error "You should include config.h as your first include file" -#endif - -]) - -AH_BOTTOM([ - -#ifndef __STDC_FORMAT_MACROS -# define __STDC_FORMAT_MACROS -#endif - -#if defined(__cplusplus) -# include CINTTYPES_H -#else -# include -#endif - -#if !defined(HAVE_ULONG) && !defined(__USE_MISC) -# define HAVE_ULONG 1 -typedef unsigned long int ulong; -#endif - -]) - -])dnl CONFIG_EXTRA diff --git a/m4/deprecated.m4 b/m4/deprecated.m4 deleted file mode 100644 index 11f80bd6..00000000 --- a/m4/deprecated.m4 +++ /dev/null @@ -1,17 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: deprecated -dnl --------------------------------------------------------------------------- -AC_DEFUN([ENABLE_DEPRECATED],[ - AC_ARG_ENABLE([deprecated], - [AS_HELP_STRING([--enable-deprecated], - [Enable deprecated interface @<:@default=off@:>@])], - [ac_enable_deprecated="$enableval"], - [ac_enable_deprecated="no"]) - - AS_IF([test "$ac_enable_deprecated" = "yes"], - [DEPRECATED="#define MEMCACHED_ENABLE_DEPRECATED 1"]) - AC_SUBST([DEPRECATED]) -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: deprecated -dnl --------------------------------------------------------------------------- diff --git a/m4/fnv.m4 b/m4/fnv.m4 deleted file mode 100644 index 00455857..00000000 --- a/m4/fnv.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: ENABLE_FNV64_HASH -dnl --------------------------------------------------------------------------- -AC_DEFUN([ENABLE_FNV64_HASH], - [AC_ARG_ENABLE([fnv64_hash], - [AS_HELP_STRING([--disable-fnv64_hash], - [build with support for fnv64 hashing. @<:@default=on@:>@])], - [ac_cv_enable_fnv64_hash=no], - [ac_cv_enable_fnv64_hash=yes]) - - AS_IF([test "$ac_cv_enable_fnv64_hash" = "yes"], - [AC_DEFINE([HAVE_FNV64_HASH], [1], [Enables fnv64 hashing support])]) -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: ENABLE_FNV64_HASH -dnl --------------------------------------------------------------------------- diff --git a/m4/gearmand.m4 b/m4/gearmand.m4 deleted file mode 100644 index 8b1659dc..00000000 --- a/m4/gearmand.m4 +++ /dev/null @@ -1,9 +0,0 @@ -# serial 1 -AC_DEFUN([CHECK_FOR_GEARMAND], - [AX_WITH_PROG([GEARMAND_BINARY],[gearmand]) - AS_IF([test -f "$ac_cv_path_GEARMAND_BINARY"], - [AC_DEFINE([HAVE_GEARMAND_BINARY],[1],[If Gearmand binary is available]) - AC_DEFINE_UNQUOTED([GEARMAND_BINARY], "$ac_cv_path_GEARMAND_BINARY", [Name of the gearmand binary used in make test])], - [AC_DEFINE([HAVE_GEARMAND_BINARY],[0],[If Gearmand binary is available]) - AC_DEFINE([GEARMAND_BINARY],[0],[Name of the gearmand binary used in make test])]) - ]) diff --git a/m4/have_cinttypes.m4 b/m4/have_cinttypes.m4 deleted file mode 100644 index 192d52ec..00000000 --- a/m4/have_cinttypes.m4 +++ /dev/null @@ -1,94 +0,0 @@ -# =========================================================================== -# http://tangent.org/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_CINTTYPES() -# -# DESCRIPTION -# -# Example: -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker` -# -# 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 4 - -AC_DEFUN([AX_CXX_CINTTYPES], [ - AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PROG_CXXCPP]) - AC_REQUIRE([AX_CXX_CSTDINT]) - - AC_CACHE_CHECK([for location of cinttypes], [ac_cv_cxx_cinttypes], [ - AX_SAVE_FLAGS - CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}" - AC_LANG_PUSH([C++]) - - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - uint32_t foo= UINT32_C(1); - ])], - [ac_cxx_cinttypes_cinttypes=""]) - -# Look for tr1/cinttypes - AS_IF([test -z "$ac_cxx_cinttypes_cinttypes"],[ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - uint32_t foo= UINT32_C(1); - ])], - [ac_cxx_cinttypes_tr1_cinttypes=""]) - -# Look for boost/cinttypes.hpp - AS_IF([test -z "$ac_cxx_cinttypes_tr1_cinttypes"],[ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - uint32_t foo= UINT32_C(1); - ])], - [ac_cxx_cinttypes_boost_cinttypes_hpp=""]) - ]) - ]) - - AC_LANG_POP - AX_RESTORE_FLAGS - - AS_IF([test -n "$ac_cxx_cinttypes_cinttypes"], [ac_cv_cxx_cinttypes=$ac_cxx_cinttypes_cinttypes], - [test -n "$ac_cxx_cinttypes_tr1_cinttypes"], [ac_cv_cxx_cinttypes=$ac_cxx_cinttypes_tr1_cinttypes], - [test -n "$ac_cxx_cinttypes_boost_cinttypes_hpp"], [ac_cv_cxx_cinttypes=$ac_cxx_cinttypes_boost_cinttypes_hpp]) - ]) - - AS_IF([ test -n "$ac_cv_cxx_cinttypes"], [:],[ - ac_cv_cxx_cinttypes="" - AC_MSG_WARN([Could not find a cinttypes header.]) - ]) - - AC_DEFINE([__STDC_LIMIT_MACROS],[1],[Use STDC Limit Macros in C++]) - AC_DEFINE_UNQUOTED([CINTTYPES_H],[$ac_cv_cxx_cinttypes],[the location of ]) - ]) diff --git a/m4/have_cstdint.m4 b/m4/have_cstdint.m4 deleted file mode 100644 index 43e39bd8..00000000 --- a/m4/have_cstdint.m4 +++ /dev/null @@ -1,88 +0,0 @@ -# =========================================================================== -# http://tangent.org/ -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_CSTDINT() -# -# DESCRIPTION -# -# Example: -# -# LICENSE -# -# Copyright (c) 2012 Brian Aker` -# -# 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 4 - - -AC_DEFUN([AX_CXX_CSTDINT], [ - AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PROG_CXXCPP]) - - AC_CACHE_CHECK([for location of cstdint], [ac_cv_cxx_cstdint], [ - AC_LANG_PUSH([C++]) - AX_SAVE_FLAGS - CXXFLAGS="${CXX_STANDARD} ${CXXFLAGS}" - - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - uint32_t t - ])], - [ac_cxx_cstdint_cstdint=""]) - - AS_IF([test -z "$ac_cxx_cstdint_cstdint"],[ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ uint32_t t ])], - [ac_cxx_cstdint_tr1_cstdint=""]) - - AS_IF([test -z "$ac_cxx_cstdint_tr1_cstdint"],[ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([#include ], [ uint32_t t ])], - [ac_cxx_cstdint_boost_cstdint_hpp=""]) - ]) - ]) - - AC_LANG_POP - AX_RESTORE_FLAGS - - AS_IF([test -n "$ac_cxx_cstdint_cstdint"], [ac_cv_cxx_cstdint=$ac_cxx_cstdint_cstdint], - [test -n "$ac_cxx_cstdint_tr1_cstdint"], [ac_cv_cxx_cstdint=$ac_cxx_cstdint_tr1_cstdint], - [test -n "$ac_cxx_cstdint_boost_cstdint_hpp"], [ac_cv_cxx_cstdint=$ac_cxx_cstdint_boost_cstdint_hpp]) - ]) - - AS_IF([test -n "$ac_cv_cxx_cstdint"], [:], [ - ac_cv_cxx_cstdint="" - AC_MSG_WARN([Could not find a cstdint header.]) - ]) - -AC_DEFINE_UNQUOTED([CSTDINT_H],[$ac_cv_cxx_cstdint], [the location of ]) - - ]) diff --git a/m4/have_libpq.m4 b/m4/have_libpq.m4 deleted file mode 100644 index 5617e30c..00000000 --- a/m4/have_libpq.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl Copyright (C) 2011 Brian Aker (brian@tangent.org) - -AC_DEFUN([AX_HAVE_LIBPQ],[ - AC_ARG_ENABLE([libpq], - [AS_HELP_STRING([--disable-libpq], - [Build with libpq, ie Postgres, support @<:@default=on@:>@])], - [ac_cv_libpq="$enableval"], - [ac_cv_libpq="yes"]) - - AC_REQUIRE([AX_LIB_POSTGRESQL]) - - AS_IF([test "x$ac_cv_libpq" = "xyes" -a "x$found_postgresql" = "xyes"], - [ - AC_DEFINE([HAVE_LIBPQ], [ 1 ], [Enable libpq support]) - ], - [ - AC_DEFINE([HAVE_LIBPQ], [ 0 ], [Enable libpq support]) - # if --enable-libpq, but no Postgres, force --disable-libpq - ac_cv_libpq="no" - ]) - - AM_CONDITIONAL(HAVE_LIBPQ, [test "x$ac_cv_libpq" = "xyes"]) -]) diff --git a/m4/hiredis.m4 b/m4/hiredis.m4 deleted file mode 100644 index 6db09278..00000000 --- a/m4/hiredis.m4 +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2011 Brian Aker (brian@tangent.org) -# -# serial 2 - -AC_DEFUN([_SEARCH_HIREDIS], - [AC_REQUIRE([AX_CHECK_LIBRARY]) - - AS_IF([test "x$ac_enable_hiredis" = "xyes"], - [hiredis_header="hiredis/hiredis.h"], - [hiredis_header="does_not_exist"]) - - AX_CHECK_LIBRARY([HIREDIS],[$hiredis_header],[hiredis],, - [AC_DEFINE([HAVE_HIREDIS],[0],[Define to 1 if HIREDIS is found])]) - - AS_IF([test "x$ax_cv_have_HIREDIS" = xno],[ac_enable_hiredis="no"]) - ]) - - AC_DEFUN([AX_ENABLE_LIBHIREDIS], - [AC_ARG_ENABLE([hiredis], - [AS_HELP_STRING([--disable-hiredis], - [Build with hiredis support @<:@default=on@:>@])], - [ac_enable_hiredis="$enableval"], - [ac_enable_hiredis="yes"]) - - _SEARCH_HIREDIS - ]) diff --git a/m4/hsieh.m4 b/m4/hsieh.m4 deleted file mode 100644 index c4f3df04..00000000 --- a/m4/hsieh.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: ENABLE_HSIEH_HASH -dnl --------------------------------------------------------------------------- -AC_DEFUN([ENABLE_HSIEH_HASH], - [AC_ARG_ENABLE([hsieh_hash], - [AS_HELP_STRING([--enable-hsieh_hash], - [build with support for hsieh hashing. @<:@default=off@:>@])], - [ac_cv_enable_hsieh_hash=yes], - [ac_cv_enable_hsieh_hash=no]) - - AS_IF([test "$ac_cv_enable_hsieh_hash" = "yes"], - [AC_DEFINE([HAVE_HSIEH_HASH], [1], [Enables hsieh hashing support])]) - - AM_CONDITIONAL([INCLUDE_HSIEH_SRC], [test "$ac_cv_enable_hsieh_hash" = "yes"]) -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: ENABLE_HSIEH_HASH -dnl --------------------------------------------------------------------------- diff --git a/m4/include.am b/m4/include.am deleted file mode 100644 index 3ad36861..00000000 --- a/m4/include.am +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - - -dist_aclocal_DATA+= m4/ax_libmemcached.m4 diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 deleted file mode 100644 index 96c4e2c3..00000000 --- a/m4/lib-ld.m4 +++ /dev/null @@ -1,110 +0,0 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 deleted file mode 100644 index c30c38aa..00000000 --- a/m4/lib-link.m4 +++ /dev/null @@ -1,767 +0,0 @@ -# lib-link.m4 serial 18 (gettext-0.18) -dnl Copyright (C) 2001-2009 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ([2.54]) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - popdef([NAME]) - popdef([Name]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [system]) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2], [$5]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - LIB[]NAME[]_PREFIX= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - popdef([NAME]) - popdef([Name]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl acl_libext, -dnl acl_shlibext, -dnl acl_hardcode_libdir_flag_spec, -dnl acl_hardcode_libdir_separator, -dnl acl_hardcode_direct, -dnl acl_hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE([rpath], - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_FROMPACKAGE(name, package) -dnl declares that libname comes from the given package. The configure file -dnl will then not have a --with-libname-prefix option but a -dnl --with-package-prefix option. Several libraries can come from the same -dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar -dnl macro call that searches for libname. -AC_DEFUN([AC_LIB_FROMPACKAGE], -[ - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - define([acl_frompackage_]NAME, [$2]) - popdef([NAME]) - pushdef([PACK],[$2]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) - popdef([PACKUP]) - popdef([PACK]) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies, system]) searches for -dnl libname and the libraries corresponding to explicit and implicit -dnl dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -dnl If system==system, -isystem is used instead of -I -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) - dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - if test "x$GCC" = "xyes" -a "x$3" = "xsystem" - then - i_system="-isystem " - else - i_system="-I" - fi - - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_ARG_WITH(P_A_C_K[-prefix], -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - LIB[]NAME[]_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - dnl The same code as in the loop below: - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$acl_hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X${i_system}$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }${i_system}$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi - popdef([P_A_C_K]) - popdef([PACKLIBS]) - popdef([PACKUP]) - popdef([PACK]) - popdef([NAME]) -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 deleted file mode 100644 index 1601ceae..00000000 --- a/m4/lib-prefix.m4 +++ /dev/null @@ -1,224 +0,0 @@ -# lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates -dnl - a variable acl_libdirstem, containing the basename of the libdir, either -dnl "lib" or "lib64" or "lib/64", -dnl - a variable acl_libdirstem2, as a secondary possible value for -dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or -dnl "lib/amd64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. - dnl On glibc systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine - dnl the compiler's default mode by looking at the compiler's library search - dnl path. If at least one of its elements ends in /lib64 or points to a - dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. - dnl Otherwise we use the default, namely "lib". - dnl On Solaris systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or - dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. - AC_REQUIRE([AC_CANONICAL_HOST]) - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment - dnl . - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the - dnl symlink is missing, so we set acl_libdirstem2 too. - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_EGREP_CPP([sixtyfour bits], [ -#ifdef _LP64 -sixtyfour bits -#endif - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) - ]) - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -]) diff --git a/m4/libgearman.m4 b/m4/libgearman.m4 deleted file mode 100644 index 3e3c96d3..00000000 --- a/m4/libgearman.m4 +++ /dev/null @@ -1,5 +0,0 @@ -# serial 2 -AC_DEFUN([CHECK_FOR_LIBGEARMAND], - [AX_CHECK_LIBRARY([LIBGEARMAN],[libgearman/gearman.h],[gearman],, - [AC_DEFINE([HAVE_LIBGEARMAN],[0],[Define to 1 to compile in libgearman support])]) - ]) diff --git a/m4/memaslap.m4 b/m4/memaslap.m4 deleted file mode 100644 index 6c9a9321..00000000 --- a/m4/memaslap.m4 +++ /dev/null @@ -1,9 +0,0 @@ -AC_DEFUN([ENABLE_MEMASLAP], - [AC_ARG_ENABLE([memaslap], - [AS_HELP_STRING([--enable-memaslap], - [build with memaslap tool. @<:@default=off@:>@])], - [ac_cv_enable_memaslap=yes], - [ac_cv_enable_memaslap=no]) - - AM_CONDITIONAL([BUILD_MEMASLAP], [test "$ac_cv_enable_memaslap" = "yes"]) -]) diff --git a/m4/murmur.m4 b/m4/murmur.m4 deleted file mode 100644 index ecdcf3a5..00000000 --- a/m4/murmur.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: ENABLE_MURMUR_HASH -dnl --------------------------------------------------------------------------- -AC_DEFUN([ENABLE_MURMUR_HASH], - [AC_ARG_ENABLE([murmur_hash], - [AS_HELP_STRING([--disable-murmur_hash], - [build with support for murmur hashing. @<:@default=on@:>@])], - [ac_cv_enable_murmur_hash=no], - [ac_cv_enable_murmur_hash=yes]) - - AS_IF([test "$ac_cv_enable_murmur_hash" = "yes"], - [AC_DEFINE([HAVE_MURMUR_HASH], [1], [Enables murmur hashing support])]) - - AM_CONDITIONAL([INCLUDE_MURMUR_SRC], [test "$ac_cv_enable_murmur_hash" = "yes"]) -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: ENABLE_MURMUR_HASH -dnl --------------------------------------------------------------------------- diff --git a/m4/pandora_enable_dtrace.m4 b/m4/pandora_enable_dtrace.m4 deleted file mode 100644 index 4edf46f2..00000000 --- a/m4/pandora_enable_dtrace.m4 +++ /dev/null @@ -1,60 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl --------------------------------------------------------------------------- -dnl Macro: PANDORA_ENABLE_DTRACE -dnl --------------------------------------------------------------------------- -AC_DEFUN([PANDORA_ENABLE_DTRACE],[ - AC_ARG_ENABLE([dtrace], - [AS_HELP_STRING([--enable-dtrace], - [Build with support for the DTRACE. @<:@default=no@:>@])], - [ac_cv_enable_dtrace="$enableval"], - [ac_cv_enable_dtrace="no"]) - - AS_IF([test "$ac_cv_enable_dtrace" = "yes"],[ - AC_CHECK_PROGS([DTRACE], [dtrace]) - AC_CHECK_HEADERS(sys/sdt.h) - - AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace" -a "x${ac_cv_header_sys_sdt_h}" = "xyes"],[ - - AC_CACHE_CHECK([if dtrace works],[ac_cv_dtrace_works],[ - cat >conftest.d <<_ACEOF -provider Example { - probe increment(int); -}; -_ACEOF - $DTRACE -h -o conftest.h -s conftest.d 2>/dev/zero - AS_IF([test $? -eq 0],[ac_cv_dtrace_works=yes], - [ac_cv_dtrace_works=no]) - rm -f conftest.h conftest.d - ]) - AS_IF([test "x$ac_cv_dtrace_works" = "xyes"],[ - AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support]) - ]) - AC_CACHE_CHECK([if dtrace should instrument object files], - [ac_cv_dtrace_needs_objects],[ - dnl DTrace on MacOSX does not use -G option - cat >conftest.d <<_ACEOF -provider Example { - probe increment(int); -}; -_ACEOF - $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero - AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes], - [ac_cv_dtrace_needs_objects=no]) - rm -f conftest.d.o conftest.d - ]) - AC_SUBST(DTRACEFLAGS) dnl TODO: test for -G on OSX - ac_cv_have_dtrace=yes - ])]) - -AM_CONDITIONAL([HAVE_DTRACE], [test "x$ac_cv_dtrace_works" = "xyes"]) -AM_CONDITIONAL([DTRACE_NEEDS_OBJECTS], - [test "x$ac_cv_dtrace_needs_objects" = "xyes"]) - -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: PANDORA_ENABLE_DTRACE -dnl --------------------------------------------------------------------------- diff --git a/m4/pandora_have_libvbucket.m4 b/m4/pandora_have_libvbucket.m4 deleted file mode 100644 index d8a2f473..00000000 --- a/m4/pandora_have_libvbucket.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl Copyright (C) 2010 NorthScale -dnl This file is free software; NorthScale -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([_PANDORA_SEARCH_LIBVBUCKET],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - dnl -------------------------------------------------------------------- - dnl Check for libvbucket - dnl -------------------------------------------------------------------- - - AC_ARG_ENABLE([libvbucket], - [AS_HELP_STRING([--disable-libvbucket], - [Build with libvbucket support @<:@default=on@:>@])], - [ac_enable_libvbucket="$enableval"], - [ac_enable_libvbucket="yes"]) - - AS_IF([test "x$ac_enable_libvbucket" = "xyes"],[ - AC_LIB_HAVE_LINKFLAGS(vbucket,,[ - #include - ],[ - VBUCKET_CONFIG_HANDLE config = vbucket_config_parse_file(NULL); - ]) - ],[ - ac_cv_libvbucket="no" - ]) - - AM_CONDITIONAL(HAVE_LIBVBUCKET, [test "x${ac_cv_libvbucket}" = "xyes"]) -]) - -AC_DEFUN([PANDORA_HAVE_LIBVBUCKET],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBVBUCKET]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBVBUCKET],[ - AC_REQUIRE([PANDORA_HAVE_LIBVBUCKET]) - AS_IF([test x$ac_cv_libvbucket = xno], - AC_MSG_ERROR([libvbucket is required for ${PACKAGE}])) -]) diff --git a/m4/pkg.m4 b/m4/pkg.m4 deleted file mode 100644 index 73973f74..00000000 --- a/m4/pkg.m4 +++ /dev/null @@ -1,157 +0,0 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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 2 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT]) - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .]) - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES diff --git a/m4/protocol_binary.m4 b/m4/protocol_binary.m4 deleted file mode 100644 index 9568f0de..00000000 --- a/m4/protocol_binary.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: PROTOCOL_BINARY_TEST -dnl --------------------------------------------------------------------------- - -AC_DEFUN([PROTOCOL_BINARY_TEST], [ - AC_LANG_PUSH([C++]) - AC_CACHE_CHECK([for supported struct padding], [ac_cv_supported_struct_padding], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [ #include -#include "libmemcached/memcached/protocol_binary.h" - ], [ protocol_binary_request_set request; - int a = 1; - switch (a) { - case sizeof(request): - case sizeof(request.bytes): - break; - default: - a = 2; - } - ])], - [ ac_cv_supported_struct_padding=no ], - [ ac_cv_supported_struct_padding=yes ]) - ]) - AC_LANG_POP - AS_IF([test "x$ac_cv_supported_struct_padding" = "xno"],[ AC_MSG_ERROR([Unsupported struct padding done by compiler.])]) - ]) - -dnl --------------------------------------------------------------------------- -dnl End Macro: PROTOCOL_BINARY_TEST -dnl --------------------------------------------------------------------------- diff --git a/m4/setsockopt.m4 b/m4/setsockopt.m4 deleted file mode 100644 index 58c61c0a..00000000 --- a/m4/setsockopt.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macro: SETSOCKOPT_SANITY -dnl --------------------------------------------------------------------------- -AC_DEFUN([SETSOCKOPT_SANITY],[ - AC_CACHE_CHECK([for working SO_SNDTIMEO], [ac_cv_have_so_sndtimeo], - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[ -#include -#include -#include -#include -#include - ]],[[ - int sock = socket(AF_INET, SOCK_STREAM, 0); - struct timeval waittime; - - waittime.tv_sec= 0; - waittime.tv_usec= 500; - - if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, - &waittime, (socklen_t)sizeof(struct timeval)) == -1) { - if (errno == ENOPROTOOPT) { - return 1; - } - } - return 0; - ]])], - [ac_cv_have_so_sndtimeo=yes], - [ac_cv_have_so_sndtimeo=no], - [ac_cv_have_so_sndtimeo=yes]) - - AS_IF([test "x$ac_cv_have_so_sndtimeo" = "xyes"], [ - AC_DEFINE(HAVE_SNDTIMEO, 1, [Define to 1 if you have a working SO_SNDTIMEO])]) - AC_LANG_POP - ) - - AC_CACHE_CHECK([for working SO_RCVTIMEO], [ac_cv_have_so_rcvtimeo], - AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[ -#include -#include -#include -#include -#include - ]],[[ - int sock = socket(AF_INET, SOCK_STREAM, 0); - struct timeval waittime; - - waittime.tv_sec= 0; - waittime.tv_usec= 500; - - if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, - &waittime, (socklen_t)sizeof(struct timeval)) == -1) { - if (errno == ENOPROTOOPT) { - return 1; - } - } - return 0; - ]])], - [ac_cv_have_so_rcvtimeo=yes], - [ac_cv_have_so_rcvtimeo=no], - [ac_cv_have_so_rcvtimeo=yes]) - - AS_IF([test "x$ac_cv_have_so_rcvtimeo" = "xyes"], [ - AC_DEFINE(HAVE_RCVTIMEO, 1, [Define to 1 if you have a working SO_RCVTIMEO])]) - AC_LANG_POP - ) -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: SETSOCKOPT_SANITY -dnl --------------------------------------------------------------------------- diff --git a/m4/socket_send_flags.m4 b/m4/socket_send_flags.m4 deleted file mode 100644 index 7b739928..00000000 --- a/m4/socket_send_flags.m4 +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2012-2013 Data Differential LLC -# Copyright (C) 2011 Trond Norbye -# This file is free software; Trond Norbye and Data Differential -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# --------------------------------------------------------------------------- -# Macro: SOCKET_SEND_FLAGS -# --------------------------------------------------------------------------- -# - -#serial 2 - -AC_DEFUN([SOCKET_SEND_FLAGS], - [AC_CACHE_CHECK([for MSG_NOSIGNAL],[ac_cv_msg_nosignal], - [AC_LANG_PUSH([C]) - AX_SAVE_FLAGS - CFLAGS="$CFLAGS -I${srcdir}" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [int flags= MSG_NOSIGNAL])], [ac_cv_msg_nosignal="yes"]) - AC_LANG_POP - AX_RESTORE_FLAGS]) - - AC_CACHE_CHECK([for MSG_DONTWAIT],[ac_cv_msg_dontwait], - [AC_LANG_PUSH([C]) - AX_SAVE_FLAGS - CFLAGS="$CFLAGS -I${srcdir}" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[int flags= MSG_DONTWAIT])],[ac_cv_msg_dontwait="yes"]) - AC_LANG_POP - AX_RESTORE_FLAGS]) - - AC_CACHE_CHECK([for MSG_MORE],[ac_cv_msg_more], - [AC_LANG_PUSH([C]) - AX_SAVE_FLAGS - CFLAGS="$CFLAGS -I${srcdir}" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [int flags= MSG_MORE])], [ac_cv_msg_more="yes"]) - AC_LANG_POP - AX_RESTORE_FLAGS]) - - AS_IF([test "x$ac_cv_msg_nosignal" = "xyes"],[AC_DEFINE([HAVE_MSG_NOSIGNAL],[1],[Define to 1 if you have a MSG_NOSIGNAL])]) - AS_IF([test "x$ac_cv_msg_dontwait" = "xyes"],[AC_DEFINE([HAVE_MSG_DONTWAIT],[1],[Define to 1 if you have a MSG_DONTWAIT])]) - AS_IF([test "x$ac_cv_msg_more" = "xyes"],[AC_DEFINE([HAVE_MSG_MORE],[1],[Define to 1 if you have a MSG_MORE])]) - ]) - -# --------------------------------------------------------------------------- -# End Macro: SOCKET_SEND_FLAGS -# --------------------------------------------------------------------------- diff --git a/m4/visibility.m4 b/m4/visibility.m4 deleted file mode 100644 index 75c34b6e..00000000 --- a/m4/visibility.m4 +++ /dev/null @@ -1,77 +0,0 @@ -# visibility.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl Tests whether the compiler supports the command-line option -dnl -fvisibility=hidden and the function and variable attributes -dnl __attribute__((__visibility__("hidden"))) and -dnl __attribute__((__visibility__("default"))). -dnl Does *not* test for __visibility__("protected") - which has tricky -dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on -dnl MacOS X. -dnl Does *not* test for __visibility__("internal") - which has processor -dnl dependent semantics. -dnl Does *not* test for #pragma GCC visibility push(hidden) - which is -dnl "really only recommended for legacy code". -dnl Set the variable CFLAG_VISIBILITY. -dnl Defines and sets the variable HAVE_VISIBILITY. - -AC_DEFUN([gl_VISIBILITY], -[ - AC_REQUIRE([AC_PROG_CC]) - CFLAG_VISIBILITY= - HAVE_VISIBILITY=0 - if test -n "$GCC"; then - dnl First, check whether -Werror can be added to the command line, or - dnl whether it leads to an error because of some other option that the - dnl user has put into $CC $CFLAGS $CPPFLAGS. - AC_MSG_CHECKING([whether the -Werror option is usable]) - AC_CACHE_VAL([gl_cv_cc_vis_werror], [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_vis_werror=yes], - [gl_cv_cc_vis_werror=no]) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_vis_werror]) - dnl Now check whether visibility declarations are supported. - AC_MSG_CHECKING([for simple visibility declarations]) - AC_CACHE_VAL([gl_cv_cc_visibility], [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - dnl We use the option -Werror and a function dummyfunc, because on some - dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning - dnl "visibility attribute not supported in this configuration; ignored" - dnl at the first function definition in every compilation unit, and we - dnl don't want to use the option in this case. - if test $gl_cv_cc_vis_werror = yes; then - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; - extern __attribute__((__visibility__("default"))) int exportedvar; - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); - void dummyfunc (void) {} - ]], - [[]])], - [gl_cv_cc_visibility=yes], - [gl_cv_cc_visibility=no]) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_visibility]) - if test $gl_cv_cc_visibility = yes; then - CFLAG_VISIBILITY="-fvisibility=hidden" - HAVE_VISIBILITY=1 - fi - fi - AC_SUBST([CFLAG_VISIBILITY]) - AC_SUBST([HAVE_VISIBILITY]) - AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], - [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) -]) diff --git a/man/include.am b/man/include.am deleted file mode 100644 index c676fcaf..00000000 --- a/man/include.am +++ /dev/null @@ -1,128 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -RST_FILES= $(shell find $(top_builddir)/docs/source -type f -name '*.rst') - -# Build rule for documentation -$(dist_man_MANS): $(RST_FILES) - @cp docs/build/$@ $@ - -dist_man_MANS+= man/memaslap.1 -dist_man_MANS+= man/memcapable.1 -dist_man_MANS+= man/memcat.1 -dist_man_MANS+= man/memcp.1 -dist_man_MANS+= man/memdump.1 -dist_man_MANS+= man/memerror.1 -dist_man_MANS+= man/memexist.1 -dist_man_MANS+= man/memflush.1 -dist_man_MANS+= man/memparse.1 -dist_man_MANS+= man/memping.1 -dist_man_MANS+= man/memrm.1 -dist_man_MANS+= man/memslap.1 -dist_man_MANS+= man/memstat.1 -dist_man_MANS+= man/memtouch.1 - -dist_man_MANS+= man/hashkit_clone.3 -dist_man_MANS+= man/hashkit_crc32.3 -dist_man_MANS+= man/hashkit_create.3 -dist_man_MANS+= man/hashkit_fnv1_32.3 -dist_man_MANS+= man/hashkit_fnv1_64.3 -dist_man_MANS+= man/hashkit_fnv1a_32.3 -dist_man_MANS+= man/hashkit_fnv1a_64.3 -dist_man_MANS+= man/hashkit_free.3 -dist_man_MANS+= man/hashkit_functions.3 -dist_man_MANS+= man/hashkit_hsieh.3 -dist_man_MANS+= man/hashkit_is_allocated.3 -dist_man_MANS+= man/hashkit_jenkins.3 -dist_man_MANS+= man/hashkit_md5.3 -dist_man_MANS+= man/hashkit_murmur.3 -dist_man_MANS+= man/hashkit_value.3 -dist_man_MANS+= man/libhashkit.3 -dist_man_MANS+= man/libmemcached.3 -dist_man_MANS+= man/libmemcached_check_configuration.3 -dist_man_MANS+= man/libmemcached_configuration.3 -dist_man_MANS+= man/libmemcached_examples.3 -dist_man_MANS+= man/libmemcachedutil.3 -dist_man_MANS+= man/memcached.3 -dist_man_MANS+= man/memcached_add.3 -dist_man_MANS+= man/memcached_add_by_key.3 -dist_man_MANS+= man/memcached_analyze.3 -dist_man_MANS+= man/memcached_append.3 -dist_man_MANS+= man/memcached_append_by_key.3 -dist_man_MANS+= man/memcached_behavior_get.3 -dist_man_MANS+= man/memcached_behavior_set.3 -dist_man_MANS+= man/memcached_callback_get.3 -dist_man_MANS+= man/memcached_callback_set.3 -dist_man_MANS+= man/memcached_cas.3 -dist_man_MANS+= man/memcached_cas_by_key.3 -dist_man_MANS+= man/memcached_clone.3 -dist_man_MANS+= man/memcached_create.3 -dist_man_MANS+= man/memcached_decrement.3 -dist_man_MANS+= man/memcached_decrement_with_initial.3 -dist_man_MANS+= man/memcached_delete.3 -dist_man_MANS+= man/memcached_delete_by_key.3 -dist_man_MANS+= man/memcached_destroy_sasl_auth_data.3 -dist_man_MANS+= man/memcached_dump.3 -dist_man_MANS+= man/memcached_exist.3 -dist_man_MANS+= man/memcached_exist_by_key.3 -dist_man_MANS+= man/memcached_fetch.3 -dist_man_MANS+= man/memcached_fetch_execute.3 -dist_man_MANS+= man/memcached_fetch_result.3 -dist_man_MANS+= man/memcached_flush_buffers.3 -dist_man_MANS+= man/memcached_free.3 -dist_man_MANS+= man/memcached_generate_hash.3 -dist_man_MANS+= man/memcached_generate_hash_value.3 -dist_man_MANS+= man/memcached_get.3 -dist_man_MANS+= man/memcached_get_by_key.3 -dist_man_MANS+= man/memcached_get_memory_allocators.3 -dist_man_MANS+= man/memcached_get_sasl_callbacks.3 -dist_man_MANS+= man/memcached_get_user_data.3 -dist_man_MANS+= man/memcached_increment.3 -dist_man_MANS+= man/memcached_increment_with_initial.3 -dist_man_MANS+= man/memcached_last_error_message.3 -dist_man_MANS+= man/memcached_lib_version.3 -dist_man_MANS+= man/memcached_mget.3 -dist_man_MANS+= man/memcached_mget_by_key.3 -dist_man_MANS+= man/memcached_mget_execute.3 -dist_man_MANS+= man/memcached_mget_execute_by_key.3 -dist_man_MANS+= man/memcached_pool.3 -dist_man_MANS+= man/memcached_pool_behavior_get.3 -dist_man_MANS+= man/memcached_pool_behavior_set.3 -dist_man_MANS+= man/memcached_pool_create.3 -dist_man_MANS+= man/memcached_pool_destroy.3 -dist_man_MANS+= man/memcached_pool_fetch.3 -dist_man_MANS+= man/memcached_pool_pop.3 -dist_man_MANS+= man/memcached_pool_push.3 -dist_man_MANS+= man/memcached_pool_release.3 -dist_man_MANS+= man/memcached_pool_st.3 -dist_man_MANS+= man/memcached_prepend.3 -dist_man_MANS+= man/memcached_prepend_by_key.3 -dist_man_MANS+= man/memcached_quit.3 -dist_man_MANS+= man/memcached_replace.3 -dist_man_MANS+= man/memcached_replace_by_key.3 -dist_man_MANS+= man/memcached_sasl_set_auth_data.3 -dist_man_MANS+= man/memcached_server_add.3 -dist_man_MANS+= man/memcached_server_count.3 -dist_man_MANS+= man/memcached_server_cursor.3 -dist_man_MANS+= man/memcached_server_list.3 -dist_man_MANS+= man/memcached_server_list_append.3 -dist_man_MANS+= man/memcached_server_list_count.3 -dist_man_MANS+= man/memcached_server_list_free.3 -dist_man_MANS+= man/memcached_server_push.3 -dist_man_MANS+= man/memcached_servers_parse.3 -dist_man_MANS+= man/memcached_set.3 -dist_man_MANS+= man/memcached_set_by_key.3 -dist_man_MANS+= man/memcached_set_memory_allocators.3 -dist_man_MANS+= man/memcached_set_sasl_callbacks.3 -dist_man_MANS+= man/memcached_set_user_data.3 -dist_man_MANS+= man/memcached_stat.3 -dist_man_MANS+= man/memcached_stat_execute.3 -dist_man_MANS+= man/memcached_stat_get_keys.3 -dist_man_MANS+= man/memcached_stat_get_value.3 -dist_man_MANS+= man/memcached_stat_servername.3 -dist_man_MANS+= man/memcached_strerror.3 -dist_man_MANS+= man/memcached_touch.3 -dist_man_MANS+= man/memcached_touch_by_key.3 -dist_man_MANS+= man/memcached_verbosity.3 -dist_man_MANS+= man/memcached_version.3 diff --git a/rpm/include.mk b/rpm/include.mk deleted file mode 100644 index bf9bd1a8..00000000 --- a/rpm/include.mk +++ /dev/null @@ -1,55 +0,0 @@ -# vim:ft=automake - -RPM_BUILDDIR= ~/rpmbuild -RPM_SOURCESDIR= $(RPM_BUILDDIR)/SOURCES - -RPM_BUILD_TARGET= @PACKAGE@-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm -RPM_SOURCE= $(RPM_SOURCESDIR)/$(DIST_ARCHIVES) - -RPMS= -RPMS+= $(RPM_BUILD_TARGET) -RPMS+= @PACKAGE@-devel-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm -RPMS+= @PACKAGE@-debuginfo-@VERSION@-@RPM_RELEASE@.@build_cpu@.rpm - -SRPMS= @PACKAGE@-@VERSION@-@RPM_RELEASE@.src.rpm - -RPM_DIST= $(RPMS) $(SRPMS) - -BUILD_RPMS= $(foreach rpm_iterator,$(RPMS),$(addprefix $(RPM_BUILDDIR)/RPMS/@build_cpu@/, $(rpm_iterator))) -BUILD_SRPMS= $(foreach srpm_iterator,$(SRPMS),$(addprefix $(RPM_BUILDDIR)/SRPMS/, $(srpm_iterator))) -BUILD_RPM_DIR= $(RPM_BUILDDIR)/BUILD/@PACKAGE@-@VERSION@ - -$(RPM_BUILDDIR): - @@RPMDEV_SETUPTREE@ - -$(DIST_ARCHIVES): $(DISTFILES) - $(MAKE) $(AM_MAKEFLAGS) dist-gzip - -$(RPM_SOURCE): $(DIST_ARCHIVES) $(RPM_BUILDDIR) - @cp $< $@ - -$(RPM_BUILD_TARGET): $(RPM_SOURCE) support/@PACKAGE@.spec - -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) - -@rm -rf $(BUILD_RPM_DIR) - @@RPMBUILD@ -ba $(top_srcdir)/support/@PACKAGE@.spec - @cp $(BUILD_RPMS) $(BUILD_SRPMS) . - -.PHONY: rpm-sign -rpm-sign: $(RPM_BUILD_TARGET) - @@RPM@ --addsign $(RPM_DIST) - @@RPM@ --checksig $(RPM_DIST) - -.PHONY: clean-rpm -clean-rpm: - -@rm -f $(BUILD_RPMS) $(BUILD_SRPMS) $(BUILD_RPM_SOURCE) $(RPM_DIST) - -@rm -rf $(BUILD_RPM_DIR) - -rpm: $(RPM_BUILD_TARGET) -dist-rpm: $(RPM_BUILD_TARGET) - -.PHONY: release -release: rpm rpm-sign - -.PHONY: auto-rpmbuild -auto-rpmbuild: support/@PACKAGE@.spec - @auto-br-rpmbuild -ba $(top_srcdir)/support/@PACKAGE@.spec diff --git a/support/include.am b/support/include.am deleted file mode 100644 index 0d81ba71..00000000 --- a/support/include.am +++ /dev/null @@ -1,9 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -EXTRA_DIST+= support/libmemcached.spec -EXTRA_DIST+= support/set_benchmark.sh - -pkgconfigdir= $(libdir)/pkgconfig -pkgconfig_DATA= support/libmemcached.pc diff --git a/tests/include.am b/tests/include.am deleted file mode 100644 index 49d45dd4..00000000 --- a/tests/include.am +++ /dev/null @@ -1,159 +0,0 @@ -# vim:ft=automake -# Copyright (C) 2011 Data Differential -# All rights reserved. -# -# Use and distribution licensed under the BSD license. See -# the COPYING file in the parent directory for full text. -# -# included from Top Level Makefile.am -# All paths should be given relative to the root - -TESTS_LDADDS= -TESTS_LDADDS+= libmemcached/libmemcached.la -TESTS_LDADDS+= libmemcached/libmemcachedutil.la -TESTS_LDADDS+= libtest/libtest.la - -EXTRA_DIST+= tests/cpp_example.cc - -noinst_HEADERS+= tests/exist.h -noinst_HEADERS+= tests/hash_results.h -noinst_HEADERS+= tests/keys.hpp -noinst_HEADERS+= tests/libmemcached_test_container.h -noinst_HEADERS+= tests/libmemcached_world.h -noinst_HEADERS+= tests/libmemcached_world_socket.h -noinst_HEADERS+= tests/memc.hpp -noinst_HEADERS+= tests/runner.h - -# Cycle should always run first -tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_cycle_CXXFLAGS= $(AM_CXXFLAGS) -tests_cycle_CXXFLAGS+= @PTHREAD_CFLAGS@ -tests_cycle_SOURCES= tests/cycle.cc -tests_cycle_LDADD= $(TESTS_LDADDS) -tests_cycle_LDADD+= @PTHREAD_LIBS@ -check_PROGRAMS+= tests/cycle -noinst_PROGRAMS+= tests/cycle - -include tests/libmemcached-1.0/include.am - -include tests/parser.am - -tests_failure_SOURCES= -tests_failure_SOURCES+= tests/failure.cc -tests_failure_SOURCES+= clients/execute.cc -tests_failure_SOURCES+= clients/generator.cc -tests_failure_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_failure_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc -tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc - -tests_failure_CXXFLAGS = $(AM_CXXFLAGS) -tests_failure_LDADD= $(TESTS_LDADDS) -check_PROGRAMS+= tests/failure -noinst_PROGRAMS+= tests/failure - -test-failure: tests/failure - @tests/failure - -gdb-failure: tests/failure - @$(GDB_COMMAND) tests/failure - -tests_testhashkit_SOURCES= tests/hashkit_functions.cc -tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/testhashkit -noinst_PROGRAMS+= tests/testhashkit - -test-hash: tests/testhashkit - @tests/testhashkit - - -tests_hash_plus_SOURCES= tests/hash_plus.cc -tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_hash_plus_LDADD= $(tests_testhashkit_LDADD) -check_PROGRAMS+= tests/hash_plus -noinst_PROGRAMS+= tests/hash_plus - -include tests/cli.am - -test: check - -test-mem: tests/libmemcached-1.0/testapp - @tests/libmemcached-1.0/testapp - -test-atom: tests/atomsmasher - @tests/atomsmasher - -test-hashplus: tests/hash_plus - @tests/hash_plus - -test-cycle: tests/cycle - @tests/cycle - -test-memcapable: tests/memcapable - @tests/memcapable - -valgrind-memcapable: tests/memcapable - $(VALGRIND_COMMAND) tests/memcapable - -pahole-mem: tests/testapp - @$(PAHOLE_COMMAND) tests/testapp - -pahole-hash: tests/testhashkit - @$(PAHOLE_COMMAND) tests/testhashkit - -gdb-mem: tests/libmemcached-1.0/testapp - @$(GDB_COMMAND) tests/libmemcached-1.0/testapp - -gdb-atom: tests/atomsmasher - @$(GDB_COMMAND) tests/atomsmasher - -gdb-hash: tests/testhashkit - @$(GDB_COMMAND) tests/testhashkit - -gdb-hashplus: tests/hash_plus - @$(GDB_COMMAND) tests/hash_plus - -gdb-cycle: tests/cycle - @$(GDB_COMMAND) tests/cycle - -valgrind-cycle: tests/cycle - $(VALGRIND_COMMAND) tests/cycle - -valgrind-mem: tests/libmemcached-1.0/testapp - @$(VALGRIND_COMMAND) tests/libmemcached-1.0/testapp - -valgrind-failure: tests/failure - @$(VALGRIND_COMMAND) tests/failure - -valgrind-atom: tests/atomsmasher - $(VALGRIND_COMMAND) tests/atomsmasher - -valgrind-sasl: tests/sasl - @$(VALGRIND_COMMAND) tests/sasl - -valgrind-hash: tests/testhashkit - @$(VALGRIND_COMMAND) tests/testhashkit - -valgrind-hashplus: tests/hash_plus - @$(VALGRIND_COMMAND) tests/hash_plus - -helgrind-cycle: tests/cycle - @$(HELGRIND_COMMAND) tests/cycle - -helgrind-mem: tests/libmemcached-1.0/testapp - @$(HELGRIND_COMMAND) tests/libmemcached-1.0/testapp - -helgrind-atom: tests/atomsmasher - @$(HELGRIND_COMMAND) tests/atomsmasher - -helgrind-hash: tests/testhashkit - @$(HELGRIND_COMMAND) tests/testhashkit - -helgrind-hashplus: tests/hash_plus - @$(HELGRIND_COMMAND) tests/hash_plus - -drd-mem: tests/libmemcached-1.0/testapp - @$(DRD_COMMAND) tests/libmemcached-1.0/testapp - -drd-cycle: tests/cycle - @$(DRD_COMMAND) tests/cycle diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am deleted file mode 100644 index 6db1187f..00000000 --- a/tests/libmemcached-1.0/include.am +++ /dev/null @@ -1,271 +0,0 @@ -# vim:ft=automake -# Copyright (C) 2011 Data Differential -# All rights reserved. -# -# Use and distribution licensed under the BSD license. See -# the COPYING file in the parent directory for full text. -# -# included from Top Level Makefile.am -# All paths should be given relative to the root - -noinst_HEADERS+= tests/basic.h -noinst_HEADERS+= tests/callbacks.h -noinst_HEADERS+= tests/debug.h -noinst_HEADERS+= tests/deprecated.h -noinst_HEADERS+= tests/error_conditions.h -noinst_HEADERS+= tests/exist.h -noinst_HEADERS+= tests/ketama.h -noinst_HEADERS+= tests/ketama_test_cases.h -noinst_HEADERS+= tests/ketama_test_cases_spy.h -noinst_HEADERS+= tests/libmemcached-1.0/all_tests.h -noinst_HEADERS+= tests/libmemcached-1.0/callback_counter.h -noinst_HEADERS+= tests/libmemcached-1.0/dump.h -noinst_HEADERS+= tests/libmemcached-1.0/encoding_key.h -noinst_HEADERS+= tests/libmemcached-1.0/fetch_all_results.h -noinst_HEADERS+= tests/libmemcached-1.0/generate.h -noinst_HEADERS+= tests/libmemcached-1.0/haldenbrand.h -noinst_HEADERS+= tests/libmemcached-1.0/mem_functions.h -noinst_HEADERS+= tests/libmemcached-1.0/memcached_get.h -noinst_HEADERS+= tests/libmemcached-1.0/parser.h -noinst_HEADERS+= tests/libmemcached-1.0/setup_and_teardowns.h -noinst_HEADERS+= tests/libmemcached-1.0/stat.h -noinst_HEADERS+= tests/namespace.h -noinst_HEADERS+= tests/pool.h -noinst_HEADERS+= tests/print.h -noinst_HEADERS+= tests/replication.h -noinst_HEADERS+= tests/server_add.h -noinst_HEADERS+= tests/string.h -noinst_HEADERS+= tests/touch.h -noinst_HEADERS+= tests/virtual_buckets.h - -if HAVE_DTRACE -else -# Test internals -tests_libmemcached_1_0_internals_CXXFLAGS= -tests_libmemcached_1_0_internals_LDADD= -tests_libmemcached_1_0_internals_SOURCES= - -tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/internals.cc -tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc -tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS) -tests_libmemcached_1_0_internals_CXXFLAGS+= @PTHREAD_CFLAGS@ -tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la -tests_libmemcached_1_0_internals_LDADD+= @PTHREAD_LIBS@ -tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la -tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la -check_PROGRAMS+= tests/libmemcached-1.0/internals -noinst_PROGRAMS+= tests/libmemcached-1.0/internals - -test-internal: tests/libmemcached-1.0/internals - @tests/testplus - -endif - -tests_libmemcached_1_0_testapp_CXXFLAGS= -tests_libmemcached_1_0_testapp_CFLAGS= -tests_libmemcached_1_0_testapp_SOURCES= -tests_libmemcached_1_0_testapp_LDADD= - -tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS) -tests_libmemcached_1_0_testapp_CXXFLAGS+= @PTHREAD_CFLAGS@ -tests_libmemcached_1_0_testapp_CFLAGS+= $(AM_CFLAGS) -tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_CONVERSION) -tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_STRICT_ALIASING) -tests_libmemcached_1_0_testapp_SOURCES+= clients/generator.cc clients/execute.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/all_tests.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/basic.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/callbacks.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/debug.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/deprecated.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/dump.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/encoding_key.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/error_conditions.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/exist.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/generate.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/haldenbrand.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/ketama.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/mem_functions.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/memcached_get.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/namespace.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/parser.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/pool.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/print.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/replication.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/server_add.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/stat.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/touch.cc -tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc - -tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LIB@ -tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@ -tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la -tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la -tests_libmemcached_1_0_testapp_LDADD+= libtest/libtest.la -tests_libmemcached_1_0_testapp_LDADD+= libhashkit/libhashkit.la - -check_PROGRAMS+= tests/libmemcached-1.0/testapp -noinst_PROGRAMS+= tests/libmemcached-1.0/testapp - -tests_libmemcached_1_0_testsocket_CXXFLAGS= -tests_libmemcached_1_0_testsocket_CFLAGS= -tests_libmemcached_1_0_testsocket_SOURCES= -tests_libmemcached_1_0_testsocket_LDADD= - -tests_libmemcached_1_0_testsocket_CXXFLAGS+= @PTHREAD_CFLAGS@ -tests_libmemcached_1_0_testsocket_CXXFLAGS+= $(AM_CXXFLAGS) -tests_libmemcached_1_0_testsocket_CFLAGS+= $(AM_CFLAGS) -tests_libmemcached_1_0_testsocket_CFLAGS+= $(NO_CONVERSION) -tests_libmemcached_1_0_testsocket_CFLAGS+= $(NO_STRICT_ALIASING) - -tests_libmemcached_1_0_testsocket_SOURCES+= clients/execute.cc -tests_libmemcached_1_0_testsocket_SOURCES+= clients/generator.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/all_tests_socket.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/basic.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/callbacks.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/debug.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/deprecated.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/dump.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/encoding_key.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/error_conditions.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/exist.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/generate.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/haldenbrand.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/ketama.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/mem_functions.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/memcached_get.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/namespace.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/parser.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/pool.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/print.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/replication.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/server_add.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/stat.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/touch.cc -tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc - -tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LIB@ -tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@ -tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la -tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la -tests_libmemcached_1_0_testsocket_LDADD+= libtest/libtest.la -tests_libmemcached_1_0_testsocket_LDADD+= libhashkit/libhashkit.la - -check_PROGRAMS+= tests/libmemcached-1.0/testsocket -noinst_PROGRAMS+= tests/libmemcached-1.0/testsocket - -test-socket: tests/libmemcached-1.0/testsocket - @tests/libmemcached-1.0/testsocket - -gdb-socket: tests/libmemcached-1.0/testsocket - @$(GDB_COMMAND) tests/libmemcached-1.0/testsocket - -tests_libmemcached_1_0_sasl_SOURCES= -tests_libmemcached_1_0_sasl_LDADD= -tests_libmemcached_1_0_sasl_CXXFLAGS= -tests_libmemcached_1_0_sasl_CFLAGS= - -tests_libmemcached_1_0_sasl_CXXFLAGS+= $(AM_CXXFLAGS) -tests_libmemcached_1_0_sasl_CXXFLAGS+= @PTHREAD_CFLAGS@ -tests_libmemcached_1_0_sasl_CFLAGS+= $(AM_CFLAGS) -tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_CONVERSION) -tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_STRICT_ALIASING) -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/basic.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/debug.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/deprecated.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/error_conditions.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/ketama.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/namespace.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/parser.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/pool.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/print.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/replication.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/sasl.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc -tests_libmemcached_1_0_sasl_SOURCES+= clients/execute.cc -tests_libmemcached_1_0_sasl_SOURCES+= clients/generator.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc - -tests_libmemcached_1_0_sasl_LDADD+= @PTHREAD_LIBS@ -tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la -tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la -tests_libmemcached_1_0_sasl_LDADD+= libtest/libtest.la -tests_libmemcached_1_0_sasl_LDADD+= libhashkit/libhashkit.la - -check_PROGRAMS+= tests/libmemcached-1.0/sasl -noinst_PROGRAMS+= tests/libmemcached-1.0/sasl - -test-sasl: tests/libmemcached-1.0/sasl - @tests/libmemcached-1.0/sasl - -gdb-sasl: tests/libmemcached-1.0/sasl - @$(GDB_COMMAND) tests/libmemcached-1.0/sasl - -tests_atomsmasher_SOURCES= -tests_atomsmasher_LDADD= - -tests_atomsmasher_LDADD+= $(TESTS_LDADDS) -tests_atomsmasher_SOURCES+= clients/execute.cc -tests_atomsmasher_SOURCES+= clients/generator.cc -tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/atomsmasher.cc -tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/debug.cc -tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/generate.cc -tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/print.cc -noinst_PROGRAMS+= tests/atomsmasher - -tests_testudp_CFLAGS= -tests_testudp_SOURCES= -tests_testudp_LDADD= - -tests_testudp_CFLAGS+= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_testudp_SOURCES+= clients/execute.cc -tests_testudp_SOURCES+= clients/generator.cc -tests_testudp_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_testudp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc -tests_testudp_SOURCES+= tests/libmemcached-1.0/print.cc -tests_testudp_SOURCES+= tests/mem_udp.cc -tests_testudp_LDADD+= $(TESTS_LDADDS) -check_PROGRAMS+= tests/testudp -noinst_PROGRAMS+= tests/testudp - -test-udp: tests/testudp - @tests/testudp - -tests_testplus_SOURCES= -tests_testplus_CXXFLAGS= -tests_testplus_LDADD= - -tests_testplus_SOURCES+= clients/execute.cc -tests_testplus_SOURCES+= clients/generator.cc -tests_testplus_SOURCES+= tests/libmemcached-1.0/callback_counter.cc -tests_testplus_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc -tests_testplus_SOURCES+= tests/libmemcached-1.0/generate.cc -tests_testplus_SOURCES+= tests/libmemcached-1.0/plus.cpp -tests_testplus_SOURCES+= tests/libmemcached-1.0/print.cc - -tests_testplus_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_testplus_LDADD+= $(TESTS_LDADDS) -check_PROGRAMS+= tests/testplus -noinst_PROGRAMS+= tests/testplus - -test-plus: tests/testplus - @tests/testplus - -gdb-plus: tests/testplus - $(GDB_COMMAND) tests/testplus - -valgrind-plus: tests/testplus - @$(VALGRIND_COMMAND) tests/testplus - -helgrind-plus: tests/testplus - @$(HELGRIND_COMMAND) tests/testplus diff --git a/util/include.am b/util/include.am deleted file mode 100644 index 2dcf1c43..00000000 --- a/util/include.am +++ /dev/null @@ -1,21 +0,0 @@ -# vim:ft=automake -# DataDifferential Utility Library -# Copyright (C) 2011 Data Differential -# All rights reserved. -# -# Use and distribution licensed under the BSD license. See -# the COPYING file in the parent directory for full text. -# -# Included from Top Level Makefile.am -# All paths should be given relative to the root - - -noinst_HEADERS+= \ - util/daemon.hpp \ - util/instance.hpp \ - util/logfile.hpp \ - util/log.hpp \ - util/operation.hpp \ - util/signal.hpp \ - util/string.hpp \ - util/pidfile.hpp diff --git a/version.m4 b/version.m4 deleted file mode 100644 index 759ba247..00000000 --- a/version.m4 +++ /dev/null @@ -1 +0,0 @@ -m4_define([VERSION_NUMBER], [1.0.18]) diff --git a/win32/include.am b/win32/include.am deleted file mode 100644 index 9552bc73..00000000 --- a/win32/include.am +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root -noinst_HEADERS+= win32/wrappers.h - -if BUILD_WIN32_WRAPPERS -libhashkit_libhashkit_la_LDFLAGS+=-no-undefined -libmemcached_libmemcached_la_LDFLAGS+=-no-undefined -if BUILD_LIBMEMCACHED_PROTOCOL -libmemcached_libmemcachedprotocol_la_LDFLAGS+=-no-undefined -endif -libmemcached_libmemcachedutil_la_LDFLAGS+=-no-undefined -endif