Index: trunk/Ohana/configure
===================================================================
--- trunk/Ohana/configure	(revision 3892)
+++ trunk/Ohana/configure	(revision 5899)
@@ -18,15 +18,49 @@
 set vararch = 0
 set prefix  = ""
+
+set bindir  = ""
+set libdir  = ""
+set incdir  = ""
+set mandir  = ""
+set datadir  = ""
+set sysconfdir  = ""
+set optflags = "-g -O0"
+set pedantic = ""
+
 set root    = ""
 set args    = ""
 while ("$1" != "") 
  switch ($1)
-  case --prefix
-   shift
-   set prefix = $1
-   breaksw;
   case --vararch
    set vararch = 1
    breaksw;
+  case --enable-optimze
+   set optflags = "-O2"
+   breaksw;
+  case --pedantic
+   set pedantic = "-Wall -Werror"
+   breaksw;
+  case --prefix*
+   set prefix = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --bindir*
+   set bindir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --libdir*
+   set libdir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --includedir*
+   set incdir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --sysconfdir*
+   set sysconfdir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --datadir*
+   set datadir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --mandir*
+   set mandir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   breaksw;
+  case --help:
   case -*: 
    goto usage
@@ -157,22 +191,108 @@
 echo ROOT: $root
 echo PREFIX: $prefix
+echo 
+
+#echo BINDIR $bindir
+#echo LIBDIR $libdir
+#echo INCDIR $incdir
+#echo DATADIR $datadir
+#echo MANDIR $mandir
 
 if (-e Configure) mv Configure Configure.bak
 
+rm -f Configure.in.tmp Configure.tmp
+cp Configure.in Configure.in.tmp
+
+# modify the BINDIR
+if ("$bindir" == "") then
+  set subdir = bin/$arch
+  if ($vararch) set subdir = 'bin/$(ARCH)'
+  set bindir = $prefix/$subdir
+endif
+cat Configure.in.tmp | sed "s| BINDIR| $bindir|" > Configure.tmp
+rm -f Configure.in.tmp
+mv Configure.tmp Configure.in.tmp
+echo BINDIR $bindir
+
+# modify the INCDIR
+if ("$incdir" == "") then
+  set subdir = include/$arch
+  if ($vararch) set subdir = 'include/$(ARCH)'
+  set incdir = $prefix/$subdir
+endif
+cat Configure.in.tmp | sed "s| INCDIR| $incdir|" > Configure.tmp
+rm -f Configure.in.tmp
+mv Configure.tmp Configure.in.tmp
+echo INCDIR $incdir
+
+# modify the LIBDIR
+if ("$libdir" == "") then
+  set subdir = lib/$arch
+  if ($vararch) set subdir = 'lib/$(ARCH)'
+  set libdir = $prefix/$subdir
+endif
+cat Configure.in.tmp | sed "s| LIBDIR| $libdir|" > Configure.tmp
+rm -f Configure.in.tmp
+mv Configure.tmp Configure.in.tmp
+echo LIBDIR $libdir
+
+# modify the MANDIR
+if ("$mandir" == "") then
+  set mandir = $prefix/man
+endif
+cat Configure.in.tmp | sed "s| MANDIR| $mandir|" > Configure.tmp
+rm -f Configure.in.tmp
+mv Configure.tmp Configure.in.tmp
+echo MANDIR $mandir
+
+# modify the HELPDIR
+if ("$datadir" == "") then
+  set datadir = $prefix
+endif
+set helpdir = $datadir/help
+cat Configure.in.tmp | sed "s| HELPDIR| $helpdir|" > Configure.tmp
+rm -f Configure.in.tmp
+mv Configure.tmp Configure.in.tmp
+echo HELPDIR $helpdir
+
 if ($vararch) then
-  cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|PREFIX|$prefix|" | sed "s|^\s*ARCH|# ARCH|"   | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
-  echo ""
-  echo "include $prefix/bin/"\$"ARCH in your path"
+  cat Configure.in.tmp | sed "s|^\s*ARCH|# ARCH|" > Configure.tmp
 else 
-  cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|PREFIX|$prefix|" | sed "s|ARCHVAL|$arch|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
-  echo ""
-  echo "include $prefix/bin/$arch in your path"
+  cat Configure.in.tmp | sed "s|ARCHVAL|$arch|" > Configure.tmp
 endif 
+rm -f Configure.in.tmp
+mv Configure.tmp Configure.in.tmp
+
+cat Configure.in.tmp | sed "s|ROOTDIR|$root|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" | sed "s|OPTFLAGS|$optflags $pedantic|" > Configure
+
+echo ""
+echo "include $bindir in your path"
 
 exit 0
 
 usage:
- echo "USAGE: configure [--prefix (dir)] [--vararch]"
- echo "set the installation directory root with --prefix"
- echo "if you define the environment variable $ARCH, you can set --vararch"
+cat <<EOF
+USAGE: configure [OPTION]
+
+set the installation directory root with --prefix
+if you define the environment variable ARCH, you can set --vararch
+ 
+Configuration:
+  -h, --help              display this help and exit
+  --enable-optimize       enable compiler optimization
+  --pedantic              include -Wall -Werror on compilation
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+  --vararch               install with ARCH suffixes for variable architectures
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [PREFIX/bin/$ARCH] 
+  --libdir=DIR           object code libraries [PREFIX/lib/$ARCH]
+  --includedir=DIR       C header files [PREFIX/include]
+  --mandir=DIR           man documentation [PREFIX/man]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+
+EOF
  exit 2;