configure exits with error if
- USA_RESIDENT=YES and - imake-4 assumes HasXdmAuth=YES and - Wraphelp.c can't be found.
This commit is contained in:
parent
2a68afcbbd
commit
2fceaeca3d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=52671
@ -50,26 +50,34 @@ configure () {
|
||||
echo "#define BuildServersOnly YES" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
@ -50,26 +50,34 @@ configure () {
|
||||
echo "#define BuildServersOnly YES" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
@ -100,29 +100,34 @@ END
|
||||
echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
|
||||
echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
|
||||
fi
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
35
x11-servers/XFree86-4-Server/scripts/configure
vendored
35
x11-servers/XFree86-4-Server/scripts/configure
vendored
@ -100,29 +100,34 @@ END
|
||||
echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
|
||||
echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
|
||||
fi
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
@ -50,26 +50,34 @@ configure () {
|
||||
echo "#define BuildServersOnly YES" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
35
x11/XFree86-4-clients/scripts/configure
vendored
35
x11/XFree86-4-clients/scripts/configure
vendored
@ -72,29 +72,34 @@ configure () {
|
||||
echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
|
||||
echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
|
||||
fi
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
34
x11/XFree86-4-libraries/scripts/configure
vendored
34
x11/XFree86-4-libraries/scripts/configure
vendored
@ -74,29 +74,33 @@ configure () {
|
||||
echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
|
||||
|
||||
# Check Wraphelp.c
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
cpwh=NO
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
|
||||
if [ $HasXdmAuth = DEFAULT ]; then
|
||||
HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
cpwh=NO
|
||||
if [ $HasXdmAuth = YES ]; then
|
||||
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
|
||||
if [ -f $WH ] ; then
|
||||
cpwh=SOURCE
|
||||
elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
|
||||
cpwh=$DISTDIR/xc/Wraphelp.c
|
||||
else
|
||||
echo "==> You must fetch USA-legal Wraphelp.c manually"
|
||||
echo "==> and put it to ${DISTDIR}/xc/."
|
||||
exit 1
|
||||
fi
|
||||
if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
|
||||
tr -d '\r' < $cpwh > $WH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copy ORIGDEF to DESTDEF
|
||||
rm -f $DESTDEF
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
if [ $cpwh = NO ] ; then
|
||||
grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
|
||||
echo "#define HasXdmAuth NO" >> $DESTDEF
|
||||
else
|
||||
if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
|
||||
echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
|
||||
fi
|
||||
cp -f $ORIGDEF $DESTDEF
|
||||
echo "#define HasXdmAuth YES" >> $DESTDEF
|
||||
fi
|
||||
|
||||
# copy generated config to host.def
|
||||
|
Loading…
Reference in New Issue
Block a user