From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 464BD138A2F for ; Tue, 19 Aug 2014 14:01:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08592E0918; Tue, 19 Aug 2014 14:01:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25F41E0916 for ; Tue, 19 Aug 2014 14:01:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20C0034025A for ; Tue, 19 Aug 2014 14:01:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6870338FE for ; Tue, 19 Aug 2014 14:01:46 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1406759854.1bbd73eb9f765d6ad5ed257f8520877bfd58edfe.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:master commit in: / X-VCS-Repository: proj/elfix X-VCS-Files: configure.ac X-VCS-Directories: / X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 1bbd73eb9f765d6ad5ed257f8520877bfd58edfe X-VCS-Branch: master Date: Tue, 19 Aug 2014 14:01:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c532f53c-bbd6-4483-b617-09a31c8e0e02 X-Archives-Hash: 26a2ff0c0f07b8c8346a7eac2c199ef5 Message-ID: <20140819140146.8R1WpBM12DvUtXRj1OMeAb4mV_PDkV7U9f0OLnbvd-8@z> commit: 1bbd73eb9f765d6ad5ed257f8520877bfd58edfe Author: Anthony G. Basile gentoo org> AuthorDate: Wed Jul 30 22:37:34 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Jul 30 22:37:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=1bbd73eb configure.ac: cleanup after moving fix-gnustack --- configure.ac | 66 ++++++++++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index 179eed5..aec42a4 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see . # -AC_PREREQ([2.68]) +AC_PREREQ([2.69]) AC_INIT([elfix], [0.9], [http://bugs.gentoo.org/]) AC_CONFIG_SRCDIR([src/paxctl-ng.c]) AC_CONFIG_HEADERS([config.h]) @@ -27,16 +27,6 @@ LT_PREREQ([2.4]) LT_INIT([dlopen]) AC_CONFIG_MACRO_DIR([m4]) -AC_ARG_ENABLE( - [tests], - AS_HELP_STRING( - [--enable-tests], - [perform tests] - ), - [test "x$enable_tests" = "xyes"] -) -AM_CONDITIONAL([TEST],[test "x$enable_tests" = "xyes"]) - # Checks for programs. AC_PROG_AWK AC_PROG_CC @@ -50,9 +40,6 @@ AC_CHECK_HEADERS( [AC_MSG_ERROR(["Missing necessary header"])] ) -# Checks for DECLs. -AC_CHECK_DECL([ELF_C_RDWR_MMAP],[],[],[[#include ]]) - # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_PID_T AC_TYPE_SIZE_T @@ -65,14 +52,15 @@ AC_FUNC_FORK AC_FUNC_MMAP AC_CHECK_FUNCS([memset strerror]) -# Note: this is always needed for fix-gnustack -# and for paxctl-ng only with --enable-ptpax -AC_CHECK_LIB( - [elf], - [elf_begin], - [], - [AC_MSG_ERROR(["Missing necessary function elf_begin in libelf"])] +AC_ARG_ENABLE( + [tests], + AS_HELP_STRING( + [--enable-tests], + [perform tests] + ), + [test "x$enable_tests" = "xyes"] ) +AM_CONDITIONAL([TEST],[test "x$enable_tests" = "xyes"]) AC_ARG_ENABLE( [ptpax], @@ -85,29 +73,31 @@ AC_ARG_ENABLE( AS_IF( [test "x$enable_ptpax" != "xno"], [ - AS_IF( - [test "x$ac_cv_have_decl_ELF_C_RDWR_MMAP" = "xyes"], - [ - AC_CHECK_DECLS( - [PT_PAX_FLAGS, PF_PAGEEXEC, PF_MPROTECT, PF_RANDMMAP], - [], - [ - CFLAGS+=" -DNEED_PAX_DECLS" - ], - [[#include ]] - ) - CFLAGS+=" -DPTPAX" - ], - [AC_MSG_ERROR(["Missing necessary DECL ELF_C_RDWR_MMAP in libelf"])] + AC_CHECK_LIB( + [elf], + [elf_begin], + [], + [AC_MSG_ERROR(["Missing necessary function elf_begin in libelf"])] + ) + AC_CHECK_DECL( + [ELF_C_RDWR_MMAP], + [], + [AC_MSG_ERROR(["Missing necessary DECL ELF_C_RDWR_MMAP in libelf.h"])], + [[#include ]] ) + AC_CHECK_DECLS( + [PT_PAX_FLAGS, PF_PAGEEXEC, PF_MPROTECT, PF_RANDMMAP], + [], + [CFLAGS+=" -DNEED_PAX_DECLS"], + [[#include ]] + ) + CFLAGS+=" -DPTPAX" ], [ CFLAGS+=" -UPTPAX -DNEED_PAX_DECLS" ] ) -AM_CONDITIONAL([BUILD_ELF],[test "x$enable_ptpax" = "xyes" && test "x$ac_cv_have_decl_ELF_C_RDWR_MMAP" = "xyes"]) - AC_ARG_ENABLE( [xtpax], AS_HELP_STRING( @@ -137,7 +127,7 @@ AS_IF( ] ) -if [test "x$enable_ptpax" = "xno" -a "x$enable_xtpax" = "xno" ]; then +if [test "x$enable_ptpax" = "xno" -a "x$enable_xtpax" = "xno" ]; then AC_MSG_ERROR(["You must enable either ptpax or xtpax"]) fi