commit 76e07ef6911734eac418e399b114f1b544512736 cause "Warning: locale not supported by Xlib, locale set to C"

[Jeff Chua]

commit 76e07ef6911734eac418e399b114f1b544512736 cause "Warning: locale not 
supported by Xlib, locale set to C". Starting X will cause this warning on 
the console. Might be just fvwm that can't handle this, but Xterm takes a 
long time to come up and can't "paste" using the mouse. Reverting the 
commit solves the problem.

Perhaps XORG_PROG_RAWCPP is still required in configure.ac ?

Thanks,
Jeff

commit 76e07ef6911734eac418e399b114f1b544512736
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Fri Aug 6 14:01:51 2010 -0400

      man: using the C preprocessor is not required for man pages.

     There were no special symbols needing cpp.
     Everything can be handled by the default MAN_SUBSTS in util-macros.

     Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/configure.ac b/configure.ac
index f029a6f..ab86787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,6 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
  fi
  AC_SUBST(LDFLAGS_FOR_BUILD)

-XORG_PROG_RAWCPP
-
  # Find perl for "make check" tests in nls/localerules.in
  AC_ARG_WITH(perl,
  	AC_HELP_STRING([--with-perl=<path>],
diff --git a/man/Makefile.am b/man/Makefile.am
index 831067b..c6ad63f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,3 @@
-# Have to fake out automake by calling our man pages "DATA" since "MANS" won't
-# accept .3x as a valid man page suffix
-
  SUBDIRS = xkb

  libmandir = $(LIB_MAN_DIR)
@@ -198,8 +195,6 @@ filemandir = $(FILE_MAN_DIR)
  fileman_PRE = Compose.man
  FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)

-# What we actually install 
-
  if MANPAGES
  libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
  	      $(all_shadows:=. at LIB_MAN_SUFFIX@)
@@ -212,24 +207,13 @@ EXTRA_DIST = $(libman_PRE) $(fileman_PRE)

  CLEANFILES = $(libman_DATA) $(fileman_DATA)

-include $(top_srcdir)/cpprules.in
-
-SUFFIXES += .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
-
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
-	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
-	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
-	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
-	-D__xlocaledir__="$(X11_LOCALEDATADIR)" \
-	-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
+SUFFIXES = .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man

-CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
+MAN_SUBSTS += -e 's|__xlocaledir__|$(X11_LOCALEDATADIR)|g'

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
  .man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX):
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

  # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
  all_shadows =                                \
diff --git a/man/xkb/Makefile.am b/man/xkb/Makefile.am
index d5186e7..68aab8f 100644
--- a/man/xkb/Makefile.am
+++ b/man/xkb/Makefile.am
@@ -1,6 +1,3 @@
-# Have to fake out automake by calling our man pages "DATA" since "MANS" won't
-# accept .3x as a valid man page suffix
-
  libmandir = $(LIB_MAN_DIR)

  LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
@@ -207,8 +204,6 @@ libman_PRE = \
  	XkbUpdateMapFromCore.man                \
  	XkbVirtualModsToReal.man

-# What we actually install 
-
  if MANPAGES
  libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
  endif
@@ -217,18 +212,8 @@ EXTRA_DIST = $(libman_PRE)

  CLEANFILES = $(libman_DATA)

-include $(top_srcdir)/cpprules.in
-
-SUFFIXES += .$(LIB_MAN_SUFFIX) .man
-
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
-	-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
-
-CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
  .man.$(LIB_MAN_SUFFIX):
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
-
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@