[patch] files/xscreensaver-4.22-configure.patch

xscreensaver-4.22-configure.patch (text/plain), 1.55 KB, created by Octavio Ruiz (Ta^3) on 2005-06-23 17:43:25 UTC

--- configure.orig	2005-06-23 15:47:02.000000000 -0500
+++ configure	2005-06-23 16:41:34.000000000 -0500
@@ -14728,7 +14728,7 @@
 # Check for the various Gnome help and URL loading programs.
 #
 if test "$have_gtk" = yes; then
-  for ac_prog in gnome-open
+  for ac_prog in gnome-terminal
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -21519,34 +21519,6 @@
 
   # M4 sucks!!
 
-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
-        head -1`
-
-
-  if test \! -z "$rpmv" ; then
-    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
-    rpmhdir=`rpm -ql $rpmnames | 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 ("rpm -ve")'
-    warn2 'before running "make install" in 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.  Try "rpmbuild -v -ba xscreensaver.spec".'
-    warn2 "See the RPM documentation for more info."
-    echo ""
-
-    if test "$rpmbdir" = "$rpmhdir" ; then
-      warn2 "The RPM version was installed in $rpmbdir/."
-      do_dir_warning=yes
-    else
-      warn2 "The RPM version was installed in $rpmbdir/,"
-      warn2 "with demos in $rpmhdir/."
-    fi
-  fi
 fi
 
 if test "${bindir}" = "${HACKDIR}" ; then