varied gcc compiler in makefile

.gitignore

@@ -1,6 +1,7 @@
 # Temporary editor files #
 ##########################
 *~
+*-
 
 # AFS temporary files #
 #######################
@@ -35,6 +36,10 @@ src/*.lo
 src/*.la
 src/.deps/*
 src/bitshuffle/.deps/*
+src/bitshuffle/.libs/*
+src/bitshuffle/*.o
+src/bitshuffle/*.Plo
+src/bitshuffle/*.lo
 src/.libs/*
 examples/cafeTest/*.*-
 doc

README

@@ -1,18 +1,25 @@
 ##
-autogen_rel_py3.sh       ==>  generates library for use from within python and C++
+Change cafe version in three place:
-autogen_rel_py3_noqt.sh  ==>  generates library for use from within python and C++ (remove Qt4 dependency if xml not required)
+1)
-autogen_rel_noqt.sh   ==>  generates library for building a mex file (remove Qt4 dependence as matlab requires Qt5)
+configure.ac 
-autogen_rel.sh        ==>  normal c++ release
+AC_INIT([CAFE], [1.22.0], [Bug reports to: felix.armborst@psi.ch, j.chrin@hispeed.ch])
+
+2)
+src/makefile.am
+libcafe_la_LDFLAGS = -version-info 23:0:22   #corresponds to 1.22.0 (run cafe_version.py)
+
+3)
+autogen.sh
+CAFE_V="cafe-1.22.0"
+EPICS_BASE='base-7.0.9' #change epics version here
+
+
+autogen.sh sls2 py310/py38/py37   ==>  generates library for use from within python and C++
+autogen.sh sls2 cpp   ==>  generates library for use in cpp
+autogen.sh sls2 matlab   ==>  generates library for building a mex file
+autogen.sh hipa cpp   ==>  generates library for use cpp **without** qt libraries
+autogen.sh sf py37   ==>  generates library for use use in swissfel with bsread/zmq capabilty
 
-Libraries are only made available when the appropriate is enabld
-#ENABLE_OPTIONS+=" --enable-qt5"
-##ENABLE_OPTIONS+=" --enable-qt4"
-#ENABLE_OPTIONS+=" --enable-python37"
-##ENABLE_OPTIONS+=" --enable-python35"
-#ENABLE_OPTIONS+=" --enable-json"
-#ENABLE_OPTIONS+=" --enable-zeromq"
-#ENABLE_OPTIONS+=" --enable-curl"
-#ENABLE_OPTIONS+=" --enable-lz4"
 
 ##
 ## --------------------------------------------------------------------------
@@ -23,17 +30,6 @@ Libraries are only made available when the appropriate is enabld
 ## 
 ## --libdir: This is the directory to which the cafe shared objects are 
 ##           installed 
-
-## --with-boost: base directory for the boost header files
-## --with-epics7: epics7 top level directory
-## --with-epics3: epics3 top level directory 
-##                Note that configure.ac assume that the architecture is
-##                base/lib/${EPICS_HOST_ARCH}
-
-## --with-qt5: Qt5 base directory (optional)
-## --with-python37:  Python 3.7 directory, if building PyCafe  
-## --with-python35:  Python 3.5 directory, if bulding PyCafe
-## Remaining libraries are specific to swissfel zmq streams
 ## --------------------------------------------------------------------------
 
 1) Modify autogen.sh according to above

autogen.sh

@@ -1,86 +0,0 @@
-### psi specific - select compiler
-rm -f configure.ac
-ln -s configurePSI.ac configure.ac
-rm -f src/PyCafe.cpp
-ln -s PyCafe_sls.cpp src/PyCafe.cpp
-rm -f ./aclocal.m4
-rm -rf ./autom4te.cache
-aclocal  --force -I m4
-/opt/gfa/python-3.7/latest/bin/libtoolize --force --copy #select libtools 2.4.6
-autoconf --force  #interprets configure.ac
-autoheader --force
-automake --force --add-missing --copy
-
-#Check what the EPICS RELEASE IS from ${EPICS}/base
-#Used by ./configure
-#Assumes format ${EPICS}/base-3.14.12
-#source cafeVersion-gcc-7.3.0
-CAFE_V="cafe-1.13.0"
-#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
-#Assume Linux but check if Darwin
-CAFE_HOST_FLAG_DARWIN=$(echo ${EPICS_HOST_ARCH} | grep -c "Darwin") 
-echo 'darwin' $CAFE_HOST_FLAG_DARWIN
-export CAFE_HOST_FLAG_DARWIN=$CAFE_HOST_FLAG_DARWIN
-
-EPICS_BASE=$(readlink ${EPICS}/base)
-#EB=$(readlink /afs/psi.ch/project/cafe/gitworkspace/CAFE/cpp/base)
-echo $EPICS_BASE
-if [ -z "$EPICS_BASE" ]
-then
-    EPICS_BASE='base-7.4.1' #7.0 = 7+0 = 7 for major release
-fi
-
-echo 'input' "$0" "$1" "$2"
-echo $EPICS_BASE
-
-
-EB1=$(echo $EPICS_BASE | sed -e "s/[a-zA-Z]*-//g")
-EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
-EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
-EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
-EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
-echo EPICS_MAJOR=$EBMAJ 
-echo EPICS_MINOR=$EBMIN 
-echo EPICS_PATCH=$EBPAT
-#echo $EBMIN1
-
-export CAFE_EPICS_V_MAJOR=$EBMAJ
-export CAFE_EPICS_V_MINOR=$EBMIN
-export CAFE_EPICS_V_PATCH=$EBPAT
-
-ENABLE_OPTIONS="--enable-boost-inc"
-ENABLE_OPTIONS+=" --enable-epics3"
-#ENABLE_OPTIONS+=" --enable-epics7"
-ENABLE_OPTIONS+=" --enable-qt5"
-#ENABLE_OPTIONS+=" --enable-qt4"
-ENABLE_OPTIONS+=" --enable-python37"
-#ENABLE_OPTIONS+=" --enable-python35"
-#ENABLE_OPTIONS+=" --enable-json"
-#ENABLE_OPTIONS+=" --enable-zeromq"
-#ENABLE_OPTIONS+=" --enable-curl"
-#ENABLE_OPTIONS+=" --enable-lz4"
-
-echo 'ENABLE_OPTIONS='$ENABLE_OPTIONS
-
-./configure \
-    --prefix=/opt/gfa/cafe/cpp/${CAFE_V} \
-    --libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${EPICS_HOST_ARCH} \
-    ${ENABLE_OPTIONS} \
-    --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
-    --with-epics7=${EPICS}/base-7.0.4.1 \
-    --with-epics3=${EPICS}/base \
-    --with-python37=/opt/gfa/python-3.7/latest \
-    --with-python35=/opt/gfa/python-3.5/latest \
-    --with-qt5=/opt/gfa/python-3.7/latest \
-    --with-qt4=/opt/gfa/python-3.5/latest \
-    --with-json=/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2 \
-    --with-zeromq=/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0 \
-    --with-curl=/opt/gfa/zmq/curl-7.55.1 \
-    --with-lz4=/opt/gfa/zmq/lz4/lib
-
-unset  CAFE_EPICS_V_PATCH
-unset  CAFE_EPICS_V_MINOR
-unset  CAFE_EPICS_V_MAJOR 
-
-unset  CAFE_HOST_FLAG_DARWIN
-

autogen.sh

@@ -0,0 +1 @@
+autogen_sfbd.sh

autogen_psi.sh

@@ -1,293 +0,0 @@
-### psi specific - select compiler
-#source <this_autogen_file> <facility> <target_language>
-#<facility = sls sls2 sf>  default is sf
-#<target_language = cpp matlab python> 
-module unload gcc
-module load gcc/7.3.0
-### psi specific - end
-
-rm -f configure.ac
-ln -s configurePSI.ac configure.ac
-
-rm -f ./aclocal.m4
-rm -rf ./autom4te.cache
-aclocal  --force -I m4
-/opt/gfa/python-3.7/latest/bin/libtoolize --force --copy #select libtools 2.4.6
-autoconf --force  #interprets configure.ac
-autoheader --force
-automake --force --add-missing --copy
-#autoreconf not wanted
-
-#Check what the EPICS RELEASE IS from ${EPICS}/base
-#Used by ./configure
-#Assumes format ${EPICS}/base-3.14.12
-#source cafeVersion-gcc-7.3.0
-CAFE_V="cafe-1.14.5"
-#For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
-#Assume Linux but check if Darwin
-CAFE_HOST_FLAG_DARWIN=$(echo ${EPICS_HOST_ARCH} | grep -c "Darwin") 
-export CAFE_HOST_FLAG_DARWIN=$CAFE_HOST_FLAG_DARWIN
-
-RETURN_ON_WRONG_INPUT=true
-RETURN_FLAG=false
-
-EPICS_BASE=$(readlink ${EPICS}/base)
-#EB=$(readlink /afs/psi.ch/project/cafe/gitworkspace/CAFE/cpp/base)
-echo $EPICS_BASE
-if [ -z "$EPICS_BASE" ]
-then
-    EPICS_BASE='base-7' #7.0 = 7+0 = 7 for major release
-fi
-
-echo 'input' "$0" "$1" "$2"
-echo $EPICS_BASE
-
-FACILITY=$(echo "$1" | tr '[:upper:]' '[:lower:]')
-CACLIENT=$(echo "$2" | tr '[:upper:]' '[:lower:]')
-
-FACILITY_DEFAULT="sf"
-CACLIENT_DEFAULT="python"
-
-FACILITY_TEMP=""
-CACLIENT_TEMP=""
-
-echo 'input arg. facility/target' $FACILITY $CACLIENT
-
-if [ -n "$FACILITY" ]
-then
-    if [ "$FACILITY" = "matlab" ] || [ "$FACILITY" = "python" ] || \
-       [ "$FACILITY" = "py310" ] || [ "$FACILITY" = "py38" ] || \
-       [ "$FACILITY" = "py37" ] || [ "$FACILITY" = "py35" ] || \
-       [ "$FACILITY" = "julia" ] || [ "$FACILITY" = "cpp" ] || \
-       [ "$FACILITY" = "cc" ] 
-    then
-	   CACLIENT_TEMP=$FACILITY
-	   FACILITY_TEMP=$2
-    fi
-fi
-
-if [ -n "$CACLIENT" ]
-then
-    if [ "$CACLIENT" = "sls" ] || [ "$CACLIENT" = "sls2" ] || \
-     [ "$CACLIENT" = "sf" ] || [ "$CACLIENT" = "swissfel" ] || \
-     [ "$CACLIENT" = "sfel" ] || [ "$CACLIENT" = "hipa" ]
-    then	
-	if [ -z $FACILITY_TEMP ]
-	then
-	    FACILITY_TEMP=$CACLIENT
-	    CACLIENT_TEMP=$1
-	fi
-    fi
-fi
-
-
-
-if [ -z "$FACILITY" ]
-then
-    FACILITY="sf"     
-    echo "FACILITY = " $FACILITY
-    if [ -z $CACLIENT ]
-    then
-	CACLIENT=$CACLIENT_DEFAULT
-    fi
-elif [ "$FACILITY" = "sls" ] || [ "$FACILITY" = "sls2" ] || \
-     [ "$FACILITY" = "sf" ] || [ "$FACILITY" = "swissfel" ] || \
-     [ "$FACILITY" = "sfel" ] || [ "$FACILITY" = "hipa" ]
-then
-    echo "FACILITY = " $FACILITY
-elif [ -n "$FACILITY_TEMP" ]
-then    
-    if [ "$FACILITY_TEMP" = "sls" ]  || [ "$FACILITY_TEMP" = "sls2" ] || \
-       [ "$FACILITY_TEMP" = "sf" ]   || [ "$FACILITY_TEMP" = "swissfel" ] || \
-       [ "$FACILITY_TEMP" = "sfel" ] || [ "$FACILITY_TEMP" = "hipa" ]
-    then
-
-	
-	FACILITY=$FACILITY_TEMP
-    else
-	if [ -n "$2" ] 
-	then
-	    echo "***UNRECOGNIZED INPUT FACILITY***" $FACILITY
-	    echo "***VALID VALUES ARE: sls sls2 sf hipa"
-	    RETURN_FLAG=true
-	fi
-	echo "***OTHERWISE THE DEFAULT FACILITY IS:" $FACILITY_DEFAULT	
-	FACILITY=$FACILITY_DEFAULT
-    fi
-else
-    echo "***UNRECOGNIZED INPUT FACILITY***" $FACILITY
-    echo "***VALID VALUES ARE: sls sls2 sf hipa"
-    RETURN_FLAG=true
-    echo "***OTHERWISE THE DEFAULT FACILITY IS: " $FACILITY_DEFAULT	
-    FACILITY=$FACILITY_DEFAULT    
-fi
-
-if [ -n "$CACLIENT" ]
-then
-    if [ "$CACLIENT" = "matlab" ] || [ "$CACLIENT" = "python" ] || \
-       [ "$CACLIENT" = "py310" ] ||  [ "$CACLIENT" = "py38" ] || \
-       [ "$CACLIENT" = "py37" ] || [ "$CACLIENT" = "py35" ] || \
-       [ "$CACLIENT" = "julia" ] || [ "$CACLIENT" = "cpp" ] || \
-       [ "$CACLIENT" = "cc" ] 
-    then 	  
-	echo "CA TARGET = " $CACLIENT
-    else
-	if [ -n "$CACLIENT_TEMP" ]
-	then    
-	    if [ "$CACLIENT_TEMP" = "matlab" ] || [ "$CACLIENT_TEMP" = "python" ] || \
-	       [ "$CACLIENT_TEMP" = "py310" ] ||  [ "$CACLIENT_TEMP" = "py38" ] || \	
-	       [ "$CACLIENT_TEMP" = "py37" ] || [ "$CACLIENT_TEMP" = "py35" ] || \
-	       [ "$CACLIENT_TEMP" = "julia" ] || [ "$CACLIENT_TEMP" = "cpp" ] || \
-	       [ "$CACLIENT_TEMP" = "cc" ] 
-	    then
-		CACLIENT=$CACLIENT_TEMP	
-	    else
-		echo "***UNRECOGNIZED INPUT CA TARGET***" $CACLIENT 
-		echo "***VALID VALUES ARE: cpp matlab python"
-		RETURN_FLAG=true
-		echo "***OTHERWISE THE DEFAULT CA TARGET IS:" $CACLIENT_DEFAULT
-		CACLIENT=$CACLIENT_DEFAULT
-	    fi
-	else
-	    echo "***UNRECOGNIZED INPUT CA TARGET***" $CACLIENT 
-	    echo "***VALID VALUES ARE: cpp matlab python"
-	    RETURN_FLAG=true
-	    echo "***OTHERWISE THE DEFAULT CA TARGET IS:" $CACLIENT_DEFAULT 
-	    CACLIENT=$CACLIENT_DEFAULT	
-	fi
-    fi
-else
-    CACLIENT=$CACLIENT_DEFAULT
-fi
-
-
-
-if [ $RETURN_ON_WRONG_INPUT = true ] ; then
-    if [ $RETURN_FLAG = true ] ; then 
-	return 1 2>/dev/null
-	exit 1
-    fi
-fi
-
-echo "FACILITY SELECTED = " $FACILITY 
-echo "CA TARGET  SELECTED = "  $CACLIENT
-
-ENABLE_OPTIONS="--enable-boost-inc"
-
-if [ "$FACILITY" = "sfel" ] || [ "$FACILITY" = "swissfel" ] 
-then
-    FACILITY="sf"
-fi
-
-if [ "$CACLIENT" = "python" ] || [ "$CACLIENT" = "julia" ]
-then
-    CACLIENT="py37"
-fi
-
-
-if [ "$FACILITY" = "sls2" ]
-then
-    ENABLE_OPTIONS+=" --enable-epics7"
-    CAFE_V+="-sls2"
-else
-    ENABLE_OPTIONS+=" --enable-epics3"
-    if [ "$FACILITY" = "sf" ]  && [ "$CACLIENT" != "matlab" ]
-    then
-	CAFE_V+="-sf"
-    fi
-fi
-
-if [ "$CACLIENT" = "py35" ]
-then
-    ENABLE_OPTIONS+=" --enable-python35"
-    ENABLE_OPTIONS+=" --enable-qt4"
-    CAFE_V+="-py35"
-elif  [ "$CACLIENT" = "py37" ]
-then
-    ENABLE_OPTIONS+=" --enable-python37"
-    ENABLE_OPTIONS+=" --enable-qt5"
-    CAFE_V+="-py37" 
-elif  [ "$CACLIENT" = "py38" ]
-then
-    ENABLE_OPTIONS+=" --enable-python38"
-    ENABLE_OPTIONS+=" --enable-qt5py38"
-    CAFE_V+="-py38"
-elif  [ "$CACLIENT" = "py310" ]
-then
-    ENABLE_OPTIONS+=" --enable-python310"
-    #ENABLE_OPTIONS+=" --enable-qt5py310"
-    CAFE_V+="-py310"
-else
-    ENABLE_OPTIONS+=" --enable-qt5" 
-fi
-
-if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
-then
-    #rm -f src/PyCafe.cpp
-    #ln -s PyCafe3.cpp src/PyCafe.cpp
-    ENABLE_OPTIONS+=" --enable-json"
-    ENABLE_OPTIONS+=" --enable-zeromq"
-    ENABLE_OPTIONS+=" --enable-curl"
-    ENABLE_OPTIONS+=" --enable-lz4"
-#else
-    #rm -f src/PyCafe.cpp
-    #ln -s PyCafe_sls.cpp src/PyCafe.cpp 
-fi
-
-CAFE_V+="-gcc-"$GCC_VERSION
-
-echo "$CAFE_V"
-
-#echo 'EPICS BASE IS='$EPICS_BASE
-#echo 'EPICS BASE DIR='${EPICS}/base-7.0.4.1
-
-EB1=$(echo $EPICS_BASE | sed -e "s/[a-zA-Z]*-//g")
-EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
-EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
-EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
-EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
-echo EPICS_MAJOR=$EBMAJ 
-echo EPICS_MINOR=$EBMIN 
-echo EPICS_PATCH=$EBPAT
-#echo $EBMIN1
-
-export CAFE_EPICS_V_MAJOR=$EBMAJ
-export CAFE_EPICS_V_MINOR=$EBMIN
-export CAFE_EPICS_V_PATCH=$EBPAT
-
-#ENABLE_OPTIONS+=" --enable-qt5"
-##ENABLE_OPTIONS+=" --enable-qt4"
-#ENABLE_OPTIONS+=" --enable-python37"
-##ENABLE_OPTIONS+=" --enable-python35"
-#ENABLE_OPTIONS+=" --enable-json"
-#ENABLE_OPTIONS+=" --enable-zeromq"
-#ENABLE_OPTIONS+=" --enable-curl"
-#ENABLE_OPTIONS+=" --enable-lz4"
-
-echo 'ENABLE_OPTIONS='$ENABLE_OPTIONS
-
-./configure \
-    --prefix=/opt/gfa/cafe/cpp/${CAFE_V} \
-    --libdir=/opt/gfa/cafe/cpp/${CAFE_V}/lib/${EPICS_HOST_ARCH} \
-    ${ENABLE_OPTIONS} \
-    --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
-    --with-epics3=${EPICS}/base \
-    --with-python310=/ioc/python/latest \
-    --with-python38=/opt/gfa/python-3.8/latest \
-    --with-python37=/opt/gfa/python-3.7/latest \
-    --with-python35=/opt/gfa/python-3.5/latest \
-    --with-qt5py310=/ioc/python/latest \
-    --with-qt5py38=/opt/gfa/python-3.8/latest \
-    --with-qt5=/opt/gfa/python-3.7/latest \
-    --with-qt4=/opt/gfa/python-3.5/latest \
-    --with-json=/opt/gfa/zmq/json/jsoncpp-src-0.6.0-rc2 \
-    --with-zeromq=/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0 \
-    --with-curl=/opt/gfa/zmq/curl-7.55.1 \
-    --with-lz4=/opt/gfa/zmq/lz4/lib \
-    --with-epics7=${EPICS}/base-7.0.6  
-unset  CAFE_EPICS_V_PATCH
-unset  CAFE_EPICS_V_MINOR
-unset  CAFE_EPICS_V_MAJOR 
-
-unset  CAFE_HOST_FLAG_DARWIN
-

autogen_sfbd.sh

@@ -3,8 +3,11 @@
 #<facility = sls sls2 sf>  default is sf
 #<target_language = cpp matlab python> 
 module unload gcc
-#module load gcc/7.3.0 #7.5.0 for py38 py310 7.3.0 py37
+module load gcc/10.4.0  ##rhel8 - default 
-module load gcc/10.4.0  ##rhel8
+#Above overwritten for python in the below
+#module load gcc/7.3.0 for py35 py37
+#module load gcc/7.5.0 for py38 py310 
+
 ### psi specific - end
 
 rm -f configure.ac
@@ -24,8 +27,8 @@ automake --force --add-missing --copy
 #Used by ./configure
 #Assumes format ${EPICS}/base-3.14.12
 #source cafeVersion-gcc-7.3.0
-CAFE_V="cafe-1.20.1"
+CAFE_V="cafe-1.22.0"
-EPICS_BASE='base-7.0.7' #
+EPICS_BASE='base-7.0.9' #
 
 #For later check of existence of HOST_ARCH for $EPICS/include/os/$HOST_ARCH
 #Assume Linux but check if Darwin
@@ -207,6 +210,9 @@ else
     if [ "$FACILITY" = "sf" ]  && [ "$CACLIENT" != "matlab" ]
     then
 	CAFE_V+="-sf"
+    elif [ "$FACILITY" = "hipa" ]  && [ "$CACLIENT" != "matlab" ]
+    then
+	CAFE_V+="-hipa"	
     elif [ "$FACILITY" = "sls" ]  && [ "$CACLIENT" != "matlab" ]
     then
 	CAFE_V+="-epics3"	
@@ -220,34 +226,49 @@ then
     ENABLE_OPTIONS+=" --enable-python34"
     ENABLE_OPTIONS+=" --enable-qt4py34"
     CAFE_V+="-py34"
+    module unload
+    module load gcc/7.3.0
 elif [ "$CACLIENT" = "py35" ]
 then
     ENABLE_OPTIONS+=" --enable-python35"
     ENABLE_OPTIONS+=" --enable-qt4"
     CAFE_V+="-py35"
+    module unload
+    module load gcc/7.3.0
 elif  [ "$CACLIENT" = "py37" ]
 then
     ENABLE_OPTIONS+=" --enable-python37"
     ENABLE_OPTIONS+=" --enable-qt5"
     CAFE_V+="-py37"
+    module unload
+    module load gcc/7.5.0
 elif  [ "$CACLIENT" = "py38" ]
 then
     ENABLE_OPTIONS+=" --enable-python38"
     ENABLE_OPTIONS+=" --enable-qt5py38"
     CAFE_V+="-py38"
+    module unload
+    module load gcc/7.5.0
 elif  [ "$CACLIENT" = "py39" ]
 then
     ENABLE_OPTIONS+=" --enable-python39"
     ENABLE_OPTIONS+=" --enable-qt5py39"
     CAFE_V+="-py39"
+    module load gcc/7.5.0
 elif  [ "$CACLIENT" = "py310" ]
 then
     ENABLE_OPTIONS+=" --enable-python310"
-    #ENABLE_OPTIONS+=" --enable-qt5py310"
+    ENABLE_OPTIONS+=" --enable-qt5py310"
     CAFE_V+="-py310"
+    module unload
+    module load gcc/7.5.0
+  
 elif  [ "$CACLIENT" = "cpp" ]
 then
-    ENABLE_OPTIONS+=" --enable-qt5" 
+    if [ "$FACILITY" != "hipa" ] 
+    then
+	ENABLE_OPTIONS+=" --enable-qt5py310"
+    fi
 fi
 
 if [ "$FACILITY" = "sf" ] && [ "$CACLIENT" != "matlab" ]
@@ -258,6 +279,8 @@ then
     ENABLE_OPTIONS+=" --enable-zeromq"
     ENABLE_OPTIONS+=" --enable-curl"
     ENABLE_OPTIONS+=" --enable-lz4"
+    module unload
+    module load gcc/7.3.0
 #else
     #rm -f src/PyCafe.cpp
     #ln -s PyCafe_sls.cpp src/PyCafe.cpp 
@@ -312,10 +335,10 @@ echo 'ENABLE_OPTIONS============> '$ENABLE_OPTIONS
     --with-qt5=/opt/gfa/python-3.7/latest \
     --with-qt4=/opt/gfa/python-3.5/latest \
     --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 \
-    --with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \
+    --with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2 \
-    --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
+    --with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0 \
-    --with-curl=/sf/bd/deps/zmq/curl-7.55.1 \
+    --with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1 \
-    --with-lz4=/sf/bd/deps/zmq/lz4/lib \
+    --with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib \
     --with-epics7=/usr/local/epics/${EPICS_BASE} 
 unset  CAFE_EPICS_V_PATCH
 unset  CAFE_EPICS_V_MINOR

cafe_version.py

@@ -0,0 +1,24 @@
+# Converts cafe 'major' 'minor' 'revision'
+# to syntax for use in libcafe_la_LDFLAGS
+# in src/makefile.am
+#
+import sys
+
+if (len(sys.argv) != 4):
+    print('Usage: cafe_version_py major minor revision')
+    print('Usage: e.g. cafe_version.py 1.22.0 returns 23:0:22')
+    sys.exit()
+
+print(f'input args: {sys.argv}')
+print('Change the following in src/makefile.am')
+major = int(sys.argv[1])
+minor = int(sys.argv[2])
+rev = int(sys.argv[3])
+
+
+current = major+minor 
+revision = rev
+age = minor
+
+
+print(f'libcafe_la_LDFLAGS = -version-info {current}:{revision}:{age}') 

config.log

@@ -1,20 +1,20 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CAFE configure 1.20.1, which was
+It was created by CAFE configure 1.22.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --prefix=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64 --enable-boost-inc --enable-epics7 --enable-qt5 --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include --with-epics3=/usr/local/epics/base --with-python310=/opt/gfa/python-3.10/latest --with-python38=/opt/gfa/python-3.8/latest --with-python37=/opt/gfa/python-3.7/latest --with-python35=/opt/gfa/python-3.5/latest --with-python34=/opt/psi/Programming/psi-python34/2.1.0 --with-qt5py310=/opt/gfa/python-3.10/latest --with-qt5py38=/opt/gfa/python-3.8/latest --with-qt5=/opt/gfa/python-3.7/latest --with-qt4=/opt/gfa/python-3.5/latest --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 --with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 --with-curl=/sf/bd/deps/zmq/curl-7.55.1 --with-lz4=/sf/bd/deps/zmq/lz4/lib --with-epics7=/usr/local/epics/base-7.0.7
+  $ ./configure --prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64 --enable-boost-inc --enable-epics7 --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include --with-epics3=/usr/local/epics/base --with-python310=/opt/gfa/python-3.10/latest --with-python38=/opt/gfa/python-3.8/latest --with-python37=/opt/gfa/python-3.7/latest --with-python35=/opt/gfa/python-3.5/latest --with-python34=/opt/psi/Programming/psi-python34/2.1.0 --with-qt5py310=/opt/gfa/python-3.10/latest --with-qt5py38=/opt/gfa/python-3.8/latest --with-qt5=/opt/gfa/python-3.7/latest --with-qt4=/opt/gfa/python-3.5/latest --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 --with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2 --with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0 --with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1 --with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib --with-epics7=/usr/local/epics/base-7.0.9 CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++ CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc --no-create --no-recursion
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = sf-lc8.psi.ch
+hostname = sls-lc8.psi.ch
 uname -m = x86_64
-uname -r = 4.18.0-513.11.1.el8_9.x86_64
+uname -r = 4.18.0-553.22.1.el8_10.x86_64
 uname -s = Linux
-uname -v = #1 SMP Thu Dec 7 03:06:13 EST 2023
+uname -v = #1 SMP Wed Sep 11 18:02:00 EDT 2024
 
 /usr/bin/uname -p = x86_64
 /bin/uname -X     = unknown
@@ -28,20 +28,32 @@ uname -v = #1 SMP Thu Dec 7 03:06:13 EST 2023
 /bin/universe          = unknown
 
 PATH: /opt/psi/Programming/gcc/10.4.0/bin
-PATH: /opt/psi/Programming/matlab/2024a/bin
+PATH: /opt/psi/Programming/matlab/2024b/bin
+PATH: /opt/gfa/python-3.7/2018.12/bin
+PATH: /opt/gfa/python-3.7/2018.12/condabin
+PATH: /opt/gfa/python-3.5/latest/bin
 PATH: /usr/local/epics/seq/bin/RHEL8-x86_64
-PATH: .
 PATH: /usr/lib/openoffice.org/program
 PATH: /opt/psi/Tools/HDFView/3.1.2/bin
 PATH: /usr/share/Modules/bin
+PATH: /sbin
+PATH: /bin
+PATH: /sls/bd/bin
+PATH: /sls/controls/bin
+PATH: /sls/diag/bin
+PATH: /sls/mag/bin
+PATH: /sls/metro/bin
+PATH: /sls/op/bin
+PATH: /sls/plc
+PATH: /sls/rf/bin
+PATH: /sls/vcs/bin
 PATH: /usr/local/bin
 PATH: /usr/bin
 PATH: /usr/local/sbin
 PATH: /usr/sbin
-PATH: /usr/local/epics/base-7.0.7/bin/RHEL8-x86_64
+PATH: /usr/local/epics/base-7.0.9/bin/RHEL8-x86_64
-PATH: /sf/controls/bin
+PATH: /sls/bd/bin
-PATH: /sf/diag/bin
+PATH: /sls/controls/bin
-PATH: /sf/bd/bin
 PATH: /opt/puppetlabs/bin
 PATH: /afs/psi.ch/project/zeromq/deps/pycharm-community-2018.1.4/bin
 PATH: /afs/psi.ch/user/c/chrin/Downloads/astyle/build/gcc/bin
@@ -55,13 +67,13 @@ PATH: /afs/psi.ch/user/c/chrin/bin
 ## ----------- ##
 
 configure:2503: checking for a BSD-compatible install
-configure:2571: result: /usr/bin/install -c
+configure:2571: result: /bin/install -c
 configure:2582: checking whether build environment is sane
 configure:2637: result: yes
 configure:2788: checking for a thread-safe mkdir -p
-configure:2827: result: /usr/bin/mkdir -p
+configure:2827: result: /bin/mkdir -p
 configure:2834: checking for gawk
-configure:2850: found /usr/bin/gawk
+configure:2850: found /bin/gawk
 configure:2861: result: gawk
 configure:2872: checking whether make sets $(MAKE)
 configure:2894: result: yes
@@ -78,7 +90,7 @@ configure:3209: $? = 0
 configure:3198: /opt/psi/Programming/gcc/10.4.0/bin/g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=/opt/psi/Programming/gcc/10.4.0/bin/g++
-COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
+COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
 Target: x86_64-pc-linux-gnu
 Configured with: /opt/psi/var/tmp/gsell/gcc-10.4.0/src/configure --prefix=/opt/psi/Programming/gcc/10.4.0 --enable-languages=c,c++,objc,obj-c++,lto,fortran,go --with-gmp=/opt/psi/Libraries/gmp/6.2.1 --with-mpfr=/opt/psi/Libraries/mpfr/4.1.0 --with-mpc=/opt/psi/Libraries/mpc/1.2.1 --enable-lto --disable-multilib --with-pkgversion=''\''PSI Environment Module'\''' --with-build-config=bootstrap-debug
 Thread model: posix
@@ -125,6 +137,8 @@ configure:3520: $? = 0
 configure:3561: result: yes
 configure:3587: checking whether make supports the include directive
 configure:3602: make -f confmf.GNU && cat confinc.out
+make[1]: Entering directory '/afs/psi.ch/project/cafe/gitea/CAFE/cpp'
+make[1]: Leaving directory '/afs/psi.ch/project/cafe/gitea/CAFE/cpp'
 this is the am__doit target
 configure:3605: $? = 0
 configure:3624: result: yes (GNU style)
@@ -149,7 +163,7 @@ configure:4266: $? = 0
 configure:4255: /opt/psi/Programming/gcc/10.4.0/bin/gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=/opt/psi/Programming/gcc/10.4.0/bin/gcc
-COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
+COLLECT_LTO_WRAPPER=/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../libexec/gcc/x86_64-pc-linux-gnu/10.4.0/lto-wrapper
 Target: x86_64-pc-linux-gnu
 Configured with: /opt/psi/var/tmp/gsell/gcc-10.4.0/src/configure --prefix=/opt/psi/Programming/gcc/10.4.0 --enable-languages=c,c++,objc,obj-c++,lto,fortran,go --with-gmp=/opt/psi/Libraries/gmp/6.2.1 --with-mpfr=/opt/psi/Libraries/mpfr/4.1.0 --with-mpc=/opt/psi/Libraries/mpc/1.2.1 --enable-lto --disable-multilib --with-pkgversion=''\''PSI Environment Module'\''' --with-build-config=bootstrap-debug
 Thread model: posix
@@ -187,22 +201,22 @@ configure:4523: result: yes
 configure:4542: checking dependency style of /opt/psi/Programming/gcc/10.4.0/bin/gcc
 configure:4653: result: gcc3
 configure:4668: checking for a sed that does not truncate output
-configure:4732: result: /usr/bin/sed
+configure:4732: result: /bin/sed
 configure:4750: checking for grep that handles long lines and -e
-configure:4808: result: /usr/bin/grep
+configure:4808: result: /bin/grep
 configure:4813: checking for egrep
-configure:4875: result: /usr/bin/grep -E
+configure:4875: result: /bin/grep -E
 configure:4880: checking for fgrep
-configure:4942: result: /usr/bin/grep -F
+configure:4942: result: /bin/grep -F
 configure:4977: checking for ld used by /opt/psi/Programming/gcc/10.4.0/bin/gcc
-configure:5044: result: /usr/bin/ld
+configure:5044: result: /bin/ld
-configure:5051: checking if the linker (/usr/bin/ld) is GNU ld
+configure:5051: checking if the linker (/bin/ld) is GNU ld
 configure:5066: result: yes
 configure:5078: checking for BSD- or MS-compatible name lister (nm)
-configure:5132: result: /usr/bin/nm -B
+configure:5132: result: /bin/nm -B
-configure:5262: checking the name lister (/usr/bin/nm -B) interface
+configure:5262: checking the name lister (/bin/nm -B) interface
 configure:5269: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  conftest.cpp >&5
-configure:5272: /usr/bin/nm -B "conftest.o"
+configure:5272: /bin/nm -B "conftest.o"
 configure:5275: output
 0000000000000000 B some_variable
 configure:5282: result: BSD nm
@@ -214,10 +228,10 @@ configure:5476: checking how to convert x86_64-pc-linux-gnu file names to x86_64
 configure:5516: result: func_convert_file_noop
 configure:5523: checking how to convert x86_64-pc-linux-gnu file names to toolchain format
 configure:5543: result: func_convert_file_noop
-configure:5550: checking for /usr/bin/ld option to reload object files
+configure:5550: checking for /bin/ld option to reload object files
 configure:5557: result: -r
 configure:5631: checking for objdump
-configure:5647: found /usr/bin/objdump
+configure:5647: found /bin/objdump
 configure:5658: result: objdump
 configure:5690: checking how to recognize dependent libraries
 configure:5890: result: pass_all
@@ -226,7 +240,7 @@ configure:6005: result: no
 configure:6035: checking how to associate runtime and link libraries
 configure:6062: result: printf %s\n
 configure:6123: checking for ar
-configure:6139: found /usr/bin/ar
+configure:6139: found /bin/ar
 configure:6150: result: ar
 configure:6187: checking for archiver @FILE support
 configure:6204: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  conftest.cpp >&5
@@ -238,15 +252,15 @@ ar: conftest.o: No such file or directory
 configure:6218: $? = 1
 configure:6230: result: @
 configure:6288: checking for strip
-configure:6304: found /usr/bin/strip
+configure:6304: found /bin/strip
 configure:6315: result: strip
 configure:6387: checking for ranlib
-configure:6403: found /usr/bin/ranlib
+configure:6403: found /bin/ranlib
 configure:6414: result: ranlib
-configure:6516: checking command to parse /usr/bin/nm -B output from /opt/psi/Programming/gcc/10.4.0/bin/gcc object
+configure:6516: checking command to parse /bin/nm -B output from /opt/psi/Programming/gcc/10.4.0/bin/gcc object
 configure:6669: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  conftest.cpp >&5
 configure:6672: $? = 0
-configure:6676: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
+configure:6676: /bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
 configure:6679: $? = 0
 configure:6745: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2   conftest.cpp conftstm.o >&5
 configure:6748: $? = 0
@@ -254,9 +268,9 @@ configure:6786: result: ok
 configure:6833: checking for sysroot
 configure:6863: result: no
 configure:6870: checking for a working dd
-configure:6908: result: /usr/bin/dd
+configure:6908: result: /bin/dd
 configure:6912: checking how to truncate binary pipes
-configure:6927: result: /usr/bin/dd bs=4096 count=1
+configure:6927: result: /bin/dd bs=4096 count=1
 configure:7064: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  conftest.cpp >&5
 configure:7067: $? = 0
 configure:7257: checking for mt
@@ -277,12 +291,12 @@ configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "CAFE"
 | #define PACKAGE_TARNAME "cafe"
-| #define PACKAGE_VERSION "1.20.1"
+| #define PACKAGE_VERSION "1.22.0"
-| #define PACKAGE_STRING "CAFE 1.20.1"
+| #define PACKAGE_STRING "CAFE 1.22.0"
 | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch"
 | #define PACKAGE_URL ""
 | #define PACKAGE "cafe"
-| #define VERSION "1.20.1"
+| #define VERSION "1.22.0"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:8068: result: /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
@@ -298,12 +312,12 @@ configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "CAFE"
 | #define PACKAGE_TARNAME "cafe"
-| #define PACKAGE_VERSION "1.20.1"
+| #define PACKAGE_VERSION "1.22.0"
-| #define PACKAGE_STRING "CAFE 1.20.1"
+| #define PACKAGE_STRING "CAFE 1.22.0"
 | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch"
 | #define PACKAGE_URL ""
 | #define PACKAGE "cafe"
-| #define VERSION "1.20.1"
+| #define VERSION "1.22.0"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:8131: checking for ANSI C header files
@@ -375,47 +389,47 @@ configure:9347: $? = 0
 configure:9369: result: yes
 configure:9377: checking if /opt/psi/Programming/gcc/10.4.0/bin/gcc supports -c -o file.o
 configure:9424: result: yes
-configure:9457: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:9457: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/gcc linker (/bin/ld -m elf_x86_64) supports shared libraries
 configure:10716: result: yes
 configure:10753: checking whether -lc should be explicitly linked in
 configure:10761: /opt/psi/Programming/gcc/10.4.0/bin/gcc -c -g -O2  conftest.c >&5
 configure:10764: $? = 0
-configure:10779: /opt/psi/Programming/gcc/10.4.0/bin/gcc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
+configure:10779: /opt/psi/Programming/gcc/10.4.0/bin/gcc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep  -lc  \>/dev/null 2\>\&1
 configure:10782: $? = 0
 configure:10796: result: no
 configure:10956: checking dynamic linker characteristics
 configure:11537: /opt/psi/Programming/gcc/10.4.0/bin/gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
 configure:11537: $? = 0
-configure:11777: result: GNU/Linux ld.so
+configure:11774: result: GNU/Linux ld.so
-configure:11899: checking how to hardcode library paths into programs
+configure:11896: checking how to hardcode library paths into programs
-configure:11924: result: immediate
+configure:11921: result: immediate
-configure:12472: checking whether stripping libraries is possible
+configure:12469: checking whether stripping libraries is possible
-configure:12477: result: yes
+configure:12474: result: yes
-configure:12512: checking if libtool supports shared libraries
+configure:12509: checking if libtool supports shared libraries
-configure:12514: result: yes
+configure:12511: result: yes
-configure:12517: checking whether to build shared libraries
+configure:12514: checking whether to build shared libraries
-configure:12542: result: yes
+configure:12539: result: yes
-configure:12545: checking whether to build static libraries
+configure:12542: checking whether to build static libraries
-configure:12549: result: yes
+configure:12546: result: yes
-configure:12572: checking how to run the C++ preprocessor
+configure:12569: checking how to run the C++ preprocessor
-configure:12599: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
+configure:12596: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
-configure:12599: $? = 0
+configure:12596: $? = 0
-configure:12613: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
+configure:12610: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
 conftest.cpp:23:10: fatal error: ac_nonexistent.h: No such file or directory
    23 | #include <ac_nonexistent.h>
       |          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:12613: $? = 1
+configure:12610: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "CAFE"
 | #define PACKAGE_TARNAME "cafe"
-| #define PACKAGE_VERSION "1.20.1"
+| #define PACKAGE_VERSION "1.22.0"
-| #define PACKAGE_STRING "CAFE 1.20.1"
+| #define PACKAGE_STRING "CAFE 1.22.0"
 | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch"
 | #define PACKAGE_URL ""
 | #define PACKAGE "cafe"
-| #define VERSION "1.20.1"
+| #define VERSION "1.22.0"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -430,25 +444,25 @@ configure: failed program was:
 | #define LT_OBJDIR ".libs/"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:12638: result: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
+configure:12635: result: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
-configure:12658: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
+configure:12655: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
-configure:12658: $? = 0
+configure:12655: $? = 0
-configure:12672: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
+configure:12669: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  conftest.cpp
 conftest.cpp:23:10: fatal error: ac_nonexistent.h: No such file or directory
    23 | #include <ac_nonexistent.h>
       |          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:12672: $? = 1
+configure:12669: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "CAFE"
 | #define PACKAGE_TARNAME "cafe"
-| #define PACKAGE_VERSION "1.20.1"
+| #define PACKAGE_VERSION "1.22.0"
-| #define PACKAGE_STRING "CAFE 1.20.1"
+| #define PACKAGE_STRING "CAFE 1.22.0"
 | #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch"
 | #define PACKAGE_URL ""
 | #define PACKAGE "cafe"
-| #define VERSION "1.20.1"
+| #define VERSION "1.22.0"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -463,127 +477,82 @@ configure: failed program was:
 | #define LT_OBJDIR ".libs/"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:12834: checking for ld used by /opt/psi/Programming/gcc/10.4.0/bin/g++
+configure:12831: checking for ld used by /opt/psi/Programming/gcc/10.4.0/bin/g++
-configure:12901: result: /usr/bin/ld -m elf_x86_64
+configure:12898: result: /bin/ld -m elf_x86_64
-configure:12908: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld
+configure:12905: checking if the linker (/bin/ld -m elf_x86_64) is GNU ld
-configure:12923: result: yes
+configure:12920: result: yes
-configure:12978: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:12975: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/g++ linker (/bin/ld -m elf_x86_64) supports shared libraries
-configure:14051: result: yes
+configure:14048: result: yes
-configure:14087: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  conftest.cpp >&5
+configure:14084: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  conftest.cpp >&5
-configure:14090: $? = 0
+configure:14087: $? = 0
-configure:14571: checking for /opt/psi/Programming/gcc/10.4.0/bin/g++ option to produce PIC
+configure:14568: checking for /opt/psi/Programming/gcc/10.4.0/bin/g++ option to produce PIC
-configure:14578: result: -fPIC -DPIC
+configure:14575: result: -fPIC -DPIC
-configure:14586: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ PIC flag -fPIC -DPIC works
+configure:14583: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ PIC flag -fPIC -DPIC works
-configure:14604: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fPIC -DPIC -DPIC conftest.cpp >&5
+configure:14601: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fPIC -DPIC -DPIC conftest.cpp >&5
-configure:14608: $? = 0
+configure:14605: $? = 0
-configure:14621: result: yes
+configure:14618: result: yes
-configure:14644: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ static flag -static works
+configure:14641: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ static flag -static works
-configure:14672: result: no
+configure:14669: result: no
-configure:14684: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ supports -c -o file.o
+configure:14681: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ supports -c -o file.o
-configure:14705: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
+configure:14702: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
-configure:14709: $? = 0
+configure:14706: $? = 0
-configure:14731: result: yes
+configure:14728: result: yes
-configure:14736: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ supports -c -o file.o
+configure:14733: checking if /opt/psi/Programming/gcc/10.4.0/bin/g++ supports -c -o file.o
-configure:14783: result: yes
+configure:14780: result: yes
-configure:14813: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:14810: checking whether the /opt/psi/Programming/gcc/10.4.0/bin/g++ linker (/bin/ld -m elf_x86_64) supports shared libraries
-configure:14853: result: yes
+configure:14850: result: yes
-configure:14994: checking dynamic linker characteristics
+configure:14991: checking dynamic linker characteristics
-configure:15742: result: GNU/Linux ld.so
+configure:15736: result: GNU/Linux ld.so
-configure:15807: checking how to hardcode library paths into programs
+configure:15801: checking how to hardcode library paths into programs
-configure:15832: result: immediate
+configure:15826: result: immediate
-configure:16057: checking cadef.h usability
+configure:16051: checking cadef.h usability
-configure:16057: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp >&5
+configure:16051: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc conftest.cpp >&5
-configure:16057: $? = 0
+configure:16051: $? = 0
-configure:16057: result: yes
+configure:16051: result: yes
-configure:16057: checking cadef.h presence
+configure:16051: checking cadef.h presence
-configure:16057: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp
+configure:16051: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc conftest.cpp
-configure:16057: $? = 0
+configure:16051: $? = 0
-configure:16057: result: yes
+configure:16051: result: yes
-configure:16057: checking for cadef.h
+configure:16051: checking for cadef.h
-configure:16057: result: yes
+configure:16051: result: yes
-configure:16076: checking epicsTypes.h usability
+configure:16070: checking epicsTypes.h usability
-configure:16076: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp >&5
+configure:16070: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc conftest.cpp >&5
-configure:16076: $? = 0
+configure:16070: $? = 0
-configure:16076: result: yes
+configure:16070: result: yes
-configure:16076: checking epicsTypes.h presence
+configure:16070: checking epicsTypes.h presence
-configure:16076: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc conftest.cpp
+configure:16070: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc conftest.cpp
-configure:16076: $? = 0
+configure:16070: $? = 0
-configure:16076: result: yes
+configure:16070: result: yes
-configure:16076: checking for epicsTypes.h
+configure:16070: checking for epicsTypes.h
-configure:16076: result: yes
+configure:16070: result: yes
-configure:16093: checking for main in -lca
+configure:16087: checking for main in -lca
-configure:16112: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 conftest.cpp -lca   >&5
+configure:16106: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 conftest.cpp -lca   >&5
-/usr/bin/ld: warning: -z nodefs ignored.
+/bin/ld: warning: -z nodefs ignored.
-configure:16112: $? = 0
+configure:16106: $? = 0
-configure:16121: result: yes
+configure:16115: result: yes
-configure:16134: checking for main in -lCom
+configure:16128: checking for main in -lCom
-configure:16153: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 conftest.cpp -lCom   >&5
+configure:16147: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 conftest.cpp -lCom   >&5
-/usr/bin/ld: warning: -z nodefs ignored.
+/bin/ld: warning: -z nodefs ignored.
-configure:16153: $? = 0
+configure:16147: $? = 0
-configure:16162: result: yes
+configure:16156: result: yes
-configure:16175: checking for main in -ldl
+configure:16169: checking for main in -ldl
-configure:16194: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 conftest.cpp -ldl   >&5
+configure:16188: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 conftest.cpp -ldl   >&5
-/usr/bin/ld: warning: -z nodefs ignored.
+/bin/ld: warning: -z nodefs ignored.
-configure:16194: $? = 0
+configure:16188: $? = 0
-configure:16203: result: yes
+configure:16197: result: yes
-configure:16408: checking multi_index_container.hpp usability
+configure:16402: checking multi_index_container.hpp usability
-configure:16408: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp >&5
+configure:16402: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp >&5
-configure:16408: $? = 0
+configure:16402: $? = 0
-configure:16408: result: yes
+configure:16402: result: yes
-configure:16408: checking multi_index_container.hpp presence
+configure:16402: checking multi_index_container.hpp presence
-configure:16408: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp
+configure:16402: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include conftest.cpp
-configure:16408: $? = 0
+configure:16402: $? = 0
-configure:16408: result: yes
+configure:16402: result: yes
-configure:16408: checking for multi_index_container.hpp
+configure:16402: checking for multi_index_container.hpp
-configure:16408: result: yes
+configure:16402: result: yes
-configure:17122: checking qxml.h usability
+configure:18163: checking that generated files are newer than configure
-configure:17122: /opt/psi/Programming/gcc/10.4.0/bin/g++ -c -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml conftest.cpp >&5
+configure:18169: result: done
-configure:17122: $? = 0
+configure:18208: creating ./config.status
-configure:17122: result: yes
-configure:17122: checking qxml.h presence
-configure:17122: /opt/psi/Programming/gcc/10.4.0/bin/g++ -E  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml conftest.cpp
-configure:17122: $? = 0
-configure:17122: result: yes
-configure:17122: checking for qxml.h
-configure:17122: result: yes
-configure:17232: checking for write in -lQt5Core
-configure:17257: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  conftest.cpp -lQt5Core   >&5
-/usr/bin/ld: warning: -z nodefs ignored.
-configure:17257: $? = 0
-configure:17266: result: yes
-configure:17284: checking for qt_version_tag in -lQt5Xml
-configure:17309: /opt/psi/Programming/gcc/10.4.0/bin/g++ -o conftest -g -O2  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  conftest.cpp -lQt5Xml  -lQt5Core  >&5
-/usr/bin/ld: warning: -z nodefs ignored.
-configure:17309: $? = 0
-configure:17318: result: yes
-configure:18169: checking that generated files are newer than configure
-configure:18175: result: done
-configure:18214: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by CAFE config.status 1.20.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on sf-lc8.psi.ch
-
-config.status:1178: creating makefile
-config.status:1178: creating src/makefile
-config.status:1178: creating include/makefile
-config.status:1178: creating ./include/config.h
-config.status:1407: executing depfiles commands
-config.status:1484: cd src       && sed -e '/# am--include-marker/d' makefile         | make -f - am--depfiles
-make: Nothing to be done for 'am--depfiles'.
-config.status:1489: $? = 0
-config.status:1407: executing libtool commands
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -626,7 +595,6 @@ ac_cv_header_epicsTypes_h=yes
 ac_cv_header_inttypes_h=yes
 ac_cv_header_memory_h=yes
 ac_cv_header_multi_index_container_hpp=yes
-ac_cv_header_qxml_h=yes
 ac_cv_header_stdc=yes
 ac_cv_header_stdint_h=yes
 ac_cv_header_stdlib_h=yes
@@ -637,18 +605,16 @@ ac_cv_header_sys_types_h=yes
 ac_cv_header_unistd_h=yes
 ac_cv_host=x86_64-pc-linux-gnu
 ac_cv_lib_Com_main=yes
-ac_cv_lib_Qt5Core_write=yes
-ac_cv_lib_Qt5Xml_qt_version_tag=yes
 ac_cv_lib_ca_main=yes
 ac_cv_lib_dl_main=yes
 ac_cv_objext=o
-ac_cv_path_EGREP='/usr/bin/grep -E'
+ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_FGREP='/usr/bin/grep -F'
+ac_cv_path_FGREP='/bin/grep -F'
-ac_cv_path_GREP=/usr/bin/grep
+ac_cv_path_GREP=/bin/grep
-ac_cv_path_SED=/usr/bin/sed
+ac_cv_path_SED=/bin/sed
-ac_cv_path_install='/usr/bin/install -c'
+ac_cv_path_install='/bin/install -c'
-ac_cv_path_lt_DD=/usr/bin/dd
+ac_cv_path_lt_DD=/bin/dd
-ac_cv_path_mkdir=/usr/bin/mkdir
+ac_cv_path_mkdir=/bin/mkdir
 ac_cv_prog_AWK=gawk
 ac_cv_prog_CPP='/opt/psi/Programming/gcc/10.4.0/bin/gcc -E'
 ac_cv_prog_CXXCPP='/opt/psi/Programming/gcc/10.4.0/bin/g++ -E'
@@ -673,9 +639,9 @@ lt_cv_file_magic_test_file=
 lt_cv_ld_reload_flag=-r
 lt_cv_nm_interface='BSD nm'
 lt_cv_objdir=.libs
-lt_cv_path_LD=/usr/bin/ld
+lt_cv_path_LD=/bin/ld
-lt_cv_path_LDCXX='/usr/bin/ld -m elf_x86_64'
+lt_cv_path_LDCXX='/bin/ld -m elf_x86_64'
-lt_cv_path_NM='/usr/bin/nm -B'
+lt_cv_path_NM='/bin/nm -B'
 lt_cv_path_mainfest_tool=no
 lt_cv_prog_compiler_c_o=yes
 lt_cv_prog_compiler_c_o_CXX=yes
@@ -698,34 +664,34 @@ lt_cv_sys_global_symbol_to_import=
 lt_cv_sys_max_cmd_len=1572864
 lt_cv_to_host_file_cmd=func_convert_file_noop
 lt_cv_to_tool_file_cmd=func_convert_file_noop
-lt_cv_truncate_bin='/usr/bin/dd bs=4096 count=1'
+lt_cv_truncate_bin='/bin/dd bs=4096 count=1'
 
 ## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16'
+ACLOCAL='${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
 AMTAR='$${TAR-tar}'
 AM_BACKSLASH='\'
-AM_CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml'
+AM_CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include'
 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 AM_DEFAULT_VERBOSITY='1'
-AM_LDFLAGS=' -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib '
+AM_LDFLAGS=' -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64'
 AM_V='$(V)'
 AR='ar'
-AUTOCONF='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf'
+AUTOCONF='${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf'
-AUTOHEADER='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader'
+AUTOHEADER='${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader'
-AUTOMAKE='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16'
+AUTOMAKE='${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16'
 AWK='gawk'
 CAFE_CPPFLAGS='-I$(top_srcdir)/include '
 CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
 CCDEPMODE='depmode=gcc3'
 CFLAGS='-g -O2'
 CPP='/opt/psi/Programming/gcc/10.4.0/bin/gcc -E'
-CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml'
+CPPFLAGS=' -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include'
 CXX='/opt/psi/Programming/gcc/10.4.0/bin/g++'
 CXXCPP='/opt/psi/Programming/gcc/10.4.0/bin/g++ -E'
 CXXDEPMODE='depmode=gcc3'
@@ -739,10 +705,10 @@ DUMPBIN=''
 ECHO_C=''
 ECHO_N='-n'
 ECHO_T=''
-EGREP='/usr/bin/grep -E'
+EGREP='/bin/grep -E'
 EXEEXT=''
-FGREP='/usr/bin/grep -F'
+FGREP='/bin/grep -F'
-GREP='/usr/bin/grep'
+GREP='/bin/grep'
 HAVE_PYCAFE_EXT__FALSE=''
 HAVE_PYCAFE_EXT__TRUE='#'
 HAVE_PYTHON__FALSE=''
@@ -753,19 +719,19 @@ INSTALL_DATA='${INSTALL} -m 644'
 INSTALL_PROGRAM='${INSTALL}'
 INSTALL_SCRIPT='${INSTALL}'
 INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LD='/usr/bin/ld -m elf_x86_64'
+LD='/bin/ld -m elf_x86_64'
-LDFLAGS=' -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib '
+LDFLAGS=' -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64'
 LIBOBJS=''
-LIBS='-lQt5Xml -lQt5Core '
+LIBS=''
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 LIPO=''
 LN_S='ln -s'
 LTLIBOBJS=''
 LT_SYS_LIBRARY_PATH=''
-MAKEINFO='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo'
+MAKEINFO='${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo'
 MANIFEST_TOOL=':'
-MKDIR_P='/usr/bin/mkdir -p'
+MKDIR_P='/bin/mkdir -p'
-NM='/usr/bin/nm -B'
+NM='/bin/nm -B'
 NMEDIT=''
 OBJDUMP='objdump'
 OBJEXT='o'
@@ -774,17 +740,17 @@ OTOOL=''
 PACKAGE='cafe'
 PACKAGE_BUGREPORT='Bug reports to: jan.chrin@psi.ch'
 PACKAGE_NAME='CAFE'
-PACKAGE_STRING='CAFE 1.20.1'
+PACKAGE_STRING='CAFE 1.22.0'
 PACKAGE_TARNAME='cafe'
 PACKAGE_URL=''
-PACKAGE_VERSION='1.20.1'
+PACKAGE_VERSION='1.22.0'
 PATH_SEPARATOR=':'
 RANLIB='ranlib'
-SED='/usr/bin/sed'
+SED='/bin/sed'
 SET_MAKE=''
 SHELL='/bin/sh'
 STRIP='strip'
-VERSION='1.20.1'
+VERSION='1.22.0'
 ac_ct_AR='ar'
 ac_ct_CC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
 ac_ct_CXX=''
@@ -821,8 +787,8 @@ host_vendor='pc'
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh'
+install_sh='${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh'
-libdir='/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64'
+libdir='/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
 localstatedir='${prefix}/var'
@@ -830,7 +796,7 @@ mandir='${datarootdir}/man'
 mkdir_p='$(MKDIR_P)'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0'
+prefix='/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
@@ -845,12 +811,12 @@ target_alias=''
 /* confdefs.h */
 #define PACKAGE_NAME "CAFE"
 #define PACKAGE_TARNAME "cafe"
