Index: trunk/Ohana/Configure.in
===================================================================
--- trunk/Ohana/Configure.in	(revision 11122)
+++ trunk/Ohana/Configure.in	(revision 11888)
@@ -1,15 +1,10 @@
 # Configure file for Ohana Package
-#
-# this is the location of the package
-# change this to match your location of the source
+# the values of the form @WORD@ are filled in by configure
+
+# location of the package and architecture
 ROOT    = @ROOTDIR@
 ARCH    = @ARCHVAL@
 
 # destination directories:
-# these are the installation directories.
-# if you use a different toplevel directory than $(ROOT), you might 
-# need to copy the include files in $(ROOT)/include by hand to the destination
-# LBIN	= PREFIX/bin/$(ARCH)
-
 DESTBIN	 = @BINDIR@
 DESTINC	 = @INCDIR@
@@ -18,16 +13,15 @@
 DESTDATA = @DATADIR@
 
-# prefered C compiler
-# CC = gcc -g -DOHANA_MEMORY -Wall -Werror
-CC = gcc @OPTFLAGS@
-INCDIRS = @INCDIRS@
-LIBDIRS = @LIBDIRS@
+# C compiler options
+CC       = @CC@
+CFLAGS   = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS  = @LDFLAGS@
+
+# flags for external dependencies
+INCDIRS  = @INCDIRS@
+LIBDIRS  = @LIBDIRS@
 LIBFLAGS = @LIBFLAGS@
 
 # select the appropriate version of ranlib
-RANLIB-sid = ranlib
-RANLIB-sol = touch
-RANLIB-linux = ranlib
-RANLIB-lin64 = ranlib
-RANLIB-linrh = ranlib
-RANLIB = $(RANLIB-$(ARCH))
+RANLIB = @RANLIB@