106 lines
3.7 KiB
Plaintext
106 lines
3.7 KiB
Plaintext
$OpenBSD: patch-configure,v 1.16 2009/10/13 18:12:59 ajacoutot Exp $
|
|
--- configure.orig Mon Oct 12 13:09:24 2009
|
|
+++ configure Mon Oct 12 13:12:34 2009
|
|
@@ -14522,7 +14522,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
|
|
- for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
|
|
+ for am_cv_pathless_PYTHON in python${MODPY_VERSION} none; do
|
|
test "$am_cv_pathless_PYTHON" = none && break
|
|
prog="import sys, string
|
|
# split strings by '.' and convert to numeric. Append some zeros
|
|
@@ -15873,7 +15873,7 @@ else
|
|
fi
|
|
|
|
|
|
-
|
|
+if false; then # force skip gnome settings daemon detection
|
|
pkg_failed=no
|
|
{ $as_echo "$as_me:$LINENO: checking for GNOME_SETTINGS_DAEMON" >&5
|
|
$as_echo_n "checking for GNOME_SETTINGS_DAEMON... " >&6; }
|
|
@@ -15950,10 +15950,10 @@ if test "x$HAVE_GNOME_SETTINGS_DAEMON" = "xno"; then
|
|
$as_echo "$as_me: WARNING: gnome-settings-daemon DBUS API is required to build modem-applet." >&2;}
|
|
fi
|
|
|
|
+fi # force skip gnome settings daemon detection
|
|
|
|
|
|
|
|
-
|
|
pkg_failed=no
|
|
{ $as_echo "$as_me:$LINENO: checking for LIBWNCK" >&5
|
|
$as_echo_n "checking for LIBWNCK... " >&6; }
|
|
@@ -17580,7 +17580,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"
|
|
|
|
@@ -20883,7 +20883,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"
|
|
|
|
@@ -20896,7 +20896,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"
|
|
|
|
@@ -20909,7 +20909,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"
|
|
|
|
@@ -20922,7 +20922,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"
|
|
|
|
@@ -20935,7 +20935,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"
|
|
|
|
@@ -20948,7 +20948,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"
|
|
|
|
@@ -20961,7 +20961,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"
|
|
|