$OpenBSD: patch-configure,v 1.18 2010/09/30 07:33:16 ajacoutot Exp $
--- configure.orig	Mon Sep 27 10:59:15 2010
+++ configure	Wed Sep 29 14:18:35 2010
@@ -2893,14 +2893,6 @@ echo timestamp > conftest.file
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
-esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
@@ -13128,7 +13120,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+	for am_cv_pathless_PYTHON in python${MODPY_VERSION} none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -15737,7 +15729,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${datadir}/locale"`
+  ac_define_dir=`eval echo "${datadir}/locale"`
   ac_define_dir=`eval echo $ac_define_dir`
   GNOMELOCALEDIR="$ac_define_dir"
 
@@ -17218,7 +17210,7 @@ builderdir="${pkgdatadir}/builder"
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${iconsdir}"`
+  ac_define_dir=`eval echo "${iconsdir}"`
   ac_define_dir=`eval echo $ac_define_dir`
   GNOME_ICONDIR="$ac_define_dir"
 
@@ -17231,7 +17223,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${pixmapsdir}"`
+  ac_define_dir=`eval echo "${pixmapsdir}"`
   ac_define_dir=`eval echo $ac_define_dir`
   GNOME_PIXMAPSDIR="$ac_define_dir"
 
@@ -17244,7 +17236,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${builderdir}"`
+  ac_define_dir=`eval echo "${builderdir}"`
   ac_define_dir=`eval echo $ac_define_dir`
   GTK_BUILDERDIR="$ac_define_dir"
 
@@ -17257,7 +17249,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${datadir}"`
+  ac_define_dir=`eval echo "${datadir}"`
   ac_define_dir=`eval echo $ac_define_dir`
   DATADIR="$ac_define_dir"
 
@@ -17270,7 +17262,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${sysconfdir}"`
+  ac_define_dir=`eval echo "${sysconfdir}"`
   ac_define_dir=`eval echo $ac_define_dir`
   SYSCONFDIR="$ac_define_dir"
 
@@ -17283,7 +17275,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"${libdir}"`
+  ac_define_dir=`eval echo "${libdir}"`
   ac_define_dir=`eval echo $ac_define_dir`
   LIBDIR="$ac_define_dir"
 
@@ -17296,7 +17288,7 @@ _ACEOF
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"$prefix"`
+  ac_define_dir=`eval echo "$prefix"`
   ac_define_dir=`eval echo $ac_define_dir`
   PREFIX="$ac_define_dir"
 