-#define PACKAGE_VERSION "1.20.1"
+#define PACKAGE_VERSION "1.22.0"
-#define PACKAGE_STRING "CAFE 1.20.1"
+#define PACKAGE_STRING "CAFE 1.22.0"
 #define PACKAGE_BUGREPORT "Bug reports to: jan.chrin@psi.ch"
 #define PACKAGE_URL ""
 #define PACKAGE "cafe"
-#define VERSION "1.20.1"
+#define VERSION "1.22.0"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
@@ -866,17 +832,57 @@ target_alias=''
 #define HAVE_LINUX 1
 #define HAVE_CADEF_H 1
 #define HAVE_EPICSTYPES_H 1
-#define HAVE_EPICS 7.0.7
+#define HAVE_EPICS 7.0.9
 #define EPICS_MAJOR 7
 #define EPICS_MINOR 0
-#define EPICS_PATCH 7
+#define EPICS_PATCH 9
 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1
 #define HAVE_BOOST 1
-#define HAVE_QXML_H 1
-#define HAVE_LIBQT5CORE 1
-#define HAVE_LIBQT5XML 1
-#define HAVE_QT 1
-#define HAVE_LIBQTXML 1
-#define QT_NO_VERSION_TAGGING 1
 
 configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by CAFE config.status 1.22.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on sls-lc8.psi.ch
