Enable loadable i18n modules, making them configurable on the configure command line.

Clean up conditionals for XKB, XCMS, XLOCALEDIR
Create new lib directory for locale modules in ${X11_LIBDIR}/locale/lib. Add this to the default XLOCALEDIR search path.
Create separate X11_LOCALEDATADIR variable pointing at ${datadir}/X11/locale for installing locale data.
Split out xcms, xkb, xlibi18n sources from main xlib bits so they can be conditionally included more easily. Lots of source files have been moved with this step; the result seems like it might be easier to maintain.
Display message at end of configure script with selected options.
Fix manual building with cpp to add -traditional in cpprules.in. This isn't conditionalized at all, so it will break on systems not using GNU cpp.

1 files changed, 157 insertions, 321 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1b7f1104..d27fb3a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,271 +1,122 @@
-SUBDIRS=util
+SUBDIRS=util xcms xlibi18n xkb
 
 lib_LTLIBRARIES=libX11.la
 
 BUILT_SOURCES=ks_tables.h
 CLEANFILES=ks_tables.h ks_tables_h
 
-AM_CFLAGS=		\
-                 -I$(top_srcdir)/include \
-		 -I$(top_srcdir)/include/X11 \
-		 -I$(top_builddir)/include \
-		 -I$(top_builddir)/include/X11 \
-		 $(X11_CFLAGS) \
-		 $(BIGREQS_CFLAGS) \
-		 $(XDMCP_CFLAGS) \
-		 -DX11_DATADIR='"@X11_DATADIR@"' \
-                 -D_BSD_SOURCE
+AM_CFLAGS= \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGREQS_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
 
-libX11_la_LDFLAGS = -version-number 6:2:1 -no-undefined
+#
+# =============================== I18N =============================
+#
+
+I18N_LIBS = \
+	xlibi18n/libi18n.la
+
+#
+# =============================== XCMS =============================
+#
 
-libX11_la_LIBADD = $(X11_LIBS) $(BIGREQS_LIBS) $(XDMCP_LIBS)
+XCMS_LIBS = \
+	xcms/libxcms.la
 
-XCMS_SRCS= \
-		  AddDIC.c \
-                  AddSF.c \
-                  CCC.c \
-                  CvColW.c \
-                  CvCols.c \
-                  Cv.h \
-                  HVC.c \
-                  HVCGcC.c \
-                  HVCGcV.c \
-                  HVCGcVC.c \
-                  HVCMnV.c \
-                  HVCMxC.c \
-                  HVCMxV.c \
-                  HVCMxVC.c \
-                  HVCMxVs.c \
-                  HVCWpAj.c \
-                  IdOfPr.c \
-                  LRGB.c \
-                  Lab.c \
-                  LabGcC.c \
-                  LabGcL.c \
-                  LabGcLC.c \
-                  LabMnL.c \
-                  LabMxC.c \
-                  LabMxL.c \
-                  LabMxLC.c \
-                  LabWpAj.c \
-                  Luv.c \
-                  LuvGcC.c \
-                  LuvGcL.c \
-                  LuvGcLC.c \
-                  LuvMnL.c \
-                  LuvMxC.c \
-                  LuvMxL.c \
-                  LuvMxLC.c \
-                  LuvWpAj.c \
-                  OfCCC.c \
-                  PrOfId.c \
-                  QBlack.c \
-                  QBlue.c \
-                  QGreen.c \
-                  QRed.c \
-                  QWhite.c \
-                  QuCol.c \
-                  QuCols.c \
-                  SetCCC.c \
-                  SetGetCols.c \
-                  StCol.c \
-                  StCols.c \
-                  UNDEFINED.c \
-                  XRGB.c \
-                  XYZ.c \
-                  cmsAllCol.c \
-                  cmsAllNCol.c \
-                  cmsCmap.c \
-                  cmsColNm.c \
-                  cmsGlobls.c \
-                  cmsInt.c \
-                  cmsLkCol.c \
-                  cmsMath.c \
-                  cmsProp.c \
-                  cmsTrig.c \
-                  uvY.c \
-                  xyY.c \
-                  Xcmsint.h
+#
+# =============================== XKB ==============================
+#
 
