Mostly straightforward addition of new xcb/util-* submodules, but util-common-m4 needs special handling since it doesn't have the usual autoconfery, just needs to be found in the aclocal path when autoconfing the other xcb/util* modules.
Signed-off-by: Alan Coopersmith <[email protected]> --- build.sh | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index f9e8b29..bf7c93e 100755 --- a/build.sh +++ b/build.sh @@ -213,9 +213,9 @@ checkfortars() { module="xcb/libxcb" component="libxcb" ;; - "util") - module="xcb/util" - component="xcb-util" + util*) + module="xcb/$component" + component="xcb-$component" ;; esac ;; @@ -363,6 +363,8 @@ process() { if [ -f $module/$component/autogen.sh ]; then SRCDIR="$module/$component" CONFCMD="autogen.sh" + elif [ X"$component" = Xutil-common-m4 ] && [ -f $module/$component/xcb_util_common.m4 ] ; then + SRCDIR="$module/$component" elif [ X"$CLONE" != X ]; then clone $module $component if [ $? -eq 0 ]; then @@ -419,6 +421,15 @@ process() { fi fi + # xcb/util-common-m4 doesn't have configure or Makefile, just macros that + # the other xcb/util* modules need to find in ACLOCAL + if [ X"$component" = Xutil-common-m4 ]; then + echo linking *.m4 into ${ACLOCAL_LOCALDIR} + ln -sf `pwd`/*.m4 ${ACLOCAL_LOCALDIR} + cd $old_pwd + return 0 + fi + # Build outside source directory if [ X"$DIR_ARCH" != X ] ; then mkdir -p "$DIR_ARCH" @@ -637,7 +648,12 @@ build_lib() { build lib libXdmcp build xcb pthread-stubs build xcb libxcb + build xcb util-common-m4 build xcb util + build xcb util-image + build xcb util-keysyms + build xcb util-renderutil + build xcb util-wm build lib libX11 build lib libXext case $HOST_OS in -- 1.7.3.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