+
+config.status:1168: creating makefile
+config.status:1168: creating src/makefile
+config.status:1168: creating include/makefile
+config.status:1168: creating ./include/config.h
+config.status:1349: ./include/config.h is unchanged
+config.status:1397: executing depfiles commands
+config.status:1474: cd src       && sed -e '/# am--include-marker/d' makefile         | make -f - am--depfiles
+make[1]: Entering directory '/afs/psi.ch/project/cafe/gitea/CAFE/cpp/src'
+make[1]: Nothing to be done for 'am--depfiles'.
+make[1]: Leaving directory '/afs/psi.ch/project/cafe/gitea/CAFE/cpp/src'
+config.status:1479: $? = 0
+config.status:1397: executing libtool commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by CAFE config.status 1.22.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status ./include/config.h
+
+on sls-lc8.psi.ch
+
+config.status:1168: creating ./include/config.h
+config.status:1349: ./include/config.h is unchanged

config.status

@@ -380,7 +380,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CAFE $as_me 1.20.1, which was
+This file was extended by CAFE $as_me 1.22.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -427,9 +427,9 @@ $config_commands
 
 Report bugs to <Bug reports to: jan.chrin@psi.ch>."
 
-ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-qt5' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc'"
+ac_cs_config="'--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc'"
 ac_cs_version="\
-CAFE config.status 1.20.1
+CAFE config.status 1.22.0
 configured by ./configure, generated by GNU Autoconf 2.69,
   with options \"$ac_cs_config\"
 