-XI18N_SRCS=\
-		  xim_trans.c \
-                  ICWrap.c \
-                  IMWrap.c \
-                  XDefaultIMIF.c \
-                  XDefaultOMIF.c \
-                  XlcDL.c \
-                  XlcSL.c \
-                  imCallbk.c \
-                  imConv.c \
-                  imDefFlt.c \
-                  imDefIc.c \
-                  imDefIm.c \
-                  imDefLkup.c \
-                  imDispch.c \
-                  imEvToWire.c \
-                  imExten.c \
-                  imImSw.c \
-                  imInsClbk.c \
-                  imInt.c \
-                  imKStoUCS.c \
-                  imLcFlt.c \
-                  imLcGIc.c \
-                  imLcIc.c \
-                  imLcIm.c \
-                  imLcLkup.c \
-                  imLcPrs.c \
-                  imLcSIc.c \
-                  imRm.c \
-                  imRmAttr.c \
-                  imThaiFlt.c \
-                  imThaiIc.c \
-                  imThaiIm.c \
-                  imTrX.c \
-                  imTrans.c \
-                  imTransR.c \
-                  lcCT.c \
-                  lcCharSet.c \
-                  lcConv.c \
-                  lcDB.c \
-                  lcDefConv.c \
-                  lcDynamic.c \
-                  lcEuc.c \
-                  lcFile.c \
-                  lcGenConv.c \
-                  lcGeneric.c \
-                  lcInit.c \
-                  lcJis.c \
-                  lcPrTxt.c \
-                  lcPubWrap.c \
-                  lcPublic.c \
-                  lcRM.c \
-                  lcSjis.c \
-                  lcStd.c \
-                  lcTxtPr.c \
-                  lcUTF8.c \
-                  lcUTF8Load.c \
-                  lcUtil.c \
-                  lcWrap.c \
-                  mbWMProps.c \
-                  mbWrap.c \
-                  omDefault.c \
-                  omGeneric.c \
-                  omImText.c \
-                  omText.c \
-                  omTextEsc.c \
-                  omTextExt.c \
-                  omTextPer.c \
-                  omXChar.c \
-                  utf8WMProps.c \
-                  utf8Wrap.c \
-                  wcWrap.c \
-                  Xaixlcint.h \
-                  XimImSw.h \
-                  XimProto.h \
-                  XimThai.h \
-                  XimTrInt.h \
-                  XimTrX.h \
-                  XimTrans.h \
-                  Ximint.h \
-                  XimintL.h \
-                  XimintP.h \
-                  XlcGeneric.h \
-                  XlcPubI.h \
-                  XlcPublic.h \
-                  Xlcint.h \
-                  lcUniConv/armscii_8.h \
-                  lcUniConv/ascii.h \
-                  lcUniConv/big5.h \
-                  lcUniConv/big5_emacs.h \
-                  lcUniConv/cp1133.h \
-                  lcUniConv/cp1251.h \
-                  lcUniConv/cp1255.h \
-                  lcUniConv/cp1256.h \
-                  lcUniConv/gb2312.h \
-                  lcUniConv/georgian_academy.h \
-                  lcUniConv/georgian_ps.h \
-                  lcUniConv/iso8859_1.h \
-                  lcUniConv/iso8859_10.h \
-                  lcUniConv/iso8859_11.h \
-                  lcUniConv/iso8859_13.h \
-                  lcUniConv/iso8859_14.h \
-                  lcUniConv/iso8859_15.h \
-                  lcUniConv/iso8859_16.h \
-                  lcUniConv/iso8859_2.h \
-                  lcUniConv/iso8859_3.h \
-                  lcUniConv/iso8859_4.h \
-                  lcUniConv/iso8859_5.h \
-                  lcUniConv/iso8859_6.h \
-                  lcUniConv/iso8859_7.h \
-                  lcUniConv/iso8859_8.h \
-                  lcUniConv/iso8859_9.h \
-                  lcUniConv/iso8859_9e.h \
-                  lcUniConv/jisx0201.h \
-                  lcUniConv/jisx0208.h \
-                  lcUniConv/jisx0212.h \
-                  lcUniConv/koi8_c.h \
-                  lcUniConv/koi8_r.h \
-                  lcUniConv/koi8_u.h \
-                  lcUniConv/ksc5601.h \
-                  lcUniConv/mulelao.h \
-                  lcUniConv/tatar_cyr.h \
-                  lcUniConv/tcvn.h \
-                  lcUniConv/tis620.h \
-                  lcUniConv/ucs2be.h \
-                  lcUniConv/utf8.h \
-                  lcUniConv/viscii.h
+XKB_LIBS = \
+	xkb/libxkb.la
 
