From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69B32138334 for ; Sun, 7 Apr 2019 13:20:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EA99E088F; Sun, 7 Apr 2019 13:20:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 265CCE088F for ; Sun, 7 Apr 2019 13:20:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98858335CCF for ; Sun, 7 Apr 2019 13:20:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7432595 for ; Sun, 7 Apr 2019 13:19:59 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1554643160.37a9949c0e16fe3356b3db68a5b7bf3d3cdf53ce.soap@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: Makefile.am configure.ac X-VCS-Directories: / X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 37a9949c0e16fe3356b3db68a5b7bf3d3cdf53ce X-VCS-Branch: master Date: Sun, 7 Apr 2019 13:19:59 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d85c7c2-2411-416a-b8bc-5bd55127d133 X-Archives-Hash: 80014748c887ffe47af61bd1e4b576fd commit: 37a9949c0e16fe3356b3db68a5b7bf3d3cdf53ce Author: David Seifert gentoo org> AuthorDate: Sun Apr 7 13:19:20 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 7 13:19:20 2019 +0000 URL: https://gitweb.gentoo.org/proj/ufed.git/commit/?id=37a9949c Modernize Autotools Signed-off-by: David Seifert gentoo.org> Makefile.am | 30 +++++++++++++++--------------- configure.ac | 22 +++++++++------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 954f36b..f8f5999 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,4 @@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PERL = @PERL@ -perldir = @datadir@/@PACKAGE@ +perldir = $(pkgdatadir) E_PREFIX := $(shell portageq envvar EPREFIX 2>/dev/null) sbin_SCRIPTS = ufed @@ -26,21 +24,23 @@ noinst_HEADERS = \ dist_man_MANS = ufed.8 EXTRA_DIST = ufed.pl.in ufed.8.in -ufed: ufed.pl.in - rm -f $@.tmp - sed \ +ufed: $(top_srcdir)/ufed.pl.in + cd $(top_srcdir) && \ + rm -f ufed.tmp && \ + $(SED) \ -e 's|XX_PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|XX_PERL[@]|$(PERL)|g' \ -e 's|XX_pkglibexecdir[@]|$(pkglibexecdir)|g' \ -e 's|XX_perldir[@]|$(perldir)|g' \ - $< >$@.tmp - chmod +x $@.tmp - mv $@.tmp $@ + ufed.pl.in >ufed.tmp && \ + chmod +x ufed.tmp && \ + mv ufed.tmp ufed -ufed.8: ufed.8.in - rm -f $@.tmp - sed \ +ufed.8: $(top_srcdir)/ufed.8.in + cd $(top_srcdir) && \ + rm -f ufed.8.tmp && \ + $(SED) \ -e 's|@GENTOO_PORTAGE_EPREFIX@|$(E_PREFIX)|g' \ - $< >$@.tmp - chmod +x $@.tmp - mv $@.tmp $@ + ufed.8.in >ufed.8.tmp && \ + chmod +x ufed.8.tmp && \ + mv ufed.8.tmp ufed.8 diff --git a/configure.ac b/configure.ac index a3308b9..736d06a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,23 +1,19 @@ -AC_PREREQ(2.68) +AC_PREREQ([2.69]) AC_INIT([ufed],[git],[https://bugs.gentoo.org/]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_SRCDIR([ufed-curses.c]) AC_CONFIG_HEADERS([config.h]) AC_PROG_CC AC_PROG_CC_C99 -if test "$ac_cv_prog_cc_c99" != no -then - CFLAGS="$CFLAGS -Wall -Wextra -pedantic" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" -else - AC_PROG_CC_C89 - AC_C_INLINE - CFLAGS="$CFLAGS -Wall -W" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" -fi -CFLAGS="${CFLAGS} -Wmissing-prototypes -Wstrict-prototypes" +AS_IF([test "x$ac_cv_prog_cc_c99" = "xno"], [ + AC_MSG_ERROR([ufed requires a C99 capable compiler!]) +]) + +CPPFLAGS="${CPPFLAGS} -D_XOPEN_SOURCE=600" +CFLAGS="${CFLAGS} -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -pedantic" +AC_PROG_SED PKG_PROG_PKG_CONFIG AC_TYPE_SIZE_T