@@ -437,10 +437,10 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/afs/psi.ch/project/cafe/gitlab/CAFE/cpp'
+ac_pwd='/afs/psi.ch/project/cafe/gitea/CAFE/cpp'
 srcdir='.'
-INSTALL='/usr/bin/install -c'
+INSTALL='/bin/install -c'
-MKDIR_P='/usr/bin/mkdir -p'
+MKDIR_P='/bin/mkdir -p'
 AWK='gawk'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -519,7 +519,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--enable-qt5' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/sf/bd/deps/zmq/curl-7.55.1' '--with-lz4=/sf/bd/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.7' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--prefix=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0' '--libdir=/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64' '--enable-boost-inc' '--enable-epics7' '--with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include' '--with-epics3=/usr/local/epics/base' '--with-python310=/opt/gfa/python-3.10/latest' '--with-python38=/opt/gfa/python-3.8/latest' '--with-python37=/opt/gfa/python-3.7/latest' '--with-python35=/opt/gfa/python-3.5/latest' '--with-python34=/opt/psi/Programming/psi-python34/2.1.0' '--with-qt5py310=/opt/gfa/python-3.10/latest' '--with-qt5py38=/opt/gfa/python-3.8/latest' '--with-qt5=/opt/gfa/python-3.7/latest' '--with-qt4=/opt/gfa/python-3.5/latest' '--with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0' '--with-json=/opt/gfa/cafe/deps/zmq/json/jsoncpp-src-0.6.0-rc2' '--with-zeromq=/opt/gfa/cafe/deps/zmq/zeromq-4.2.3-gcc-6.3.0' '--with-curl=/opt/gfa/cafe/deps/zmq/curl-7.55.1' '--with-lz4=/opt/gfa/cafe/deps/zmq/lz4/lib' '--with-epics7=/usr/local/epics/base-7.0.9' 'CXX=/opt/psi/Programming/gcc/10.4.0/bin/g++' 'CC=/opt/psi/Programming/gcc/10.4.0/bin/gcc' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -565,13 +565,13 @@ host_os='linux-gnu'
 build_alias=''
 build='x86_64-pc-linux-gnu'
 build_os='linux-gnu'
