--- xscreensaver-4.09/configure 2003-03-17 22:29:59.000000000 +0000 +++ xscreensaver-4.09/configure 2003-05-23 09:36:55.000000000 +0100 @@ -19592,36 +19592,6 @@ # M4 sucks!! -rpmv=`(rpm -qv xscreensaver) 2>/dev/null | \ - sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'` - - -if test \! -z "$rpmv" ; then - rpmbdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` - rpmhdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/attraction$@\1@p'` - - warning=no - warnL "There is already an installed RPM of xscreensaver $rpmv" - warn2 "on this system. You might want to remove it (with" - warn2 '"rpm -ve xscreensaver") before running "make install"' - warn2 "from this directory." - echo "" - warn2 "Alternately, you could build this version of xscreensaver" - warn2 'as an RPM, and then install that. An "xscreensaver.spec"' - warn2 "file is included. See the RPM documentation for more info." - echo "" - - if test "$rpmbdir" = "$rpmhdir" ; then - warn2 "The RPM version was installed in $rpmbdir/." - else - warn2 "The RPM version was installed in $rpmbdir/," - warn2 "with demos in $rpmhdir/." - fi - - do_dir_warning=yes -fi - - if test "${bindir}" = "${HACKDIR}" ; then do_dir_warning=yes fi