diff options
| author | Matthew Thode <mthode@mthode.org> | 2013-03-10 12:04:02 -0700 |
|---|---|---|
| committer | Matthew Thode <mthode@mthode.org> | 2013-03-10 12:04:02 -0700 |
| commit | 15cad0e19bc6e79fe70b23b1b0f076ab23d4d7a4 (patch) | |
| tree | a822a16a2d75ff6f6ac801f368474db14fba5f25 | |
| parent | 5cdd4e3c93b6042d0d2b0659e3d8115fab9dbce8 (diff) | |
| parent | 489ca457ea0b357530842b14145d438724a6d1f3 (diff) | |
Merge pull request #51 from gentoo/issue50
Only check for gperf if --enable-keymap
reviewed by me
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index fc958c7368..8b46ae6083 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,6 @@ AC_PROG_MAKE_SET AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) -AC_PATH_TOOL(GPERF, gperf) -if test -z "$GPERF" ; then - AC_MSG_ERROR([*** gperf not found]) -fi # Checks for header files. AC_CHECK_HEADERS( @@ -224,8 +220,16 @@ AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"]) # ------------------------------------------------------------------------------ AC_ARG_ENABLE([keymap], - AS_HELP_STRING([--disable-keymap], [disable keymap fixup support @<:@default=enabled@:>@]), - [], [enable_keymap=yes]) + AS_HELP_STRING([--disable-keymap], [disable keymap fixup support @<:@default=enabled@:>@]), + [], [enable_keymap=yes]) + +if test "x$enable_keymap" = "xyes"; then + AC_PATH_TOOL(GPERF, gperf) + if test -z "$GPERF" ; then + AC_MSG_ERROR([*** gperf not found]) + fi +fi + AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"]) # ------------------------------------------------------------------------------ |