-SED='/usr/bin/sed'
+SED='/bin/sed'
-Xsed='/usr/bin/sed -e 1s/^X//'
+Xsed='/bin/sed -e 1s/^X//'
-GREP='/usr/bin/grep'
+GREP='/bin/grep'
-EGREP='/usr/bin/grep -E'
+EGREP='/bin/grep -E'
-FGREP='/usr/bin/grep -F'
+FGREP='/bin/grep -F'
-LD='/usr/bin/ld -m elf_x86_64'
+LD='/bin/ld -m elf_x86_64'
-NM='/usr/bin/nm -B'
+NM='/bin/nm -B'
 LN_S='ln -s'
 max_cmd_len='1572864'
 ac_objext='o'
@@ -611,7 +611,7 @@ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\)
 lt_cv_nm_interface='BSD nm'
 nm_file_list_spec='@'
 lt_sysroot=''
-lt_cv_truncate_bin='/usr/bin/dd bs=4096 count=1'
+lt_cv_truncate_bin='/bin/dd bs=4096 count=1'
 objdir='.libs'
 MAGIC_CMD='file'
 lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -678,8 +678,8 @@ postuninstall_cmds=''
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 finish_eval=''
 hardcode_into_libs='yes'
-sys_lib_search_path_spec='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib /lib /usr/lib '
+sys_lib_search_path_spec='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib /lib /usr/lib '
-configure_time_dlsearch_path='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst                /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ '
+configure_time_dlsearch_path='/lib /usr/lib /usr/lib64/atlas                /usr/lib64/llvm17/lib/ /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ '
 configure_time_lt_sys_library_path=''
 hardcode_action='immediate'
 enable_dlopen='unknown'
