--- src/scripts/cernlib-old	2005-11-30 20:15:23.000000000 +0100
+++ src/scripts/cernlib	2005-11-30 20:15:23.000000000 +0100
@@ -16,12 +16,16 @@
   [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
  
   _P=0  ; _p=0 ;   _u=0 ; Gsys=""
+  #default is to use dynamic lapack
+  _l=1 ;
+  dynlapack=0;
   while [ $# -gt 0 ]
   do case $1 in
        -G) Gsys=$2   ; shift ;;
        -P) _P=1              ;;
        -s) _s="is an obsolete option"     ;;
        -u) _u=1 ; _p=1       ;;
+       -l) _l=0              ;;
        -v) gver=$2   ; shift ;;
        --) shift ; break     ;;
         *)         break     ;;
@@ -46,14 +50,29 @@
       [ $# -eq 2 -a $1 != "graflib" ] && lver=$2
       dir=$CERN/$lver/lib
          ln=$1
-      if [ $1 = "kernlib" -o $1 = "packlib" ] ; then
+      if [ $1 = "kernlib" ]; then
          _p=1
       fi
+      if [ $1 = "packlib" ]; then
+         _p=1
+         ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
+      fi
          [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
          [ $1 = "bvsl"    ] && ln="mathlib"
          [ $1 = "mpalib"  ] && ln="mathlib"
-         [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
-	 [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
+         if [ $_l -eq 0 ] ; then
+           [ $1 = "pawlib"  ] && ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
+           [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
+         else
+           if [ $1 = "pawlib"  ] ; then 
+              ln="pawlib-lesstif.a $dir/libpawlib"
+              dynlapack=1
+           fi
+           if [ $1 = "lapack"  ] ; then
+              ln=""
+              dynlapack=1
+           fi
+         fi
          [ $1 = "pythia"  ] && ln="jetset"
       if [ $1 = "GKS" -o $1 = "gks" ] ; then
          drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
@@ -69,9 +88,9 @@
          [ $drv = "Motif" ] && drv="X11"
          ln="$ln.a $dir/libgraf$drv"
       fi
-         CERNLIB="$CERNLIB $dir/lib$ln.a"
+      [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
   done
-  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
+  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
 
 #  get system name
   [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
@@ -110,10 +129,14 @@
                SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
                SYSGMOTIF="-lXm -lXt -lX11 -lPW"
 	       ;;
-      Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+      Linux)   SYSGX11="-lX11"
+	       SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
 	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
@@ -208,6 +231,10 @@
      fi
      if [ "$Msys" = "Linux" ] ; then
         CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
+#        echo $CERNLIB | grep pawlib >/dev/null &&   CERNLIB="$CERNLIB -llapack -lblas"
+     fi
+     if [ $dynlapack = 1 ] ; then
+         CERNLIB="$CERNLIB -llapack -lblas"
      fi
   fi