--- configure~configure.patch	2002-08-26 05:55:53.000000000 +0100
+++ configure	2004-09-21 01:15:33.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # Note: future version will have a syntax something like
 #   ./configure [OPTIONS]
@@ -41,6 +41,7 @@
       fi	
       # Taken from autoconf 2.50
       envvar=`expr "x$option" : 'x\([^=]*\)='`
+      optarg=`expr "x$option" : 'x[^=]*=\(.*\)'`
       # Reject names that are not valid shell variable names.
       expr "x$envvar" : ".*[^_$cr_alnum]" >/dev/null &&
         { echo "$as_me: error: invalid variable name: $envvar" >&2
@@ -52,7 +53,7 @@
     --help)
       echo "Usage: ./configure [--help | --vars VAR1=VAL1 ...]"
       echo "  Note: Variables may also be set in the environment brefore running config"
-      echo "  Useful vars: ASPELL ASPELL_PARMS WORD_LIST_COMPRESS DESTDIR"
+      echo "  Useful vars: ASPELL ASPELL_PARMS WORD_LIST_COMPRESS DESTDIR DICT_DIR DATA_DIR"
       exit 0
       ;;
     *)
@@ -68,11 +69,19 @@
   then WORD_LIST_COMPRESS=word-list-compress; fi
 
 echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
-dictdir=`$ASPELL dump config dict-dir`
+if test x = "x$DICT_DIR"
+  then dictdir=`$ASPELL dump config dict-dir`
+else
+  dictdir=$DICT_DIR
+fi
 echo $dictdir
 
 echo $ECHO_N "Finding Data file location ... $ECHO_C"
-datadir=`$ASPELL dump config data-dir`
+if test x = "x$DATA_DIR"
+  then datadir=`$ASPELL dump config data-dir`
+else
+  datadir=$DATA_DIR
+fi
 echo $datadir
 
 echo "ASPELL = $ASPELL" > Makefile