Index: /trunk/Ohana/configure.tcsh
===================================================================
--- /trunk/Ohana/configure.tcsh	(revision 11752)
+++ /trunk/Ohana/configure.tcsh	(revision 11753)
@@ -117,8 +117,9 @@
 if ($#args != 1) goto usage
 
-set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/openwin/lib"
+set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/openwin/lib /usr/local/lib"
 set needlibs   = "png z jpeg readline X11 pthread m"
 
-set sysincpath = "/usr/include /usr/X11R6/include /usr/openwin/include"
+# /usr/local/include/libpng is really pretty lame...
+set sysincpath = "/usr/include /usr/local/include /usr/X11R6/include /usr/openwin/include /usr/local/include/libpng"
 
 set needincs = ""
@@ -185,5 +186,5 @@
    endif
    # sun (at least) seems to need the socket library (linux does not)
-   set needlibs = "$needlibs libsocket libnsl"
+   # set needlibs = "$needlibs libsocket libnsl"
    breaksw;
  case Linux:
@@ -193,5 +194,5 @@
    if ("$mach" == "x86_64") then
     set arch="lin64";
-    set syslibpath = "/lib64 /lib /usr/lib64 /usr/lib /usr/X11R6/lib64 /usr/X11R6/lib"
+    set syslibpath = "/lib64 /usr/lib64 /usr/X11R6/lib64 $syslibpath"
    endif
    breaksw;
@@ -232,4 +233,5 @@
 foreach f ( $needlibs )
     foreach g ( $syslibpath $lib $libpath )
+        if (! -e $g) continue
 	set name = $g/lib$f.a
 	if (-e $name[1]) goto got_lib;