diff options
Diffstat (limited to 'x11/XFree86/scripts/configure')
-rw-r--r-- | x11/XFree86/scripts/configure | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index 371de6289885..44af2053f22c 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/scripts/configure @@ -30,7 +30,8 @@ noyes() { esac done } -F=$WRKDIR/.config +F=$WRKDIR/config +WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c configure () { rm -f $F @@ -354,8 +355,6 @@ END yesno "Do you want to enable XDM-AUTHORIZATION-1 support?" cpwh=NO if [ $answ = YES ]; then - WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c - if [ -f $WH ] ; then echo "==> $WH found in source distribution." elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then @@ -387,7 +386,15 @@ echo "End of configuration questions. No more user input required" echo } -configure +if [ ! -r $F ]; then + configure +elif grep 'HasXdmAuth.*YES' $F >/dev/null; then + for i in $DISTDIR/xc $FILESDIR; do + if [ -r $i/Wraphelp.c ]; then + cpwh=$i/Wraphelp.c + fi + done +fi if [ X$cpwh != XNO ]; then tr -d '\r' < $cpwh > $WH |