Minor fix for xmodmap, more info at the end of the configure script

5 files changed, 33 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index c358a1b..641f77a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-30 svu
+
+	* libxklavier/xklavier.c, libxklavier/xklavier_config_xmm.c,
+	libxklavier/Makefile.am, configure.in: Small fix for xmodmap,
+	configure script gives more info about the configuration, at the end.
+
 2006-06-04 svu
 
 	* libxklavier/xklavier_props.c: fixed default options handling,
diff --git a/configure.in b/configure.in
index 9b5641d..dc2b819 100644
--- a/configure.in
+++ b/configure.in
@@ -75,6 +75,13 @@ AC_ARG_WITH( xkb_default_ruleset,
 
 AC_DEFINE_UNQUOTED(XKB_DEFAULT_RULESET,"${xkb_default_ruleset}",Default XKB set of rules)
 
+AC_ARG_WITH( xmodmap_default_ruleset,
+             [  --with-xmodmap-default-ruleset=RULES        Xmodmap default set of rules (by default it is base)],
+             xmodmap_default_ruleset="$withval", 
+             xmodmap_default_ruleset="base" )
+
+AC_DEFINE_UNQUOTED(XMODMAP_DEFAULT_RULESET,"${xmodmap_default_ruleset}",Default Xmodmap set of rules)
+
 AC_ARG_WITH( xmodmap_base,
              [  --with-xmodmap-base=DIR        xmodmap base path (by default it is /usr/share/xmodmap)],
              xmodmap_base="$withval", 
@@ -108,16 +115,16 @@ AC_ARG_ENABLE(xkb-support,
 
 AM_CONDITIONAL(ENABLE_XKB_SUPPORT, test "$enable_xkb_support" = "yes")
 
-AC_ARG_ENABLE(xmm-support, 
-[  --enable-xmm-support       Enable xmodmap support],
-, enable_xmm_support=yes)
+AC_ARG_ENABLE(xmodmap-support, 
+[  --enable-xmodmap-support       Enable xmodmap support],
+, enable_xmodmap_support=yes)
 
-AM_CONDITIONAL(ENABLE_XMM_SUPPORT, test "$enable_xmm_support" = "yes")
+AM_CONDITIONAL(ENABLE_XMODMAP_SUPPORT, test "$enable_xmodmap_support" = "yes")
 
 AC_MSG_CHECKING(whether at least one libxklavier backend is enabled)
 if test \( "$enable_xkb_support" == "yes" -a \
           "$libxkbfile_present" == "yes" \) -o \
-        "$enable_xmm_support" == "yes" ; then
+        "$enable_xmodmap_support" == "yes" ; then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
@@ -152,12 +159,15 @@ echo '**********************************************************'
 echo '  Libxklavier is configured with the following backends:'
 if test "$enable_xkb_support" == "yes" ; then
   if test "$libxkbfile_present" == "yes" ; then
-    echo '    XKB (libxkbfile is present)'
+    echo "    XKB, libxkbfile is present"
+    echo "         default ruleset: $xkb_default_ruleset"
+    echo "         base: $xkb_base"
   else
-    echo '    XKB (but libxkbfile is NOT present)'
+    echo "    XKB, libxkbfile is NOT present"
   fi
 fi
-if test "$enable_xmm_support" == "yes" ; then
-  echo '    xmodmap'
+if test "$enable_xmodmap_support" == "yes" ; then
+  echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
+  echo "             base: $xmodmap_base"
 fi
 echo '**********************************************************'
diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
index 7b38f51..b71e710 100644
--- a/libxklavier/Makefile.am
+++ b/libxklavier/Makefile.am
@@ -9,10 +9,10 @@ else
   ENABLE_XKB_SUPPORT_CFLAG = -DDISABLE_XKB_SUPPORT=1
 endif
 
-if ENABLE_XMM_SUPPORT
-  ENABLE_XMM_SUPPORT_CFLAG = -DENABLE_XMM_SUPPORT=1
+if ENABLE_XMODMAP_SUPPORT
+  ENABLE_XMODMAP_SUPPORT_CFLAG = -DENABLE_XMODMAP_SUPPORT=1
 else
-  ENABLE_XMM_SUPPORT_CFLAG = -DDISABLE_XMM_SUPPORT=1
+  ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1
 endif
 
 EXTRA_DIST=marshal.list
@@ -30,7 +30,7 @@ AM_CFLAGS=-Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
   $(XML_CFLAGS) $(GLIB_CFLAGS) \
   $(LIBXKBFILE_PRESENT_CFLAG) \
   $(ENABLE_XKB_SUPPORT_CFLAG) \
-  $(ENABLE_XMM_SUPPORT_CFLAG)
+  $(ENABLE_XMODMAP_SUPPORT_CFLAG)
 
 lib_LTLIBRARIES = libxklavier.la
 noinst_HEADERS = xklavier_private.h xklavier_private_xkb.h xklavier_private_xmm.h
diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c
index f7106eb..2b1ceb0 100644
--- a/libxklavier/xklavier.c
+++ b/libxklavier/xklavier.c
@@ -632,9 +632,9 @@ xkl_engine_constructor(GType type,
 	xkl_debug(150, "Trying XKB backend\n");
 	rv = xkl_xkb_init(engine);
 #endif
-#ifdef ENABLE_XMM_SUPPORT
+#ifdef ENABLE_XMODMAP_SUPPORT
 	if (rv != 0) {
-		xkl_debug(150, "Trying XMM backend\n");
+		xkl_debug(150, "Trying xmodmap backend\n");
 		rv = xkl_xmm_init(engine);
 	}
 #endif
diff --git a/libxklavier/xklavier_config_xmm.c b/libxklavier/xklavier_config_xmm.c
index b18f851..f7f78b7 100644
--- a/libxklavier/xklavier_config_xmm.c
+++ b/libxklavier/xklavier_config_xmm.c
@@ -30,7 +30,8 @@ xkl_xmm_load_config_registry(XklConfigRegistry * config)
 	struct stat stat_buf;
 	gchar file_name[MAXPATHLEN] = "";
 	XklEngine *engine = xkl_config_registry_get_engine(config);
-	gchar *rf = xkl_engine_get_ruleset_name(engine, "");
+	gchar *rf =
+	    xkl_engine_get_ruleset_name(engine, XMODMAP_DEFAULT_RULESET);
 
 	if (rf == NULL || rf[0] == '\0')
 		return FALSE;