From 7afa3096b0b2da9df56c84338f0b0d53a491d297 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Tue, 11 Dec 2018 15:32:30 +0100
Subject: [PATCH] Use pvAccess enabled version if available

---
 iocsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/iocsh b/iocsh
index 4f469c0..1ee6186 100755
--- a/iocsh
+++ b/iocsh
@@ -353,8 +353,16 @@ fi
 
 if [ "$BASECODE" -ge 31412 ]
 then
-    EXE=$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIoc
-    ARGS="-D $EPICS_BASE/dbd/softIoc.dbd"
+    if [ -x $EPICS_BASE/bin/$EPICS_HOST_ARCH/softIocPVA ]
+    then
+        EXE=$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIocPVA
+        ARGS="-D $EPICS_BASE/dbd/softIocPVA.dbd"
+        echo "dlload $EPICS_BASE/lib/$EPICS_HOST_ARCH/${LIBPREFIX}nt$LIBPOSTFIX"
+        echo "dlload $EPICS_BASE/lib/$EPICS_HOST_ARCH/${LIBPREFIX}pvDatabase$LIBPOSTFIX"
+    else
+        EXE=$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIoc
+        ARGS="-D $EPICS_BASE/dbd/softIoc.dbd"
+    fi
     LDCMD="dlload"
 else
     # get rid of the compiled-in rpath because at PSI that is a link pointing to current EPICS version.