|
 |
407d6b8 |
diff -up cernlib-2006/2006/src/pawlib/paw/programs/paw.script cernlib-2006/2006/src/pawlib/paw/programs/paw
|
|
|
407d6b8 |
diff -up cernlib-2006/2006/src/graflib/dzdoc/dzedit/dzedit.script cernlib-2006/2006/src/graflib/dzdoc/dzedit/dzedit
|
|
|
407d6b8 |
diff -up cernlib-2006/2006/src/scripts/cernlib.script cernlib-2006/2006/src/scripts/cernlib
|
|
|
24be4e6 |
--- cernlib-2006/2006/src/scripts/cernlib.script 2006-12-07 14:26:55.000000000 +0100
|
|
|
407d6b8 |
+++ cernlib-2006/2006/src/scripts/cernlib 2007-07-25 21:00:54.000000000 +0200
|
|
|
24be4e6 |
@@ -16,12 +16,17 @@
|
|
|
c8a3a37 |
[ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
|
|
|
c8a3a37 |
|
|
|
c8a3a37 |
_P=0 ; _p=0 ; _u=0 ; Gsys=""
|
|
|
c8a3a37 |
+ #default is to use dynamic lapack
|
|
|
c8a3a37 |
+ _l=1 ;
|
|
|
c8a3a37 |
+ dynlapack=0;
|
|
|
24be4e6 |
+ dynxbae=0;
|
|
|
c8a3a37 |
while [ $# -gt 0 ]
|
|
|
c8a3a37 |
do case $1 in
|
|
|
c8a3a37 |
-G) Gsys=$2 ; shift ;;
|
|
|
c8a3a37 |
-P) _P=1 ;;
|
|
|
c8a3a37 |
-s) _s="is an obsolete option" ;;
|
|
|
c8a3a37 |
-u) _u=1 ; _p=1 ;;
|
|
|
c8a3a37 |
+ -l) _l=0 ;;
|
|
|
c8a3a37 |
-v) gver=$2 ; shift ;;
|
|
|
c8a3a37 |
--) shift ; break ;;
|
|
|
c8a3a37 |
*) break ;;
|
|
|
6b9e211 |
@@ -46,14 +51,38 @@
|
|
|
4b5a59b |
[ $# -eq 2 -a $1 != "graflib" ] && lver=$2
|
|
|
4b5a59b |
dir=$CERN/$lver/lib
|
|
|
4b5a59b |
ln=$1
|
|
|
4b5a59b |
- if [ $1 = "kernlib" -o $1 = "packlib" ] ; then
|
|
|
4b5a59b |
+ if [ $1 = "kernlib" ]; then
|
|
|
4b5a59b |
_p=1
|
|
|
4b5a59b |
fi
|
|
|
6b9e211 |
+ if [ $1 = "packlib" -o $1 = "packlib-lesstif" ]; then
|
|
|
4b5a59b |
+ _p=1
|
|
|
6b9e211 |
+ ln="packlib.a $dir/libkernlib"
|
|
|
6b9e211 |
+ [ $1 = "packlib-lesstif" -o z"$Gsys" = 'zMotif' ] && ln="packlib-lesstif.a $dir/lib$ln"
|
|
|
6b9e211 |
+ fi
|
|
|
6b9e211 |
+
|
|
|
6b9e211 |
+ if [ $1 = "geant321" -o $1 = "pawlib" -o $1 = "packlib-lesstif" ]; then
|
|
|
24be4e6 |
+ [ -z "$Gsys" ] && Gsys="Motif"
|
|
|
4b5a59b |
+ fi
|
|
|
c8a3a37 |
[ $1 = "genlib" ] && ln="mathlib.a $dir/libphtools"
|
|
|
c8a3a37 |
[ $1 = "bvsl" ] && ln="mathlib"
|
|
|
c8a3a37 |
[ $1 = "mpalib" ] && ln="mathlib"
|
|
|
c8a3a37 |
- [ $1 = "lapack" ] && ln="lapack3.a $dir/libblas"
|
|
|
c8a3a37 |
- [ $1 = "pawlib" ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
|
|
|
c8a3a37 |
+ if [ $_l -eq 0 ] ; then
|
|
|
24be4e6 |
+ if [ $1 = "pawlib" ]; then
|
|
|
24be4e6 |
+ ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
|
|
|
24be4e6 |
+ dynxbae=1
|
|
|
24be4e6 |
+ fi
|
|
|
c8a3a37 |
+ [ $1 = "lapack" ] && ln="lapack3.a $dir/libblas"
|
|
|
c8a3a37 |
+ else
|
|
|
c8a3a37 |
+ if [ $1 = "pawlib" ] ; then
|
|
|
4b5a59b |
+ ln="pawlib-lesstif.a $dir/libpawlib"
|
|
|
24be4e6 |
+ dynxbae=1
|
|
|
c8a3a37 |
+ dynlapack=1
|
|
|
c8a3a37 |
+ fi
|
|
|
c8a3a37 |
+ if [ $1 = "lapack" ] ; then
|
|
|
c8a3a37 |
+ ln=""
|
|
|
c8a3a37 |
+ dynlapack=1
|
|
|
c8a3a37 |
+ fi
|
|
|
c8a3a37 |
+ fi
|
|
|
c8a3a37 |
[ $1 = "pythia" ] && ln="jetset"
|
|
|
c8a3a37 |
if [ $1 = "GKS" -o $1 = "gks" ] ; then
|
|
|
c8a3a37 |
drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
|
|
|
6b9e211 |
@@ -69,10 +98,14 @@
|
|
|
c8a3a37 |
[ $drv = "Motif" ] && drv="X11"
|
|
|
c8a3a37 |
ln="$ln.a $dir/libgraf$drv"
|
|
|
c8a3a37 |
fi
|
|
|
c8a3a37 |
- CERNLIB="$CERNLIB $dir/lib$ln.a"
|
|
|
c8a3a37 |
+ [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
|
|
|
c8a3a37 |
done
|
|
|
4b5a59b |
- [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
|
|
|
24be4e6 |
-
|
|
|
24be4e6 |
+ if [ $_p -eq 0 ]; then
|
|
|
6b9e211 |
+ if [ z"$Gsys" = "zMotif" ]; then
|
|
|
6b9e211 |
+ CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a"
|
|
|
6b9e211 |
+ fi
|
|
|
6b9e211 |
+ CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
|
|
|
24be4e6 |
+ fi
|
|
|
4b5a59b |
# get system name
|
|
|
4b5a59b |
[ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
|
|
|
24be4e6 |
case $Msys in
|
|
|
6b9e211 |
@@ -81,7 +114,6 @@
|
|
|
24be4e6 |
;;
|
|
|
24be4e6 |
*) ;;
|
|
|
24be4e6 |
esac
|
|
|
24be4e6 |
-
|
|
|
24be4e6 |
|
|
|
24be4e6 |
if [ -n "$Gsys" ] ; then
|
|
|
24be4e6 |
case $Msys in
|
|
|
407d6b8 |
@@ -110,10 +142,12 @@
|
|
|
4b5a59b |
SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
|
|
|
4b5a59b |
SYSGMOTIF="-lXm -lXt -lX11 -lPW"
|
|
|
4b5a59b |
;;
|
|
|
4b5a59b |
- Linux) [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
|
|
|
6b9e211 |
- [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
|
|
|
6b9e211 |
- [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
|
|
|
6b9e211 |
- [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
|
|
|
4b5a59b |
+ Linux) SYSGX11="-lX11"
|
|
|
4b5a59b |
+ SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
|
|
|
407d6b8 |
+ [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib $SYSGX11"
|
|
|
407d6b8 |
+ [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 $SYSGX11"
|
|
|
407d6b8 |
+ [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib $SYSGMOTIF"
|
|
|
407d6b8 |
+ [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 $SYSGMOTIF"
|
|
|
c8a3a37 |
[ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
|
|
|
c8a3a37 |
;;
|
|
|
24be4e6 |
Darwin) [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
|
|
|
407d6b8 |
@@ -150,7 +184,11 @@
|
|
|
24be4e6 |
SYSGMOTIF="-L/usr/lib/X11 -lXm -lXt -lX11 -lm" ;;
|
|
|
24be4e6 |
esac
|
|
|
24be4e6 |
|
|
|
24be4e6 |
+ if [ $_u -eq 0 ] ; then
|
|
|
24be4e6 |
+ [ $dynxbae = 1 ] && CERNLIB="$CERNLIB -lXbae -lXm -lXaw"
|
|
|
24be4e6 |
+ fi
|
|
|
24be4e6 |
[ -z "$SYSGX11" ] && SYSGX11="-lX11"
|
|
|
24be4e6 |
+
|
|
|
24be4e6 |
case $Gsys in
|
|
|
24be4e6 |
X11) CERNLIB="$CERNLIB $SYSGX11" ;;
|
|
|
24be4e6 |
Motif) [ -z "$SYSGMOTIF" ] && SYSGMOTIF="-lXm -lXt $SYSGX11" ;
|
|
|
407d6b8 |
@@ -212,6 +250,9 @@
|
|
|
c8a3a37 |
if [ "$Msys" = "Linux" ] ; then
|
|
|
c8a3a37 |
CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
|
|
|
24be4e6 |
fi
|
|
|
c8a3a37 |
+ if [ $dynlapack = 1 ] ; then
|
|
|
c8a3a37 |
+ CERNLIB="$CERNLIB -llapack -lblas"
|
|
|
24be4e6 |
+ fi
|
|
|
24be4e6 |
if [ "$Msys" = "Darwin" ] ; then
|
|
|
24be4e6 |
CERNLIB1="$CERNLIB -L/usr/local/lib/system -lcompat -ldl"
|
|
|
c8a3a37 |
fi
|
|
|
407d6b8 |
diff -up cernlib-2006/2006/src/patchy/yexpand.script cernlib-2006/2006/src/patchy/yexpand
|