-X11_SRCS= \
+#
+# =============================== XLIB =============================
+#
+
+libX11_la_SOURCES = \
                   AllCells.c \
+                  AllowEv.c \
                   AllPlanes.c \
                   AutoRep.c \
+                  Backgnd.c \
                   BdrWidth.c \
+                  Bell.c \
                   Border.c \
                   ChAccCon.c \
+                  ChActPGb.c \
+                  ChClMode.c \
                   ChCmap.c \
                   ChGC.c \
                   ChKeyCon.c \
-                  ChProp.c \
-                  ChWAttrs.c \
                   ChkIfEv.c \
                   ChkMaskEv.c \
                   ChkTypEv.c \
                   ChkTypWEv.c \
                   ChkWinEv.c \
+                  ChPntCon.c \
+                  ChProp.c \
+                  ChSaveSet.c \
+                  ChWAttrs.c \
+                  ChWindow.c \
                   CirWin.c \
                   CirWinDn.c \
                   CirWinUp.c \
                   ClDisplay.c \
+                  ClearArea.c \
+                  Clear.c \
 		  Cmap.h \
+                  ConfWind.c \
+                  ConnDis.c \
                   Context.c \
+                  ConvSel.c \
+                  CopyArea.c \
                   CopyCmap.c \
                   CopyGC.c \
+                  CopyPlane.c \
                   CrBFData.c \
                   CrCmap.c \
                   CrCursor.c \
                   CrGC.c \
                   CrGlCur.c \
+                  Cr.h \
                   CrPFBData.c \
-                  ChSaveSet.c \
+                  CrPixmap.c \
                   CrWindow.c \
                   Cursor.c \
+                  DefCursor.c \
+                  DelProp.c \
                   Depths.c \
+                  DestSubs.c \
+                  DestWind.c \
                   DisName.c \
                   DrArc.c \
                   DrArcs.c \
+                  DrLine.c \
                   DrLines.c \
+                  DrPoint.c \
                   DrPoints.c \
                   DrRect.c \
                   DrRects.c \
                   DrSegs.c \
                   ErrDes.c \
                   ErrHndlr.c \
+                  evtomask.c \
                   EvToWire.c \
-                  FSSaver.c \
-                  FSWrap.c \
                   FetchName.c \
                   FillArc.c \
                   FillArcs.c \
+                  FillPoly.c \
                   FillRct.c \
                   FillRcts.c \
                   FilterEv.c \
@@ -273,8 +124,14 @@ X11_SRCS= \
                   Font.c \
                   FontInfo.c \
                   FontNames.c \
+                  FreeCmap.c \
+                  FreeCols.c \
+                  FreeCurs.c \
                   FreeEData.c \
                   FreeGC.c \
+                  FreePix.c \
+                  FSSaver.c \
+                  FSWrap.c \
                   GCMisc.c \
                   Geom.c \
                   GetAtomNm.c \
@@ -302,30 +159,44 @@ X11_SRCS= \
                   GetWAttrs.c \
                   GetWMCMapW.c \
                   GetWMProto.c \
+                  globals.c \
+                  GrButton.c \
                   GrKeybd.c \
+                  GrKey.c \
                   GrPointer.c \
+                  GrServer.c \
                   Host.c \
                   Iconify.c \
                   IfEvent.c \
-                  ImText.c \
+		  imConv.c \
                   ImText16.c \
+                  ImText.c \
                   ImUtil.c \
                   InitExt.c \
+                  InsCmap.c \
                   IntAtom.c \
                   KeyBind.c \
+                  Key.h \
                   KeysymStr.c \
+                  KillCl.c \
                   LiHosts.c \
                   LiICmaps.c \
                   LiProps.c \
                   ListExt.c \
                   LoadFont.c \
