Changeset 12839

Timestamp:

Apr 17, 2007, 9:55:36 AM (19 years ago)

Author:

eugene

Message:

various updates suggested by RHL, Johannes, Nicolas, Arno

Location:

trunk/psconfig

Files:

• INSTALL (modified) (1 diff)
• pschecklibs (modified) (8 diffs)
• psconfig.bash (modified) (3 diffs)
• psconfig.csh (added)
• psconfig.sh (deleted)

trunk/psconfig/INSTALL

@@ -22 +22 @@
 following line in ~/.psconfigrc (otherwise not needed):
 
-set PSCONFIG = INSTALL_PATH
+set PSCONFDIR = INSTALL_PATH
 
 where INSTALL_PATH is the top-level directory for all binary

trunk/psconfig/pschecklibs

@@ -31 +31 @@
 endif
 
-# set paths for PSVERSION
+# set install paths for PSVERSION
 set libdir  = `source psconfig.sh --libs $PSVERSION`
 set incdir  = `source psconfig.sh --include $PSVERSION`
 
+# make these directories
+mkdir -p $libdir
+mkdir -p $incdir
+
 # I supplement this list with LD_LIBRARY_PATH below
-set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/openwin/lib /usr/local/lib"
+set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/local/lib "
 set needlibs   = ""
 set needlibs   = "$needlibs png"
@@ -52 +56 @@
 set needlibs   = "$needlibs m"
 
-# /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"
-
+# I supplement this list with CPATH below
+set sysincpath = "/usr/include /usr/local/include /usr/X11R6/include "
 set needincs = ""
 set needincs = "$needincs X11/Xatom.h"
@@ -103 +106 @@
 set needincs = "$needincs time.h"
 set needincs = "$needincs unistd.h"
-set needincs = "$needincs values.h"
 set needincs = "$needincs zlib.h"
 
 # XXX need to have options for non-ANSI includes? (ie, varargs.h)
+# set needincs = "$needincs values.h" - this only provides values already defined in limits.h?
 # set needincs = "$needincs libxml/parser.h"
 # set needincs = "$needincs cfuncs.h" - from non-ANSI option in ohana.h
@@ -118 +121 @@
 set sys=`uname -s` 
 set ranlib = "ranlib"
+set dlltype = "so"
 switch ($sys)
  case IRIX64:
@@ -130 +134 @@
    endif
    # sun (at least) seems to need the socket library (linux does not)
+   set syslibpath = "$syslibpath /usr/openwin/lib"
+   set sysincpath = "$sysincpath /usr/openwin/include"
    set needlibs = "$needlibs libsocket libnsl"
    set ranlib = "touch"
@@ -141 +147 @@
     set syslibpath = "/lib64 /usr/lib64 /usr/X11R6/lib64 $syslibpath"
    endif
+   breaksw;
+ case Darwin:
+   set arch="darwin";
+   set mach=`uname -m`
+   if ("$mach" == "i386") then
+    set arch="darwin_x86";
+   endif
+   set syslibpath = "$syslibpath /sw/lib /usr/local/lib/mysql"
+   set sysincpath = "$sysincpath /sw/include /usr/include/sys"
+   set dlltype = dylib
    breaksw;
  case HP-UX:
@@ -169 +185 @@
     foreach g ( $libdir $libpath $syslibpath )
         if (! -e $g) continue