@@ -693,7 +693,7 @@ postdep_objects=''
 predeps=''
 postdeps=''
 compiler_lib_search_path=''
-LD_CXX='/usr/bin/ld -m elf_x86_64'
+LD_CXX='/bin/ld -m elf_x86_64'
 reload_flag_CXX=' -r'
 reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs'
 old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
@@ -735,12 +735,12 @@ prelink_cmds_CXX=''
 postlink_cmds_CXX=''
 file_list_spec_CXX=''
 hardcode_action_CXX='immediate'
-compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
+compiler_lib_search_dirs_CXX='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
-predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o'
+predep_objects_CXX='/lib/../lib64/crti.o /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o'
-postdep_objects_CXX='/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o'
+postdep_objects_CXX='/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o'
 predeps_CXX=''
 postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
-compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
+compiler_lib_search_path_CXX='-L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../..'
 
 LTCC='/opt/psi/Programming/gcc/10.4.0/bin/gcc'
 LTCFLAGS='-g -O2'
@@ -788,7 +788,7 @@ fi
 
 
     PACKAGE='cafe'
-    VERSION='1.20.1'
+    VERSION='1.22.0'
     RM='rm -f'
     ofile='libtool'
 
@@ -883,11 +883,9 @@ S["HAVE_PYCAFE_EXT__FALSE"]=""
 S["HAVE_PYCAFE_EXT__TRUE"]="#"
 S["HAVE_PYTHON__FALSE"]=""
 S["HAVE_PYTHON__TRUE"]="#"
-S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpat"\
+S["AM_LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64"
-"h,/opt/gfa/python-3.7/latest/lib "
+S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/ba"\
-S["AM_CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/ba"\
+"se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include"
-"se-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/lat"\
-"est/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml"
 S["CAFE_CPPFLAGS"]="-I$(top_srcdir)/include "
 S["CXXCPP"]="/opt/psi/Programming/gcc/10.4.0/bin/g++ -E"
 S["CPP"]="/opt/psi/Programming/gcc/10.4.0/bin/gcc -E"
@@ -904,14 +902,14 @@ S["AR"]="ar"
 S["DLLTOOL"]="false"
 S["OBJDUMP"]="objdump"
 S["LN_S"]="ln -s"
-S["NM"]="/usr/bin/nm -B"
+S["NM"]="/bin/nm -B"
 S["ac_ct_DUMPBIN"]=""
 S["DUMPBIN"]=""
-S["LD"]="/usr/bin/ld -m elf_x86_64"
+S["LD"]="/bin/ld -m elf_x86_64"
-S["FGREP"]="/usr/bin/grep -F"
+S["FGREP"]="/bin/grep -F"
-S["EGREP"]="/usr/bin/grep -E"
+S["EGREP"]="/bin/grep -E"
-S["GREP"]="/usr/bin/grep"
+S["GREP"]="/bin/grep"
-S["SED"]="/usr/bin/sed"
+S["SED"]="/bin/sed"
 S["am__fastdepCC_FALSE"]="#"
 S["am__fastdepCC_TRUE"]=""
 S["CCDEPMODE"]="depmode=gcc3"
@@ -939,11 +937,9 @@ S["DEPDIR"]=".deps"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_CXX"]=""
-S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/ba"\
+S["CPPFLAGS"]=" -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/ba"\
-"se-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/lat"\
+"se-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include"
-"est/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml"
+S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64"
-S["LDFLAGS"]=" -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpat"\
-"h,/opt/gfa/python-3.7/latest/lib "
 S["CXXFLAGS"]="-g -O2"
 S["CXX"]="/opt/psi/Programming/gcc/10.4.0/bin/g++"
 S["AM_BACKSLASH"]="\\"
@@ -957,16 +953,16 @@ S["am__leading_dot"]="."
 S["SET_MAKE"]=""
 S["AWK"]="gawk"
 S["mkdir_p"]="$(MKDIR_P)"
-S["MKDIR_P"]="/usr/bin/mkdir -p"
+S["MKDIR_P"]="/bin/mkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
 S["STRIP"]="strip"
