X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fstage4-install;h=73f2c71b4f8b671c65f61be59287c34d49ce7333;hb=2ad910e22979500192ea43d5599ad003440744a4;hp=ffb51b1d71fc87ae04e383187bfd66974f5f915f;hpb=00e8a130828a360dd654ff76cade992d846fc059;p=hvlinux.git

diff --git a/stage4/stage4-install b/stage4/stage4-install
index ffb51b1..73f2c71 100755
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -30,6 +30,21 @@ export XORG_CONFIG="\
 
 LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
 
+# Arg #1: module name and version
+# Arg #2: subdirectory
+# Arg #3: optional configure arguments
+ipkg_xorg()
+{
+    local MODULE=${1}
+    local SUBDIR=${2}
+    shift 2
+    local CONFIGURE_OPTS=${*}
+
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
+    ipkg_ac ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
+}
+
 # Install all submodules in a module
 #
 # Arg #1: module name and version
@@ -44,8 +59,7 @@ install_xorg_modules()
 
     local MY_XORG_CONFIG
 
-    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE}.wget); do
-        LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${MODULE_NAME}
+    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do
         SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
 
         # Special configure options for specific packages
@@ -56,23 +70,22 @@ install_xorg_modules()
             libX11-[0-9]* )
                 MY_XORG_CONFIG="--without-xcb"
                 ;;
-            xf86-video-s3-[0-9]* | xf86-video-xgi-[0-9]* )
-                #for file in `grep -Rl "xf86Version.h" *`; do
-                #    sed 's@xf86Version.h@xorgVersion.h@g' -i "$file"
-                #done
-                #;;
+            libXt-[0-9]* )
+                MY_XORG_CONFIG="--with-appdefaultdir=/etc/X11/app-defaults"
+                ;;
+            xinit-[0-9]* )
+                MY_XORG_CONFIG="--with-xinitdir=/etc/X11/app-defautls"
+                ;;
         esac
 
-        ipkg_ac ${SUBMOD} ${XORG_CONFIG} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+        ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
     done
-
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
 }
 
 install_xorg_modules ${XORG_PROTO}
 install_xorg_modules ${XORG_UTIL}
-ipkg_ac   ${LIBXAU} ${XORG_CONFIG}
-ipkg_ac   ${LIBXDMCP} ${XORG_CONFIG}
+ipkg_xorg ${LIBXAU} "lib"
+ipkg_xorg ${LIBXDMCP} "lib"
 install_xorg_modules ${XORG_LIB}
 ipkg_cust ${LESSTIF} cis-lesstif \
     --sysconfdir=/etc/X11 \
@@ -82,18 +95,17 @@ ipkg_cust ${LESSTIF} cis-lesstif \
     --with-xdnd \
     --x-includes=$XORG_PREFIX/include \
     --x-libraries=$XORG_PREFIX/lib
-ipkg_ac   ${XBITMAPS} ${XORG_CONFIG}
+ipkg_xorg ${XBITMAPS} "data"
 ipkg_ac   ${LIBPTHREAD_STUBS}
 ipkg_ac   ${LIBDRM} --enable-udev
 ipkg_cust ${MESALIB} cis-mesalib --enable-motif
 install_xorg_modules ${XORG_APP}
-ipkg_ac   ${XCURSOR_THEMES} ${XORG_CONFIG}
+ipkg_xorg ${XCURSOR_THEMES} "data"
 install_xorg_modules ${XORG_FONT}
 rscr once "Configuring fonts" configure-fonts
 ipkg_ac   ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_ac   ${LUIT} ${XORG_CONFIG}
+ipkg_xorg ${LUIT} "app"
 ipkg_ac   ${PIXMAN}
-
 ipkg_ac   ${LIBFFI}
 ipkg_cust ${DBUS} cis-dbus
 ipkg_cust ${GLIB} cis-glib --with-pcre=system
@@ -112,15 +124,18 @@ ipkg_cust ${POLICYKIT} cis-policykit
 ipkg_cust ${HAL} cis-hal
 ipkg_ac   ${HAL_INFO}
 
-ipkg_ac   ${XORG_SERVER} ${XORG_CONFIG} "\
+ipkg_xorg ${XORG_SERVER} "xserver" "\
     --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
-    --enable-install-setuid"
+    --enable-install-setuid \
+    --disable-config-hal"
 
 # newport, vmware, and xgixp drivers cause Xorg -configure to hang
-# To fix this problrem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
+# To fix this problem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
 install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules
 
+ipkg_xorg ${XDM} "app"
+
 rscr once "Configuring X.org" configure-xorg
 
 ipkg_cust ${XTERM} cis-xterm ${XORG_CONFIG}
@@ -132,7 +147,7 @@ ipkg_cust ${TK}  cis-tk
 # Re-installing python now that tk is present???
 ipkg_ac   ${PYTHON} "--enable-shared"
 
-ipkg_ac   ${WINDOWMAKER} --with-gnustepdir=/usr/share/GNUstep
+ipkg_cust ${WINDOWMAKER} cis-windowmaker
 ipkg_ac   ${WINDOWMAKER_EXTRA}
 
 #source /etc/profile