From 341b113254e455135aa872c8620cc0518d67131b Mon Sep 17 00:00:00 2001 From: Nathan Phillip Brink Date: Mon, 6 Jun 2011 22:34:40 -0400 Subject: [PATCH 2/2] Move to autoreconf -vfi in autogen.sh and add a check that libcurl.m4 is properly included in configure. Also sync the gettext version in AM_GNU_GETTEXT_VERSION to the version which used to be committed directly to the VCS. --- autogen.sh | 11 +++++++---- configure.ac | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/autogen.sh b/autogen.sh index be50be6..90c26d2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,9 @@ #!/bin/sh -xu -aclocal -I m4 --install -autoheader -automake --foreign -autoconf +rm -f m4/*.m4 +autoreconf -vfi || exit 1 + +if grep -qe LIBCURL_CHECK_CONFIG configure; then + echo "You need to install net-misc/curl to get libcurl.m4." >&2 + exit 1 +fi diff --git a/configure.ac b/configure.ac index 12f36be..3baae5d 100644 --- a/configure.ac +++ b/configure.ac @@ -54,10 +54,11 @@ m4_define([pacman_version], # Autoconf initialization AC_INIT([pacman], [pacman_version], [pacman-dev@archlinux.org]) AC_CONFIG_SRCDIR([config.h.in]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign -Wall]) LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" @@ -134,7 +135,7 @@ AC_PATH_PROGS([BASH_SHELL], [bash bash4 bash3], [false]) # find installed gettext AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.13.1) +AM_GNU_GETTEXT_VERSION([0.18]) AC_CHECK_LIB([m], [fabs], , AC_MSG_ERROR([libm is needed to compile pacman!])) -- 1.7.3.4