[PATCH libxkbcommon 6/6] config: remove PKG_PROG_PKG_CONFIG test
Gaetan Nadon
memsize at videotron.ca
Tue Dec 7 13:41:27 PST 2010
If pkg-config is missing, the configuration fails while initializing
XORG_* macros:
warning: PKG_PROG_PKG_CONFIG is m4_require'd but not m4_defun'd
line 11622: PKG_PROG_PKG_CONFIG: command not found
The output is sufficient to locate the problem.
It is not possible, or very difficult, to not have pkg-config
installed as the whole desktop and countless other software
depends on it.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 920e1a2..4221c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,14 @@ AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
+# Require xorg-macros minimum of 1.8 for AM_SILENT_RULES
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+XORG_CHECK_MALLOC_ZERO
+
+# Check for programs
AC_PROG_LEX
AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC)
@@ -44,21 +52,6 @@ if test ! -f "src/xkbcomp/xkbparse.c"; then
fi
fi
-m4_ifndef([PKG_PROG_PKG_CONFIG],
- [m4_fatal([Could not locate the pkg-config autoconf macros.
- These are usually located in /usr/share/aclocal/pkg.m4. If your
- macros are in a different location, try setting the environment
- variable ACLOCAL="aclocal -I/other/macro/dir" before running
- autoreconf/autogen.sh.])])
-PKG_PROG_PKG_CONFIG
-
-# Require xorg-macros minimum of 1.8 for AM_SILENT_RULES
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
-XORG_DEFAULT_OPTIONS
-XORG_CHECK_MALLOC_ZERO
-
dnl Build native compiler needed for makekeys
AC_ARG_VAR([CC_FOR_BUILD], [Build native C compiler program])
if test "x$CC_FOR_BUILD" = x; then
--
1.6.0.4
More information about the xorg-devel
mailing list