Changeset 5997

Timestamp:

Jan 15, 2006, 9:04:36 AM (21 years ago)

Author:

eugene

Message:

more robust check for curses, termcap; added libflags

Location:

trunk/Ohana

Files:

• Configure.in (modified) (1 diff)
• configure (modified) (5 diffs)

trunk/Ohana/Configure.in

@@ -22 +22 @@
 # seem to be ok on most linux distributions)
 XINC    = XINCDIR
-XLIB    = -LXLIBDIR
+XLIB    = XLIBDIR
+TLIB    = TLIBFLAG
 
 # prefered C compiler

trunk/Ohana/configure

@@ -92 +92 @@
    endif
    # XXX old solaris needed termcap for readline
-   set archlib = "libsocket libnsl libtermcap"
+   set archlib = "libsocket libnsl"
    breaksw;
  case Linux:
@@ -118 +118 @@
 set inc = $prefix/include/$arch
 set lib = $prefix/lib/$arch
+if ($?LD_LIBRARY_PATH) then 
+  set libpath = `echo $LD_LIBRARY_PATH | tr ':' ' '`
+else
+  set libpath = ""
+endif
 
 # check for basic libraries
 set fail = 0
 foreach f ( libpng libz libjpeg libreadline $archlib )
-    foreach g ( /usr/lib $lib )
+    foreach g ( /usr/lib $lib $libpath )
         set name = "$g/$f.a"
         if (-e $name) then
@@ -140 +145 @@
 end
 
+# check for termcap, curses, etc
+set tlibflag = ""
+foreach f ( libncurses libcurses libtermcap )
+      foreach g ( /usr/lib $lib $libpath )
+        set name = "$g/$f.a"
+        if (-e $name) then
+            echo "found $name"
+            set tlibflag = "-l$f"
+            goto got_curses;
+        endif
+        set name = "$g/$f.so"
+        if (-e $name) then
+            echo "found $name"
+            set tlibflag = "-l$f"
+            goto got_curses;
+        endif
+    end
+end
+if ("$tlibflag" == "") then
+  echo "missing a valid curses library"
+  set fail = 1
+endif
+
+got_curses:
+
 if ($fail) then
   echo "your installation is missing some important libraries"
@@ -149 +179 @@
 set fail = 0
 foreach f ( libX11.a )
-    foreach g ( /usr/lib $lib /usr/X11R6/lib /usr/openwin/lib )
+    foreach g ( /usr/lib $lib $libpath /usr/X11R6/lib /usr/openwin/lib )
         set name = "$g/$f"
         if (-e $name) then 
@@ -271 +301 @@
 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
+cat Configure.in.tmp | sed "s|ROOTDIR|$root|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" | sed "s|TLIBFLAG|$tlibflag|" | sed "s|OPTFLAGS|$optflags $pedantic|" > Configure
+rm -f Configure.in.tmp Configure.tmp
 
 echo ""