Changeset 11748

Timestamp:

Feb 12, 2007, 11:02:03 AM (19 years ago)

Author:

eugene

Message:

adding more detailed lib and include searches

File:

• trunk/Ohana/configure.tcsh (modified) (7 diffs)

trunk/Ohana/configure.tcsh

@@ -117 +117 @@
 if ($#args != 1) goto usage
 
-set needlibs = "png z jpeg readline X11 pthread m"
 set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/openwin/lib"
-
-set needincs = "math.h fcntl.h malloc.h errno.h time.h memory.h stdlib.h string.h X11/X.h"
+set needlibs   = "png z jpeg readline X11 pthread m"
+
 set sysincpath = "/usr/include /usr/X11R6/include /usr/openwin/include"
+
+set needincs = ""
+set needincs = "$needincs X11/Xatom.h"
+set needincs = "$needincs X11/Xlib.h"
+set needincs = "$needincs X11/Xresource.h"
+set needincs = "$needincs X11/Xutil.h"
+set needincs = "$needincs X11/cursorfont.h"
+set needincs = "$needincs X11/keysym.h"
+set needincs = "$needincs X11/keysymdef.h"
+set needincs = "$needincs arpa/inet.h"
+set needincs = "$needincs ctype.h"
+set needincs = "$needincs errno.h"
+set needincs = "$needincs fcntl.h"
+set needincs = "$needincs glob.h"
+set needincs = "$needincs jpeglib.h"
+set needincs = "$needincs malloc.h"
+set needincs = "$needincs math.h"
+set needincs = "$needincs memory.h"
+set needincs = "$needincs netdb.h"
+set needincs = "$needincs netinet/ip.h"
+set needincs = "$needincs png.h"
+set needincs = "$needincs pthread.h"
+set needincs = "$needincs readline/history.h"
+set needincs = "$needincs readline/readline.h"
+set needincs = "$needincs signal.h"
+set needincs = "$needincs stdio.h"
+set needincs = "$needincs stdlib.h"
+set needincs = "$needincs string.h"
+set needincs = "$needincs sys/ipc.h"
+set needincs = "$needincs sys/resource.h"
+set needincs = "$needincs sys/sem.h"
+set needincs = "$needincs sys/socket.h"
+set needincs = "$needincs sys/stat.h"
+set needincs = "$needincs sys/time.h"
+set needincs = "$needincs sys/types.h"
+set needincs = "$needincs sys/uio.h"
+set needincs = "$needincs sys/un.h"
+set needincs = "$needincs sys/wait.h"
+set needincs = "$needincs time.h"
+set needincs = "$needincs unistd.h"
+set needincs = "$needincs values.h"
+set needincs = "$needincs zlib.h"
+
+# need to have options for non-ANSI includes? (ie, varargs.h)
+# set needincs = "$needincs cfuncs.h" - from non-ANSI option in ohana.h
+# set needincs = "$needincs float.h" - is from missing_proto (CFHT)
+# set needincs = "$needincs floatingpoint.h" - is from missing_proto (CFHT)
+# set needincs = "$needincs stdarg.h" - from std includes (in gcc path)
+# set needincs = "$needincs varargs.h" - from std includes (in gcc path)
 
 # check the hardware architecture:
@@ -176 +224 @@
 
 # check for basic libraries
+echo ""
+echo "searching for needed external libraries..."
 set faillibs = ""
 set libflags = ""
@@ -191 +241 @@
     continue
 got_lib:
-    echo "found lib$f ($name)"
+    echo "found lib$f ($name[$#name])"
     echo "$libdirs" | grep -- "-L$g " > /dev/null
     if ($status) then
@@ -206 +256 @@
 foreach f ( ncurses curses termcap )
     foreach g ( $syslibpath $lib $libpath )
-        set name = "$g/lib$f.a"
-        if (-e $name) goto got_curses;
-        set name = "$g/lib$f.so"
-        if (-e $name) goto got_curses;
+        set name = $g/lib$f.a
+        if (-e $name[1]) goto got_curses;
+        set name = $g/lib$f.so*
+        if (-e $name[1]) goto got_curses;
     end
 end
@@ -215 +265 @@
 echo "missing a valid curses library"
 echo "missing: $faillibs"
-echo "please find them and install them in $lib"
+echo "please find one of them and install them in $lib"
 exit 1
 
 got_curses:
-  echo "found $f ($name)"
+  echo "found $f ($name[$#name])"
   echo "$libdirs" | grep -- "-L$g " > /dev/null
   if ($status) then
@@ -237 +287 @@
 
 # check for headers
+echo ""
+echo "searching for needed external header files..."
 set failincs = ""
 set incdirs = ""
@@ -261 +313 @@
 endif    
 
+echo ""
 echo INCDIRS: $incdirs
 echo LIBDIRS: $libdirs