59 lines
1.5 KiB
Plaintext
59 lines
1.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2002/03/23 23:37:53 matt Exp $
|
|
--- configure.orig Mon Sep 4 11:51:32 2000
|
|
+++ configure Wed Feb 20 13:26:22 2002
|
|
@@ -1968,15 +1968,17 @@ cat >> confdefs.h <<EOF
|
|
EOF
|
|
|
|
|
|
-echo $ac_n "checking for rxvt... "
|
|
-if rxvt -help 2>&1 | grep geom >/dev/null ; then
|
|
- XTERM_CMD="rxvt -fn %F -bg Navy -fg White " ;
|
|
- echo "yes" ;
|
|
-else
|
|
- XTERM_CMD="xterm" ;
|
|
- echo "no" ;
|
|
+if [ -z "$XTERM_CMD" ]; then
|
|
+ echo $ac_n "checking for rxvt... "
|
|
+ if rxvt -help 2>&1 | grep geom >/dev/null ; then
|
|
+ XTERM_CMD="rxvt -fn %F -bg Navy -fg White " ;
|
|
+ echo "yes" ;
|
|
+ else
|
|
+ XTERM_CMD="xterm" ;
|
|
+ echo "no" ;
|
|
+ fi
|
|
+ rm -f conftestrxvt
|
|
fi
|
|
-rm -f conftestrxvt
|
|
cat >> confdefs.h <<EOF
|
|
#define XTERM_CMD "${XTERM_CMD}"
|
|
EOF
|
|
@@ -2839,15 +2841,15 @@ CFLAGS="$CFLAGS $X_CFLAGS"
|
|
LDFLAGS="$LDFLAGS $X_LIBS"
|
|
|
|
|
|
-
|
|
-PYLIB=python1.5
|
|
-LIBPY=python1.5
|
|
+PYLIB=python${PYTHON_VER}
|
|
+LIBPY=python${PYTHON_VER}
|
|
|
|
have_python_config=no
|
|
have_python_include=no
|
|
|
|
-echo $ac_n "checking for python version 1.5""... $ac_c" 1>&6
|
|
-echo "configure:2851: checking for python version 1.5" >&5
|
|
+if [ -z "$NOPYTHON" ]; then
|
|
+echo $ac_n "checking for python version ${PYTHON_VER}""... $ac_c" 1>&6
|
|
+echo "configure:2851: checking for python version ${PYTHON_VER}" >&5
|
|
EPATH=`echo $PATH | sed -e 's+/bin:+ +g' -e 's+:+ +g'`
|
|
|
|
|
|
@@ -2867,6 +2869,7 @@ for i in / /opt /usr /usr/local /usr/ccs
|
|
done
|
|
done
|
|
done
|
|
+fi
|
|
|
|
if test x$have_python_config = xyes && test x$have_python_include = xyes ; then
|
|
have_python=yes
|