From: Pieter Lexis Date: Wed, 11 Jan 2017 12:44:12 +0000 (+0100) Subject: Fix configure on FreeBSD X-Git-Tag: rec-4.1.0-alpha1~346^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4876%2Fhead;p=thirdparty%2Fpdns.git Fix configure on FreeBSD AX_CHECK_LINK_FLAG produced a broken configure script that did not work on FreeBSD. Fixes #4875 --- diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4 deleted file mode 100644 index eb01a6ce13..0000000000 --- a/m4/ax_check_link_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# http://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 -# -# 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_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/pdns_check_os.m4 b/m4/pdns_check_os.m4 index 315fef4f32..df05dc251c 100644 --- a/m4/pdns_check_os.m4 +++ b/m4/pdns_check_os.m4 @@ -37,11 +37,12 @@ AC_DEFUN([PDNS_CHECK_OS],[ case "$host" in mips* | powerpc* ) - AX_CHECK_LINK_FLAG([-latomic], - [ : ], - AC_MSG_ERROR([Unable to link against libatomic, cannot continue]) - ) + AC_MSG_CHECKING([whether the linker accepts -latomic]) LDFLAGS="-latomic $LDFLAGS" + AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])], + [AC_MSG_RESULT([yes])], + [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])] + ) ;; esac diff --git a/pdns/dnsdistdist/m4/ax_check_link_flag.m4 b/pdns/dnsdistdist/m4/ax_check_link_flag.m4 deleted file mode 120000 index b89a11864a..0000000000 --- a/pdns/dnsdistdist/m4/ax_check_link_flag.m4 +++ /dev/null @@ -1 +0,0 @@ -../../../m4/ax_check_link_flag.m4 \ No newline at end of file diff --git a/pdns/recursordist/m4/ax_check_link_flag.m4 b/pdns/recursordist/m4/ax_check_link_flag.m4 deleted file mode 120000 index b89a11864a..0000000000 --- a/pdns/recursordist/m4/ax_check_link_flag.m4 +++ /dev/null @@ -1 +0,0 @@ -../../../m4/ax_check_link_flag.m4 \ No newline at end of file