summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ea3a959..27d74a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-02 21:47 svu
+
+ * configure.in: xmodmap support is built by default
+
2004-12-02 21:20 svu
* libxklavier/xklavier_xkb.c: Fix for compiling without
diff --git a/configure.in b/configure.in
index f695e6e..0579698 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,7 @@ AC_ARG_WITH( xmodmap_base,
AC_DEFINE_UNQUOTED(XMODMAP_BASE,"${xmodmap_base}",Base for xmodmap configuration)
save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$x_includes"
+CFLAGS="${CFLAGS} -I${x_includes}"
ac_xkblib_include="\
#include <stdio.h>
@@ -105,7 +105,7 @@ AM_CONDITIONAL(ENABLE_XKB_SUPPORT, test "$enable_xkb_support" = "yes")
AC_ARG_ENABLE(xmm-support,
[ --enable-xmm-support Enable xmodmap support],
-, enable_xmm_support=no)
+, enable_xmm_support=yes)
AM_CONDITIONAL(ENABLE_XMM_SUPPORT, test "$enable_xmm_support" = "yes")