--- ./gdictsrc/gdict-speller.c Wed Oct 3 23:19:43 2001 +++ ../gnome-utils-1.4.1.2/./gdictsrc/gdict-speller.c Fri Jun 21 12:23:37 2002 @@ -26,7 +26,6 @@ #ifdef HAVE_GNOME_PRINT # include # include -# include # include #endif --- ./gdictsrc/gdict-defbox.c Sun Jun 24 18:44:39 2001 +++ ../gnome-utils-1.4.1.2/./gdictsrc/gdict-defbox.c Fri Jun 21 12:23:33 2002 @@ -29,7 +29,6 @@ #include "gdict-pref.h" #ifdef HAVE_GNOME_PRINT -# include # include #endif /* HAVE_GNOME_PRINT */ --- ./gdictsrc/gdict-app.c Wed Oct 3 23:19:43 2001 +++ ../gnome-utils-1.4.1.2/./gdictsrc/gdict-app.c Fri Jun 21 12:23:30 2002 @@ -36,7 +36,6 @@ #ifdef HAVE_GNOME_PRINT # include -# include #endif /* HAVE_GNOME_PRINT */ #define APPNAME "gdict" --- ./gsearchtool/gsearchtool.c Sun Jun 24 18:44:46 2001 +++ ../gnome-utils-1.4.1.2/./gsearchtool/gsearchtool.c Thu Jun 20 17:24:15 2002 @@ -103,6 +103,11 @@ return ret; } +/* Let builders force non-default locations for tools. */ +#ifndef BIN_PREFIX +#define BIN_PREFIX +#endif + static char * makecmd(char *start_dir) { @@ -112,9 +117,9 @@ cmdbuf = g_string_new (""); if(start_dir) - g_string_sprintfa(cmdbuf, "find %s %s ", start_dir, defoptions); + g_string_sprintfa(cmdbuf, BIN_PREFIX "find %s %s ", start_dir, defoptions); else - g_string_sprintfa(cmdbuf, "find . %s ", defoptions); + g_string_sprintfa(cmdbuf, BIN_PREFIX "find . %s ", defoptions); for(list=criteria_find;list!=NULL;list=g_list_next(list)) { FindOption *opt = list->data; @@ -160,7 +165,7 @@ for(list = criteria_grep; list != NULL; list = g_list_next(list)) { FindOption *opt = list->data; if(opt->enabled) { - g_string_sprintfa(cmdbuf, "| xargs -0 "); + g_string_sprintfa(cmdbuf, "| " BIN_PREFIX "xargs -0 "); if(templates[opt->templ].type != FIND_OPTION_GREP) g_warning(_("non-grep option found in grep list, bad bad!")); else { --- ./configure Thu Jan 31 19:57:01 2002 +++ ../gnome-utils-1.4.1.2/./configure Thu Jun 20 17:45:51 2002 @@ -6976,7 +6976,7 @@ fi done -LANGINFO_D_FMT_CHECK +# LANGINFO_D_FMT_CHECK if test "x$enable_console_helper" = "xyes"; then @@ -8177,9 +8177,9 @@ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES - guile_msg = 'Huh?' + guile_msg='Huh?' if test x$withval = xno ; then - guile_msg = 'disabled' + guile_msg='disabled' GUILE_LIBS= GUILE_INCS=