Index: /branches/eam_branches/ipp-20120601/Ohana/configure.tcsh
===================================================================
--- /branches/eam_branches/ipp-20120601/Ohana/configure.tcsh	(revision 34019)
+++ /branches/eam_branches/ipp-20120601/Ohana/configure.tcsh	(revision 34020)
@@ -10,4 +10,6 @@
 set optimize = 0
 set pedantic = 1
+set no_as_needed = 0
+set debug_build = 0
 set memcheck = 0
 set use_tcmalloc = 0
@@ -66,4 +68,10 @@
    set profile = 1
    breaksw;
+  case --enable-no-as-needed
+   set no_as_needed = 1
+   breaksw;
+  case --enable-debug-build
+   set debug_build = 1
+   breaksw;
   case --enable-memcheck
    set memcheck = 1
@@ -203,6 +211,7 @@
   set CPPFLAGS = ""
 endif  
-## XXX temporary if ($pedantic) set CPPFLAGS = "$CPPFLAGS -Wall -Werror"
-if ($pedantic) set CPPFLAGS = "$CPPFLAGS -Wall"
+
+if ($pedantic) set CPPFLAGS = "$CPPFLAGS -Wall -Werror"
+if ($debug_build) set CPPFLAGS = "$CPPFLAGS -Wall"
 if ($memcheck) set CPPFLAGS = "$CPPFLAGS -DOHANA_MEMORY"
 
@@ -212,9 +221,5 @@
 if ($profile) set LDFLAGS = "$LDFLAGS -Wl,--start-group -Wl,-Bstatic -Wl,-Bdynamic"
 
-# XXX EAM : temporary while working on Ubuntu 12.04 / gcc 4.6.3
-# XXX --no-as-needed fixes problems introduced by Ubuntu 11.10 use of --as-needed
-# but this may be hiding an underlying link problem
-set LDFLAGS = "$LDFLAGS -Wl,--no-as-needed"
-## (need to make this optional like in IPP m4 stdopts)
+if ($no_as_needed) set LDFLAGS = "$LDFLAGS -Wl,--no-as-needed"
 
 set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/local/lib"