diff options
| author | TingPing <tingping@tingping.se> | 2015-04-22 22:11:31 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2015-04-22 22:54:30 -0400 |
| commit | 73d865b243a1d5a2d2d9ed308de83e705ad38d9d (patch) | |
| tree | 1b148b7533c2ad4db098fe22c2b9ccc9a5654273 | |
| parent | a3c257bdb4800136e40bc707651d68b6aa8cc7b8 (diff) | |
configure: Better handling of missing pkgconfig
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/ax_require_defined.m4 | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 82e1022a..c731b392 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,7 @@ AM_SILENT_RULES([yes]) AX_IS_RELEASE([minor-version]) AX_CHECK_ENABLE_DEBUG([yes]) +AX_REQUIRE_DEFINED([PKG_PROG_PKG_CONFIG]) AC_USE_SYSTEM_EXTENSIONS AM_MAINTAINER_MODE([enable]) @@ -27,6 +28,7 @@ AM_PROG_AR LT_PREREQ([2.2.6]) LT_INIT([disable-static]) AC_PATH_PROG(MDTOOL, mdtool, no) +PKG_PROG_PKG_CONFIG dnl ----------------------------------------------------------- dnl Language Support diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 new file mode 100644 index 00000000..cae11112 --- /dev/null +++ b/m4/ax_require_defined.m4 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED |