From 663e5de109c526de8cd76eb5e1d0f8a12197501c Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Thu, 23 Nov 1995 14:28:52 +0000 Subject: Move the physical copy of Wraphelp.c to after link-farm creation. This fixes the build for CDROM owners. Reviewed by: jmz --- x11-servers/XFree86-4-Server-snap/scripts/configure | 9 +++++++-- x11-servers/XFree86-4-Server/scripts/configure | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'x11-servers') diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index de92d9f9caba..5379793cdc59 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -121,14 +121,15 @@ yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] " if [ $answ = YES ]; then WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c + cpwh=NO if [ -f $WH ] ; then echo "==> $WH found in source distribution." elif [ -f $X11FIXES/Wraphelp.c ] ; then echo "==> Wraphelp.c found in fix directory, copying to source tree." - cp $X11FIXES/Wraphelp.c $WH + cpwh=$X11FIXES/Wraphelp.c elif [ -f $FILESDIR/Wraphelp.c ] ; then echo "==> Wraphelp.c found in files directory, copying to source tree." - cp $FILESDIR/Wraphelp.c $WH + cpwh=$FILESDIR/Wraphelp.c else echo "==> Wraphelp.c not found, DES support NOT enabled." answ=NO @@ -222,6 +223,10 @@ else configure fi +if [ $cpwh != NO ]; then + cp $cpwh $WH +fi + echo -n "==> applying XC patches" ok=0 for i in 01 02 03 04 05 06 07 08 09 10 11 12; do diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index de92d9f9caba..5379793cdc59 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -121,14 +121,15 @@ yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] " if [ $answ = YES ]; then WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c + cpwh=NO if [ -f $WH ] ; then echo "==> $WH found in source distribution." elif [ -f $X11FIXES/Wraphelp.c ] ; then echo "==> Wraphelp.c found in fix directory, copying to source tree." - cp $X11FIXES/Wraphelp.c $WH + cpwh=$X11FIXES/Wraphelp.c elif [ -f $FILESDIR/Wraphelp.c ] ; then echo "==> Wraphelp.c found in files directory, copying to source tree." - cp $FILESDIR/Wraphelp.c $WH + cpwh=$FILESDIR/Wraphelp.c else echo "==> Wraphelp.c not found, DES support NOT enabled." answ=NO @@ -222,6 +223,10 @@ else configure fi +if [ $cpwh != NO ]; then + cp $cpwh $WH +fi + echo -n "==> applying XC patches" ok=0 for i in 01 02 03 04 05 06 07 08 09 10 11 12; do -- cgit v1.2.3