+                  LockDis.c \
+                  locking.c \
+                  locking.h \
                   LookupCol.c \
                   LowerWin.c \
                   Macros.c \
                   MapRaised.c \
+                  MapSubs.c \
+                  MapWindow.c \
                   MaskEvent.c \
                   Misc.c \
                   ModMap.c \
+                  MoveWin.c \
                   NextEvent.c \
                   OCWrap.c \
                   OMWrap.c \
@@ -337,13 +208,16 @@ X11_SRCS= \
                   PeekIfEv.c \
                   Pending.c \
                   PixFormats.c \
+                  PmapBgnd.c \
                   PmapBord.c \
+                  poly.h \
                   PolyReg.c \
-                  PolyTxt.c \
                   PolyTxt16.c \
+                  PolyTxt.c \
                   PropAlloc.c \
                   PutBEvent.c \
                   PutImage.c \
+                  Quarks.c \
                   QuBest.c \
                   QuColor.c \
                   QuColors.c \
@@ -356,182 +230,144 @@ X11_SRCS= \
                   QuTextExt.c \
                   QuTileShp.c \
                   QuTree.c \
-                  Quarks.c \
                   RaiseWin.c \
                   RdBitF.c \
                   RecolorC.c \
-                  ReconfWM.c \
                   ReconfWin.c \
+                  ReconfWM.c \
                   Region.c \
                   RegstFlt.c \
+                  RepWindow.c \
                   RestackWs.c \
                   RotProp.c \
                   ScrResStr.c \
+                  SelInput.c \
                   SendEvent.c \
                   SetBack.c \
-                  SetCRects.c \
                   SetClMask.c \
                   SetClOrig.c \
+                  SetCRects.c \
                   SetDashes.c \
-                  SetFPath.c \
                   SetFont.c \
                   SetFore.c \
+                  SetFPath.c \
                   SetFunc.c \
                   SetHints.c \
-                  SetLStyle.c \
+                  SetIFocus.c \
                   SetLocale.c \
+                  SetLStyle.c \
                   SetNrmHint.c \
                   SetPMask.c \
                   SetPntMap.c \
                   SetRGBCMap.c \
-                  SetStCmap.c \
+                  SetSOwner.c \
+                  SetSSaver.c \
                   SetState.c \
+                  SetStCmap.c \
                   SetStip.c \
-                  SetTSOrig.c \
                   SetTile.c \
+                  SetTSOrig.c \
                   SetTxtProp.c \
                   SetWMCMapW.c \
                   SetWMProto.c \
                   StBytes.c \
                   StColor.c \
                   StColors.c \
-                  StNColor.c \
                   StName.c \
+                  StNColor.c \
                   StrKeysym.c \
                   StrToText.c \
                   Sync.c \
                   Synchro.c \
-                  Text.c \
                   Text16.c \
-                  TextExt.c \
+                  Text.c \
                   TextExt16.c \
+                  TextExt.c \
                   TextToStr.c \
                   TrCoords.c \
                   UndefCurs.c \
+                  UngrabBut.c \
+                  UngrabKbd.c \
+                  UngrabKey.c \
+                  UngrabPtr.c \
+                  UngrabSvr.c \
+                  UninsCmap.c \
+                  UnldFont.c \
+                  UnmapSubs.c \
+                  UnmapWin.c \
                   VisUtil.c \
-                  WMGeom.c \
-                  WMProps.c \
-                  WinEvent.c \
+                  WarpPtr.c \
                   Window.c \
+                  WinEvent.c \
                   Withdraw.c \
+                  WMGeom.c \
+                  WMProps.c \
                   WrBitF.c \
-                  XlibAsync.c \
-                  XlibInt.c \
-                  Xrm.c \
-                  evtomask.c \
-                  globals.c \
-                  locking.c \
-                  Cr.h \
-                  Key.h \
+                  x11_trans.c \
                   Xatomtype.h \
                   Xintatom.h \
                   Xintconn.h \
+                  XlibAsync.c \
+                  XlibInt.c \
                   XomGeneric.h \
                   Xresinternal.h \
