From 5e2d7de6c2b68ddc812f236c229dfebe1652bb2d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Mar 2016 13:04:22 +1000 Subject: [PATCH 1/2] configure.ac: remove a couple of unused items This configure.ac is largely a copy from systemd so it included things that we don't use locally. - we don't use grep, awk or ln - AC_SYS_LARGEFILE and AC_CANONICAL_HOST are unecessary - pkg.m4 - if that's missing you don't have pkgconfig installed. stop trying to build things then :) Signed-off-by: Peter Hutterer --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configure.ac b/configure.ac index 6a05dbc2..fdc25805 100644 --- a/configure.ac +++ b/configure.ac @@ -15,11 +15,9 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_USE_SYSTEM_EXTENSIONS -AC_SYS_LARGEFILE AM_MAINTAINER_MODE([enable]) AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects parallel-tests]) AM_SILENT_RULES([yes]) -AC_CANONICAL_HOST AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.]) LT_PREREQ(2.2) @@ -28,16 +26,12 @@ LT_INIT([disable-static]) AC_PROG_MKDIR_P AC_PROG_LN_S AC_PROG_SED -AC_PROG_GREP -AC_PROG_AWK AC_PROG_CC_C99 AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) AM_PATH_PYTHON -AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) - # ------------------------------------------------------------------------------ # arguments @@ -119,12 +113,6 @@ AC_SUBST([OUR_CFLAGS], "$with_cflags") AC_SUBST([OUR_CPPFLAGS], "$with_cppflags") AC_SUBST([OUR_LDFLAGS], "$with_ldflags") -# ------------------------------------------------------------------------------ -# system features - -# This makes sure pkg.m4 is available. -m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) - # ------------------------------------------------------------------------------ # dependencies From 70222b3033c9704eebaf905e8096bda92ebdcf0e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Mar 2016 13:10:14 +1000 Subject: [PATCH 2/2] Use PKG_CHECK_VAR to check for the pkgdatadir Signed-off-by: Peter Hutterer --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fdc25805..fd8f8c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -120,8 +120,8 @@ PKG_CHECK_MODULES([LIBUDEV], [libudev]) PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd >= 227]) PKG_CHECK_MODULES([LIBRATBAG], [libratbag >= 0.2]) -libratbag_data_dir=`$PKG_CONFIG --variable pkgdatadir libratbag` -AC_DEFINE_UNQUOTED([LIBRATBAG_DATA_DIR], ["$libratbag_data_dir"], [Directory for libratbag's SVG files]) +PKG_CHECK_VAR([libratbag_data_dir], [libratbag], [pkgdatadir], + [AC_DEFINE_UNQUOTED([LIBRATBAG_DATA_DIR], ["$libratbag_data_dir"], [Directory for libratbag's SVG files])]) # ------------------------------------------------------------------------------ # options