-        set name = $g/lib$f.a
-        if (-e $name[1]) goto got_lib;
-        set name = $g/lib$f.so*
-        if (-e $name[1]) goto got_lib;
+        set name = $g/lib$f.a
+        if (-e $name[1]) goto got_lib;
+        set name = $g/lib$f.$dlltype
+        if (-e $name[1]) goto got_lib;
+    end
+    # if we find a .so.N without a matching .so, we link this in
+    # the installed libdir
+    foreach g ( $libpath $syslibpath )
+        set name = $g/lib$f.$dlltype*
+        echo "libname: $name"
+        if (-e $name[1]) then
+          echo "making link to numbers .$dlltype library $libdir/lib$f.$dlltype"
+          ln -s $name[$#name] $libdir/lib$f.$dlltype
+          if ($status) exit 1
+          goto got_lib
+        endif
     end
     echo "missing lib$f"
@@ -185 +213 @@
 foreach f ( ncurses curses termcap )
     foreach g ( $libdir $libpath $syslibpath )
-        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;
+        set name = $g/lib$f.a
+        if (-e $name[1]) goto got_curses;
+        set name = $g/lib$f.$dlltype
+        if (-e $name[1]) goto got_curses;
+    end
+    # if we find a .so.N without a matching .so, we link this in
+    # the installed libdir
+    foreach g ( $libpath $syslibpath )
+        set name = $g/lib$f.$dlltype*
+        if ($#name > 0) then
+          echo "making link to numbers .$dlltype library $libdir/lib$f.$dlltype"
+          ln -s $name[$#name] $libdir/lib$f.$dlltype
+          goto got_curses;
+        endif
     end
 end

trunk/psconfig/psconfig.bash

@@ -1 +1 @@
 # this script sets the PS IPP build environment for BASH shell users
 
-INSTALL=/home/kiawe/eugene/src.alala/panstarrs/ipp/psconfig
+if [ -z $INSTALL ]; then
+  INSTALL=/home/kiawe/eugene/src.alala/panstarrs/ipp/psconfig
+fi
 
 if (( $# == 0 )); then
-  /bin/csh $INSTALL/psconfig.sh
+  /bin/csh $INSTALL/psconfig.csh
   return 0
 fi
@@ -14 +16 @@
 
 version=$1
-psconfigure=`/bin/csh $INSTALL/psconfig.sh --psconfigure $version`
-psautogen=`/bin/csh $INSTALL/psconfig.sh --psautogen $version`
-psperlbuild=`/bin/csh $INSTALL/psconfig.sh --psperlbuild $version`
+psconfigure=`/bin/csh $INSTALL/psconfig.csh --psconfigure $version`
+psautogen=`/bin/csh $INSTALL/psconfig.csh --psautogen $version`
+psperlbuild=`/bin/csh $INSTALL/psconfig.csh --psperlbuild $version`
 alias psconfigure=$psconfigure
 alias psautogen=$psautogen
@@ -22 +24 @@
 
 # psconfig env variables
-export PSCONFDIR=`/bin/csh $INSTALL/psconfig.sh --psconfdir $version`
-export PSVERSION=`/bin/csh $INSTALL/psconfig.sh --psversion $version`
+export PSCONFDIR=`/bin/csh $INSTALL/psconfig.csh --psconfdir $version`
+export PSVERSION=`/bin/csh $INSTALL/psconfig.csh --psversion $version`
 
 # environment variables
-export PATH=`/bin/csh $INSTALL/psconfig.sh --path $version`
-export ARCH=`/bin/csh $INSTALL/psconfig.sh --arch $version`
-export LD_LIBRARY_PATH=`/bin/csh $INSTALL/psconfig.sh --ld_library_path $version`
-export PKG_CONFIG_PATH=`/bin/csh $INSTALL/psconfig.sh --pkg_config_path $version`
-export ACLOCAL_FLAGS=`/bin/csh $INSTALL/psconfig.sh --aclocal_flags $version`
-export PERL5LIB=`/bin/csh $INSTALL/psconfig.sh --perl5lib $version`
+export PATH=`/bin/csh $INSTALL/psconfig.csh --path $version`
+export ARCH=`/bin/csh $INSTALL/psconfig.csh --arch $version`
+export LD_LIBRARY_PATH=`/bin/csh $INSTALL/psconfig.csh --ld_library_path $version`
+export PKG_CONFIG_PATH=`/bin/csh $INSTALL/psconfig.csh --pkg_config_path $version`
+export ACLOCAL_FLAGS=`/bin/csh $INSTALL/psconfig.csh --aclocal_flags $version`
+export PERL5LIB=`/bin/csh $INSTALL/psconfig.csh --perl5lib $version`