-                  XrmI.h \
-                  locking.h \
-                  poly.h 
+                  Xrm.c \
+                  XrmI.h
+
+#
+# ========================= Extra stuff ============================
+#
+
+if OS2
+libX11_la_SOURCES+=os2Stubs.c
+endif OS2
+
+if UDC
+libX11_la_SOURCES+=udcInf.c
+endif
 
 x11datadir = @X11_DATADIR@
 x11data_DATA = XKeysymDB XErrorDB
 
 EXTRA_DIST = \
-	$(X11_SRCS) \
-	$(XI18N_SRCS) \
-	$(XCMS_SRCS) \
-	$(x11data_DATA)
+	$(x11data_DATA) \
+	os2Stubs.c \
+	udcInf.c
 
-libX11_la_SOURCES = $(X11_SRCS)
+#
+# Figure out which sub-libraries to link into Xlib
+#
 
-libX11_la_SOURCES += \
-                  ConnDis.c \
-                  LockDis.c \
-                  AllowEv.c \
-                  Backgnd.c \
-                  Bell.c \
-                  ChActPGb.c \
-                  ChClMode.c \
-                  ChPntCon.c \
-                  ChWindow.c \
-                  Clear.c \
-                  ClearArea.c \
-                  ConfWind.c \
-                  ConvSel.c \
-                  CopyArea.c \
-                  CopyPlane.c \
-                  CrPixmap.c \
-                  DefCursor.c \
-                  DelProp.c \
-                  DestSubs.c \
-                  DestWind.c \
-                  DrLine.c \
-                  DrPoint.c \
-                  FillPoly.c \
-                  FreeCmap.c \
-                  FreeCols.c \
-                  FreeCurs.c \
-                  FreePix.c \
-                  GrButton.c \
-                  GrKey.c \
-                  GrServer.c \
-                  InsCmap.c \
-                  KillCl.c \
-                  MapSubs.c \
-                  MapWindow.c \
-                  MoveWin.c \
-                  PmapBgnd.c \
-                  RepWindow.c \
-                  SelInput.c \
-                  SetIFocus.c \
-                  SetSOwner.c \
-                  SetSSaver.c \
-                  UngrabBut.c \
-                  UngrabKbd.c \
-                  UngrabKey.c \
-                  UngrabPtr.c \
-                  UngrabSvr.c \
-                  UninsCmap.c \
-                  UnldFont.c \
-                  UnmapSubs.c \
-                  UnmapWin.c \
-                  WarpPtr.c \
-                  x11_trans.c
-
-if DISABLE_XLOCALE
-libX11_la_SOURCES+= #X18NCMSstubs.c 
-else
-libX11_la_SOURCES+= $(XI18N_SRCS)
+if XLOCALE
+USE_I18N_LIBS = $(I18N_LIBS)
 endif
 
-if DISABLE_XCMS
-if !DISABLE_XLOCALE
-libX11_la_SOURCES+= #X18NCMSstubs.c 
-endif
-else
-libX11_la_SOURCES+= $(XCMS_SRCS)
+if XCMS
+USE_XCMS_LIBS = $(XCMS_LIBS)
 endif
 
-if OS2
-libX11_la_SOURCES+=os2Stubs.c
-endif OS2
-
-if UDC
-libX11_la_SOURCES+=udcInf.c
+if XKB
+USE_XKB_LIBS = $(XKB_LIBS)
 endif
 
-if XKB
-libX11_la_SOURCES+=XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
-                  XKBGetByName.c XKBNames.c XKBRdBuf.c XKBSetMap.c XKBUse.c \
-                  XKBleds.c XKBBell.c XKBGeom.c XKBSetGeom.c XKBExtDev.c \
-                  XKBList.c XKBMisc.c \
-                  XKBMAlloc.c XKBGAlloc.c XKBAlloc.c \
-                  XKBlibint.h
-endif XKB
+libX11_la_LDFLAGS = -version-number 6:2:1 -no-undefined
+
+libX11_la_LIBADD = \
+	$(USE_I18N_LIBS) \
+	$(USE_XCMS_LIBS) \
+	$(USE_XKB_LIBS) \
+	$(X11_LIBS) \
+	$(BIGREQS_LIBS) \
+	$(XDMCP_LIBS)
 
 preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
 .c.ii:
 	$(COMPILE) -E -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
+#
+# Building ks_tables.h requires the makekeys utility
+#
+
 KEYSYMDEF=@KEYSYMDEF@
 
 ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)