Commit 41664ba237e073efe16d88e7ff6593677b6ce6c3
2010-12-07T14:32:57
config: remove PKG_PROG_PKG_CONFIG test 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. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
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