-S["install_sh"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh"
+S["install_sh"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh"
-S["MAKEINFO"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo"
+S["MAKEINFO"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo"
-S["AUTOHEADER"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader"
+S["AUTOHEADER"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader"
-S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16"
+S["AUTOMAKE"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16"
-S["AUTOCONF"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf"
+S["AUTOCONF"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf"
-S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16"
+S["ACLOCAL"]="${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16"
-S["VERSION"]="1.20.1"
+S["VERSION"]="1.22.0"
 S["PACKAGE"]="cafe"
 S["CYGPATH_W"]="echo"
 S["am__isrc"]=""
@@ -976,14 +972,14 @@ S["INSTALL_PROGRAM"]="${INSTALL}"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
-S["LIBS"]="-lQt5Xml -lQt5Core "
+S["LIBS"]=""
 S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DHAVE_CONFIG_H"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
-S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64"
+S["libdir"]="/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64"
 S["psdir"]="${docdir}"
 S["pdfdir"]="${docdir}"
 S["dvidir"]="${docdir}"
@@ -1001,12 +997,12 @@ S["libexecdir"]="${exec_prefix}/libexec"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0"
+S["prefix"]="/opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]="Bug reports to: jan.chrin@psi.ch"
-S["PACKAGE_STRING"]="CAFE 1.20.1"
+S["PACKAGE_STRING"]="CAFE 1.22.0"
-S["PACKAGE_VERSION"]="1.20.1"
+S["PACKAGE_VERSION"]="1.22.0"
 S["PACKAGE_TARNAME"]="cafe"
 S["PACKAGE_NAME"]="CAFE"
 S["PATH_SEPARATOR"]=":"
@@ -1055,12 +1051,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 D["PACKAGE_NAME"]=" \"CAFE\""
 D["PACKAGE_TARNAME"]=" \"cafe\""
-D["PACKAGE_VERSION"]=" \"1.20.1\""
+D["PACKAGE_VERSION"]=" \"1.22.0\""
-D["PACKAGE_STRING"]=" \"CAFE 1.20.1\""
+D["PACKAGE_STRING"]=" \"CAFE 1.22.0\""
 D["PACKAGE_BUGREPORT"]=" \"Bug reports to: jan.chrin@psi.ch\""
 D["PACKAGE_URL"]=" \"\""
 D["PACKAGE"]=" \"cafe\""
-D["VERSION"]=" \"1.20.1\""
+D["VERSION"]=" \"1.22.0\""
 D["STDC_HEADERS"]=" 1"
 D["HAVE_SYS_TYPES_H"]=" 1"
 D["HAVE_SYS_STAT_H"]=" 1"
@@ -1076,18 +1072,12 @@ D["LT_OBJDIR"]=" \".libs/\""
 D["HAVE_LINUX"]=" 1"
 D["HAVE_CADEF_H"]=" 1"
 D["HAVE_EPICSTYPES_H"]=" 1"
-D["HAVE_EPICS"]=" 7.0.7"
+D["HAVE_EPICS"]=" 7.0.9"
 D["EPICS_MAJOR"]=" 7"
 D["EPICS_MINOR"]=" 0"
-D["EPICS_PATCH"]=" 7"
+D["EPICS_PATCH"]=" 9"
 D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1"
 D["HAVE_BOOST"]=" 1"
-D["HAVE_QXML_H"]=" 1"
-D["HAVE_LIBQT5CORE"]=" 1"
-D["HAVE_LIBQT5XML"]=" 1"
-D["HAVE_QT"]=" 1"
-D["HAVE_LIBQTXML"]=" 1"
-D["QT_NO_VERSION_TAGGING"]=" 1"
   for (key in D) D_is_set[key] = 1
   FS = ""
 }

configurePSI.ac

@@ -9,7 +9,7 @@
 #  Standard macros
 AC_PREREQ(2.63)
 AC_COPYRIGHT([CAFE, Jan Chrin, PSI, 2010-2023])
-AC_INIT([CAFE], [1.20.1], [Bug reports to: jan.chrin@psi.ch])
+AC_INIT([CAFE], [1.22.0], [Bug reports to: jan.chrin@psi.ch])
 
 AC_CONFIG_AUX_DIR(./)
 
@@ -118,8 +118,8 @@ if test x$HAVE_EPICS_7 == xtrue ; then
        EPICS_LIB_PATH=${EPICS_PREFIX}"/lib/"${RHREL}"-x86_64"   
        ## Add epics release  
        EPICS_MAJOR_DEFAULT="7"
-       EPICS_MINOR_DEFAULT="4"
+       EPICS_MINOR_DEFAULT="0"
-       EPICS_PATCH_DEFAULT="1"
+       EPICS_PATCH_DEFAULT="9"
       ]
 )
 fi

include/config.h

@@ -8,7 +8,7 @@
 #define EPICS_MINOR 0
 
 /* epics patch release */
-#define EPICS_PATCH 7
+#define EPICS_PATCH 9
 
 /* Availability of boost */
 #define HAVE_BOOST 1
@@ -29,7 +29,7 @@
 #define HAVE_DLFCN_H 1
 
 /* epics version */
-#define HAVE_EPICS 7.0.7
+#define HAVE_EPICS 7.0.9
 
 /* Define to 1 if you have the <epicsTypes.h> header file. */
 #define HAVE_EPICSTYPES_H 1
@@ -72,16 +72,16 @@
 /* #undef HAVE_LIBPYTHON3_8 */
 
 /* Define to 1 if you have the `Qt5Core' library (-lQt5Core). */
-#define HAVE_LIBQT5CORE 1
+/* #undef HAVE_LIBQT5CORE */
 
 /* Define to 1 if you have the `Qt5Xml' library (-lQt5Xml). */
-#define HAVE_LIBQT5XML 1
+/* #undef HAVE_LIBQT5XML */
 
 /* Define to 1 if you have the `QtCore' library (-lQtCore). */
 /* #undef HAVE_LIBQTCORE */
 
 /* Availability of Qt version 5 confirmed */
-#define HAVE_LIBQTXML 1
+/* #undef HAVE_LIBQTXML */
 
 /* Define to 1 if you have the `zmq' library (-lzmq). */
 /* #undef HAVE_LIBZMQ */
@@ -111,10 +111,10 @@
 /* #undef HAVE_PYTHON_H */
 
 /* Availability of Qt version 5 confirmed */
-#define HAVE_QT 1
+/* #undef HAVE_QT */
 
 /* Define to 1 if you have the <qxml.h> header file. */
-#define HAVE_QXML_H 1
+/* #undef HAVE_QXML_H */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -156,7 +156,7 @@
 #define PACKAGE_NAME "CAFE"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "CAFE 1.20.1"
+#define PACKAGE_STRING "CAFE 1.22.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "cafe"
@@ -165,13 +165,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.20.1"
+#define PACKAGE_VERSION "1.22.0"
 
 /* Availability of Qt version 5 confirmed */
-#define QT_NO_VERSION_TAGGING 1
+/* #undef QT_NO_VERSION_TAGGING */
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.20.1"
+#define VERSION "1.22.0"

include/makefile

@@ -197,22 +197,22 @@ ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
+ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 AR = ar
-AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
+AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
-AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
+AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
-AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
+AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
 CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
 CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
 CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -226,28 +226,28 @@ DUMPBIN =
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-FGREP = /usr/bin/grep -F
+FGREP = /bin/grep -F
-GREP = /usr/bin/grep
+GREP = /bin/grep
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
 LT_SYS_LIBRARY_PATH = 
-MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo
+MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
+MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -256,21 +256,21 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.20.1
+PACKAGE_STRING = CAFE 1.22.0
 PACKAGE_TARNAME = cafe
 PACKAGE_URL = 
-PACKAGE_VERSION = 1.20.1
+PACKAGE_VERSION = 1.22.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.20.1
+VERSION = 1.22.0
-abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
+abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
-abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
+abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
-abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
-abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 ac_ct_AR = ar
 ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 ac_ct_CXX = 
@@ -300,8 +300,8 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
+install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -309,7 +309,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin

libtool

@@ -1,6 +1,6 @@
 #! /bin/sh
-# Generated automatically by config.status (cafe) 1.20.1
+# Generated automatically by config.status (cafe) 1.22.0
-# Libtool was configured on host sf-lc8.psi.ch:
+# Libtool was configured on host sls-lc8.psi.ch:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -76,22 +76,22 @@ build=x86_64-pc-linux-gnu
 build_os=linux-gnu
 
 # A sed program that does not truncate output.
-SED="/usr/bin/sed"
+SED="/bin/sed"
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="$SED -e 1s/^X//"
 
 # A grep program that handles long lines.
-GREP="/usr/bin/grep"
+GREP="/bin/grep"
 
 # An ERE matcher.
-EGREP="/usr/bin/grep -E"
+EGREP="/bin/grep -E"
 
 # A literal string matcher.
-FGREP="/usr/bin/grep -F"
+FGREP="/bin/grep -F"
 
 # A BSD- or MS-compatible name lister.
-NM="/usr/bin/nm -B"
+NM="/bin/nm -B"
 
 # Whether we need soft or hard links.
 LN_S="ln -s"
@@ -192,7 +192,7 @@ nm_file_list_spec="@"
 lt_sysroot=
 
 # Command to truncate a binary pipe.
-lt_truncate_bin="/usr/bin/dd bs=4096 count=1"
+lt_truncate_bin="/bin/dd bs=4096 count=1"
 
 # The name of the directory that contains temporary libtool files.
 objdir=.libs
@@ -282,10 +282,10 @@ finish_eval=""
 hardcode_into_libs=yes
 
 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/lib /lib /usr/lib "
+sys_lib_search_path_spec="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib64 /lib64 /usr/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/lib /lib /usr/lib "
 
 # Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst                /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64/atlas                /usr/lib64/llvm17/lib/ /usr/lib/oracle/19.18/client64/lib /usr/lib64/tclx8.6 /usr/lib64/wine/ "
 
 # Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
 configure_time_lt_sys_library_path=""
@@ -305,7 +305,7 @@ striplib="strip --strip-unneeded"
 
 
 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/bin/ld -m elf_x86_64"
 
 # How to create reloadable object files.
 reload_flag=" -r"
@@ -7732,6 +7732,11 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;
 
+      -Wl,--as-needed)
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
       -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -7784,12 +7789,10 @@ func_mode_link ()
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      # -specs=*             GCC specs files
       # -stdlib=*            select c++ std lib with clang
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-      -specs=*)
         func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
@@ -8038,6 +8041,7 @@ func_mode_link ()
 
     case $linkmode in
     lib)
+	as_needed_flag=
 	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
@@ -8049,6 +8053,7 @@ func_mode_link ()
 	done
 	;;
     prog)
+	as_needed_flag=
 	compile_deplibs=
 	finalize_deplibs=
 	alldeplibs=false
@@ -8118,6 +8123,15 @@ func_mode_link ()
 	lib=
 	found=false
 	case $deplib in
+	-Wl,--as-needed)
+	  if test prog,link = "$linkmode,$pass" ||
+	     test lib,link = "$linkmode,$pass"; then
+	    as_needed_flag="$deplib "
+	  else
+	    deplibs="$deplib $deplibs"
+	  fi
+	  continue
+	  ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test prog,link = "$linkmode,$pass"; then
@@ -10535,6 +10549,13 @@ EOF
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
+	# A bit hacky. I had wanted to add \$as_needed_flag to archive_cmds instead, but that
+	# comes from libtool.m4 which is part of the project being built. This should put it
+	# in the right place though.
+	if test lib,link = "$linkmode,$pass" && test -n "$as_needed_flag"; then
+	  libobjs=$as_needed_flag$libobjs
+	fi
+
 	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
 	  IFS=$sp$nl
@@ -10767,8 +10788,8 @@ EOF
       compile_deplibs=$new_libs
 
 
-      func_append compile_command " $compile_deplibs"
+      func_append compile_command " $as_needed_flag $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
+      func_append finalize_command " $as_needed_flag $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -11663,7 +11684,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/bin/ld -m elf_x86_64"
 
 # How to create reloadable object files.
 reload_flag=" -r"
@@ -11794,17 +11815,17 @@ file_list_spec=""
 hardcode_action=immediate
 
 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."
+compiler_lib_search_dirs="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc /opt/psi/Programming/gcc/10.4.0/lib64/../lib64 /opt/psi/Programming/gcc/10.4.0/lib/../lib64 /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /opt/psi/Programming/gcc/10.4.0/lib64 /opt/psi/Programming/gcc/10.4.0/lib /opt/psi/Tools/HDFView/3.1.2/lib /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."
 
 # Dependencies to place before and after the objects being linked to
 # create a shared library.
-predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o"
+predep_objects="/lib/../lib64/crti.o /afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtbeginS.o"
-postdep_objects="/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o"
+postdep_objects="/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/crtendS.o /lib/../lib64/crtn.o"
 predeps=""
 postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."
+compiler_lib_search_path="-L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc -L/opt/psi/Programming/gcc/10.4.0/lib64/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib/../lib64 -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/opt/psi/Programming/gcc/10.4.0/lib64 -L/opt/psi/Programming/gcc/10.4.0/lib -L/opt/psi/Tools/HDFView/3.1.2/lib -L/afs/psi.ch/sys/psi.ra/Programming/gcc/10.4.0/bin/../lib/gcc/x86_64-pc-linux-gnu/10.4.0/../../.."
 
 # ### END LIBTOOL TAG CONFIG: CXX

m4/libtool.m4

@@ -2867,9 +2867,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -2878,7 +2875,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on

makefile

@@ -194,10 +194,10 @@ am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./compile \
 	$(top_srcdir)/./include/config.in $(top_srcdir)/./install-sh \
 	$(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing .//AUTHORS \
 	.//COPYING .//ChangeLog .//INSTALL .//NEWS .//README \
-	.//compile .//config.guess .//config.sub .//install-sh \
+	.//compile .//config.guess .//config.sub .//depcomp \
-	.//ltmain.sh .//missing AUTHORS COPYING ChangeLog INSTALL NEWS \
+	.//install-sh .//ltmain.sh .//missing AUTHORS COPYING \
-	README compile config.guess config.sub install-sh ltmain.sh \
+	ChangeLog INSTALL NEWS README compile config.guess config.sub \
-	missing
+	depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -240,22 +240,22 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
+ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I$(top_srcdir)/include 
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib  @CAFE_LIBS@
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 @CAFE_LIBS@
 AR = ar
-AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
+AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
-AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
+AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
-AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
+AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
 CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
 CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
 CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -269,28 +269,28 @@ DUMPBIN =
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-FGREP = /usr/bin/grep -F
+FGREP = /bin/grep -F
-GREP = /usr/bin/grep
+GREP = /bin/grep
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
 LT_SYS_LIBRARY_PATH = 
-MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo
+MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
+MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -299,21 +299,21 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.20.1
+PACKAGE_STRING = CAFE 1.22.0
 PACKAGE_TARNAME = cafe
 PACKAGE_URL = 
-PACKAGE_VERSION = 1.20.1
+PACKAGE_VERSION = 1.22.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.20.1
+VERSION = 1.22.0
-abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
-abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
-abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
-abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 ac_ct_AR = ar
 ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 ac_ct_CXX = 
@@ -343,8 +343,8 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
+install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -352,7 +352,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin

src/bitshuffle/.deps/bitshuffle.Plo

@@ -4,7 +4,7 @@ bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/bits/long-double.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
  /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
  /usr/include/sys/types.h /usr/include/bits/types.h \
@@ -21,11 +21,11 @@ bitshuffle/bitshuffle.lo: bitshuffle/bitshuffle.c \
  /usr/include/bits/pthreadtypes-arch.h /usr/include/alloca.h \
  /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
  bitshuffle/bitshuffle_core.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \
  /usr/include/stdint.h /usr/include/bits/wchar.h \
  /usr/include/bits/stdint-uintn.h bitshuffle/bitshuffle_internals.h \
  bitshuffle/iochain.h .././include/lz4.h /usr/include/stdio.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \
  /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
  /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
  /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
@@ -54,7 +54,7 @@ bitshuffle/bitshuffle.h:
 
 /usr/include/gnu/stubs-64.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
 
 /usr/include/bits/waitflags.h:
 
@@ -114,7 +114,7 @@ bitshuffle/bitshuffle.h:
 
 bitshuffle/bitshuffle_core.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h:
 
 /usr/include/stdint.h:
 
@@ -130,7 +130,7 @@ bitshuffle/iochain.h:
 
 /usr/include/stdio.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h:
 
 /usr/include/bits/types/__fpos_t.h:
 

src/bitshuffle/.deps/bitshuffle_core.Plo

@@ -1,6 +1,6 @@
 bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
  /usr/include/stdc-predef.h bitshuffle/bitshuffle_core.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h \
  /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \
@@ -8,7 +8,7 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/bits/wchar.h /usr/include/bits/stdint-intn.h \
  /usr/include/bits/stdint-uintn.h /usr/include/stdlib.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
  /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
  /usr/include/sys/types.h /usr/include/bits/types/clock_t.h \
@@ -25,7 +25,7 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
  /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
  bitshuffle/bitshuffle_internals.h bitshuffle/iochain.h \
  /usr/include/stdio.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h \
  /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
  /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
  /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
@@ -33,16 +33,16 @@ bitshuffle/bitshuffle_core.lo: bitshuffle/bitshuffle_core.c \
  /usr/include/bits/stdio.h /usr/include/string.h \
  /usr/include/bits/types/locale_t.h /usr/include/bits/types/__locale_t.h \
  /usr/include/strings.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/emmintrin.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/xmmintrin.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mmintrin.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mm_malloc.h
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h
 
 /usr/include/stdc-predef.h:
 
 bitshuffle/bitshuffle_core.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdint.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdint.h:
 
 /usr/include/stdint.h:
 
@@ -72,7 +72,7 @@ bitshuffle/bitshuffle_core.h:
 
 /usr/include/stdlib.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
 
 /usr/include/bits/waitflags.h:
 
@@ -130,7 +130,7 @@ bitshuffle/iochain.h:
 
 /usr/include/stdio.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stdarg.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stdarg.h:
 
 /usr/include/bits/types/__fpos_t.h:
 
@@ -158,10 +158,10 @@ bitshuffle/iochain.h:
 
 /usr/include/strings.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/emmintrin.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/emmintrin.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/xmmintrin.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/xmmintrin.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mmintrin.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mmintrin.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/mm_malloc.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/mm_malloc.h:

src/bitshuffle/.deps/iochain.Plo

@@ -3,7 +3,7 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/bits/long-double.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h \
+ /afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
  /usr/include/bits/floatn.h /usr/include/bits/floatn-common.h \
  /usr/include/sys/types.h /usr/include/bits/types.h \
@@ -39,7 +39,7 @@ bitshuffle/iochain.lo: bitshuffle/iochain.c /usr/include/stdc-predef.h \
 
 /usr/include/gnu/stubs-64.h:
 
-/afs/psi.ch/sys/psi.x86_64_slp6/Programming/gcc/8.5.0/lib/gcc/x86_64-pc-linux-gnu/8.5.0/include/stddef.h:
+/afs/psi.ch/sys/psi.ra/Programming/gcc/7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include/stddef.h:
 
 /usr/include/bits/waitflags.h:
 

src/makefile

@@ -266,7 +266,7 @@ ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/./depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
+ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
 AMTAR = $${TAR-tar}
 
 #if HAVE_PYCAFE_EXT_
@@ -276,20 +276,20 @@ AMTAR = $${TAR-tar}
 #if HAVE_PYTHON_
 #libcafe_la_SOURCES += pycafe/PyCafe.cpp
 #endif
-AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml -I$(top_srcdir)/include 
+AM_CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I$(top_srcdir)/include 
 AM_DEFAULT_VERBOSITY = 1
-AM_LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+AM_LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 AR = ar
-AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
+AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
-AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
+AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
-AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
+AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
 AWK = gawk
 CAFE_CPPFLAGS = -I$(top_srcdir)/include 
 CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2
 CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
-CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include  -I/opt/gfa/python-3.7/latest/include/qt  -I/opt/gfa/python-3.7/latest/include/qt/QtCore  -I/opt/gfa/python-3.7/latest/include/qt/QtXml
+CPPFLAGS =  -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
 CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
 CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -303,28 +303,28 @@ DUMPBIN =
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-FGREP = /usr/bin/grep -F
+FGREP = /bin/grep -F
-GREP = /usr/bin/grep
+GREP = /bin/grep
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /bin/ld -m elf_x86_64
-LDFLAGS =  -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib   -Wl,-rpath,/opt/gfa/python-3.7/latest/lib 
+LDFLAGS =  -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
 LIBOBJS = 
-LIBS = -lQt5Xml -lQt5Core 
+LIBS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
 LT_SYS_LIBRARY_PATH = 
-MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing makeinfo
+MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
+MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -333,21 +333,21 @@ OTOOL64 =
 PACKAGE = cafe
 PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
 PACKAGE_NAME = CAFE
-PACKAGE_STRING = CAFE 1.20.1
+PACKAGE_STRING = CAFE 1.22.0
 PACKAGE_TARNAME = cafe
 PACKAGE_URL = 
-PACKAGE_VERSION = 1.20.1
+PACKAGE_VERSION = 1.22.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 1.20.1
+VERSION = 1.22.0
-abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src
+abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/src
-abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/src
+abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/src
-abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
-abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
+abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
 ac_ct_AR = ar
 ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
 ac_ct_CXX = 
@@ -377,8 +377,8 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
+install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
-libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
+libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
@@ -386,7 +386,7 @@ mandir = ${datarootdir}/man
 mkdir_p = $(MKDIR_P)
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0
+prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -406,7 +406,7 @@ lib_LTLIBRARIES = libcafe.la
 #2nd: age
 #3rd: revision
 #1.9.2   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
-libcafe_la_LDFLAGS = -version-info 21:1:20
+libcafe_la_LDFLAGS = -version-info 23:0:22
 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp \
 	cafeVectors.cpp cafeXML.cpp callbackHandlerCreate.cpp \
 	callbackHandlerMonitor.cpp conduit.cpp connect.cpp \

src/makefile.am

@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libcafe.la
 #2nd: age
 #3rd: revision
 #1.9.2   1.10.2     1.11.0 1.11.1   1.12.0 1.12.1 1.12.2    1.12.4
-libcafe_la_LDFLAGS = -version-info 21:1:20
+libcafe_la_LDFLAGS = -version-info 23:0:22
 
 libcafe_la_SOURCES = cafe.cpp cafeCache.cpp cafeGroup.cpp cafeVectors.cpp cafeXML.cpp \
 		callbackHandlerCreate.cpp callbackHandlerMonitor.cpp conduit.cpp connect.cpp connectCallbacks.cpp \