Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
Date: 2006-10-28
Initial Package Version: 2.16.1
Upstream Status: Unknown
Origin: Joe Ciccone
Description: The EXPANDED_LOGVIEWDIR variable isn't expanded properly.
             This patch changes the way it is expanded so that it will
             never end up equaling another variable or NONE.

diff -Naur gnome-utils-2.16.1.orig/configure gnome-utils-2.16.1/configure
--- gnome-utils-2.16.1.orig/configure	2006-10-02 17:06:02.000000000 -0400
+++ gnome-utils-2.16.1/configure	2006-10-28 18:51:48.000000000 -0400
@@ -29569,14 +29569,26 @@
 
 
 
+prefix_hold="$prefix"
+if test "x$prefix" = "xNONE"; then
+        prefix="$ac_default_prefix"
+fi
+
+exec_prefix_hold="$exec_prefix"
+if test "x$exec_prefix" = "xNONE"; then
+        exec_prefix='${prefix}'
+fi
+
 if test "x$enable_console_helper" = "xyes"; then
-	LOGVIEWDIR_TMP="$sbindir"
+        LOGVIEWDIR_TMP=`eval echo $sbindir`
 else
-	LOGVIEWDIR_TMP="$bindir"
+        LOGVIEWDIR_TMP=`eval echo $bindir`
 fi
 EXPANDED_LOGVIEWDIR=`eval echo $LOGVIEWDIR_TMP`
 
 
+prefix="$prefix_hold"
+exec_prefix="$exec_prefix_hold"
 
 
 # Extract the first word of "scrollkeeper-config", so it can be a program name with args.
diff -Naur gnome-utils-2.16.1.orig/configure.in gnome-utils-2.16.1/configure.in
--- gnome-utils-2.16.1.orig/configure.in	2006-10-02 16:59:09.000000000 -0400
+++ gnome-utils-2.16.1/configure.in	2006-10-28 18:49:41.000000000 -0400
@@ -418,14 +418,26 @@
 
 dnl This is where the binary actually resides,
 dnl not the console helper link
+prefix_hold="$prefix"
+if test "x$prefix" = "xNONE"; then
+        prefix="$ac_default_prefix"
+fi
+
+exec_prefix_hold="$exec_prefix"
+if test "x$exec_prefix" = "xNONE"; then
+        exec_prefix='${prefix}'
+fi
+
 if test "x$enable_console_helper" = "xyes"; then
-	LOGVIEWDIR_TMP="$sbindir"
+        LOGVIEWDIR_TMP=`eval echo $sbindir`
 else
-	LOGVIEWDIR_TMP="$bindir"
+        LOGVIEWDIR_TMP=`eval echo $bindir`
 fi
 EXPANDED_LOGVIEWDIR=`eval echo $LOGVIEWDIR_TMP`
 AC_SUBST(EXPANDED_LOGVIEWDIR)
 
+prefix="$prefix_hold"
+exec_prefix="$exec_prefix_hold"
 
 dnl ********************
 dnl scrollkeeper checks