--- configure.orig	2007-08-19 12:13:03.000000000 -0500
+++ configure	2007-12-25 20:21:25.000000000 -0600
@@ -25240,9 +25240,9 @@
 
 
 	if test "x$cross_compiling" = "xyes" ; then
-	  name_build_guile="$target_alias-guile-config"
+	  name_build_guile="$target_alias-guile16-config"
 	else
-	  name_build_guile="guile-config"
+	  name_build_guile="guile16-config"
 	fi
 
 	# Extract the first word of "$name_build_guile", so it can be a program name with args.
@@ -25425,13 +25425,13 @@
 
 
 	if test "x$BUILD_GUILE" = "xyes"; then
-		{ echo "$as_me:$LINENO: checking for guile libraries" >&5
-echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
+		{ echo "$as_me:$LINENO: checking for guile16 libraries" >&5
+echo $ECHO_N "checking for guile16 libraries... $ECHO_C" >&6; }
 		GUILE_LIBS="`$name_build_guile link`"
 		{ echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
 echo "${ECHO_T}$GUILE_LIBS" >&6; }
-		{ echo "$as_me:$LINENO: checking for guile headers" >&5
-echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
+		{ echo "$as_me:$LINENO: checking for guile16 headers" >&5
+echo $ECHO_N "checking for guile16 headers... $ECHO_C" >&6; }
 		GUILE_INCS="`$name_build_guile compile`"
 		{ echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
 echo "${ECHO_T}$GUILE_INCS" >&6; }
@@ -25757,7 +25757,7 @@
   GUILE_LIBS="$GUILE_LIBS -lsocket"
 fi
 
-		GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
+		GUILE_LIBS="-lguile16 $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
 	fi
 
 
@@ -25767,8 +25767,8 @@
 	LIBS="$LIBS $GUILE_LIBS"
 	CPPFLAGS="$saved_cppflags $GUILE_INCS"
 
-	{ echo "$as_me:$LINENO: checking whether guile works" >&5
-echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
+	{ echo "$as_me:$LINENO: checking whether guile16 works" >&5
+echo $ECHO_N "checking whether guile16 works... $ECHO_C" >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25776,8 +25776,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#include <libguile.h>
-		#include <guile/gh.h>
+		#include <libguile16.h>
+		#include <guile16/gh.h>
 
 int
 main ()
@@ -25880,8 +25880,8 @@
 
 
 if test x${GUILE} = x ; then
-   # Extract the first word of "guile", so it can be a program name with args.
-set dummy guile; ac_word=$2
+   # Extract the first word of "guile16", so it can be a program name with args.
+set dummy guile16; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GUILE+set}" = set; then
@@ -26019,8 +26019,8 @@
 
 
 if test x${GUILE} = x ; then
-   # Extract the first word of "guile", so it can be a program name with args.
-set dummy guile; ac_word=$2
+   # Extract the first word of "guile16", so it can be a program name with args.
+set dummy guile16; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GUILE+set}" = set; then
@@ -26165,20 +26165,20 @@
 
 ### Check size of long_long - some guile's are broken.
 { echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
-echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
+echo $ECHO_N "checking if guile16 long_long is at least as big as gint64... $ECHO_C" >&6; }
 GNC_OLDCFLAGS="$CFLAGS"
 CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
 if test "$cross_compiling" = yes; then
 
   { echo "$as_me:$LINENO: result: assuming yes" >&5
 echo "${ECHO_T}assuming yes" >&6; }
-  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
+echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
 if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lguile  $LIBS"
+LIBS="-lguile16  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26251,7 +26251,7 @@
 /* end confdefs.h.  */
 
   #include <glib.h>
-  #include <libguile/__scm.h>
+  #include <libguile16/__scm.h>
   int main(int argc, char *argv[]) {
     return(!(sizeof(long_long) >= sizeof(gint64)));
   }
@@ -26280,13 +26280,13 @@
 
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
+echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
 if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lguile  $LIBS"
+LIBS="-lguile16  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26478,8 +26478,8 @@
 
 { echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
 echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
-# Extract the first word of "guile", so it can be a program name with args.
-set dummy guile; ac_word=$2
+# Extract the first word of "guile16", so it can be a program name with args.
+set dummy guile16; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GUILE+set}" = set; then
@@ -26519,13 +26519,13 @@
 
 
   if test "$GUILE" = "" ; then
-      { { echo "$as_me:$LINENO: error: guile required but not found" >&5
-echo "$as_me: error: guile required but not found" >&2;}
+      { { echo "$as_me:$LINENO: error: guile16 required but not found" >&5
+echo "$as_me: error: guile16 required but not found" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
-  # Extract the first word of "guile-config", so it can be a program name with args.
-set dummy guile-config; ac_word=$2
+  # Extract the first word of "guile16-config", so it can be a program name with args.
+set dummy guile16-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
@@ -26565,13 +26565,13 @@
 
 
   if test "$GUILE_CONFIG" = "" ; then
-      { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
-echo "$as_me: error: guile-config required but not found" >&2;}
+      { { echo "$as_me:$LINENO: error: guile16-config required but not found" >&5
+echo "$as_me: error: guile16-config required but not found" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
-  # Extract the first word of "guile-tools", so it can be a program name with args.
-set dummy guile-tools; ac_word=$2
+  # Extract the first word of "guile16-tools", so it can be a program name with args.
+set dummy guile16-tools; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then
